texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: tp/tests/coverage_macro.texi: group accent comman


From: Patrice Dumas
Subject: branch master updated: tp/tests/coverage_macro.texi: group accent commands together.
Date: Fri, 11 Nov 2022 17:16:57 -0500

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 f8a820fd12 tp/tests/coverage_macro.texi: group accent commands 
together.
f8a820fd12 is described below

commit f8a820fd12dd4672570338ab1aaf02f88bc6efcc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 11 23:16:28 2022 +0100

    tp/tests/coverage_macro.texi: group accent commands together.
---
 tp/tests/coverage_macro.texi                       |   44 +-
 .../layout/res_parser/formatting/formatting.html   |  272 ++---
 .../layout/res_parser/formatting_chm/anchor.html   |   44 +-
 .../layout/res_parser/formatting_chm/chapter.html  |  180 +--
 .../layout/res_parser/formatting_chm/chapter2.html |   44 +-
 .../res_parser/formatting_chm/formatting.html      |  136 +--
 .../res_parser/formatting_chm/formatting_abt.html  |   44 +-
 .../res_parser/formatting_chm/formatting_ovr.html  |   44 +-
 .../res_parser/formatting_chm/formatting_toc.html  |   44 +-
 .../layout/res_parser/formatting_chm/index.html    |   44 +-
 .../formatting_chm/s_002d_002dect_002cion.html     |   44 +-
 .../res_parser/formatting_chm/subsection.html      |   44 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   44 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   44 +-
 .../res_parser/formatting_docbook/formatting.xml   |  182 +--
 .../formatting_enable_encoding/formatting.html     |  272 ++---
 .../EPUB/xhtml/chapter.xhtml                       |  180 +--
 .../EPUB/xhtml/chapter2.xhtml                      |   44 +-
 .../EPUB/xhtml/formatting.xhtml                    |  136 +--
 .../EPUB/xhtml/formatting_abt.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |   44 +-
 .../EPUB/xhtml/chapter.xhtml                       |  180 +--
 .../EPUB/xhtml/chapter2.xhtml                      |   44 +-
 .../EPUB/xhtml/formatting.xhtml                    |  136 +--
 .../EPUB/xhtml/formatting_abt.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |   44 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |   44 +-
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |   44 +-
 .../EPUB/xhtml/subsection.xhtml                    |   44 +-
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |   44 +-
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |   44 +-
 .../res_parser/formatting_exotic/anchor.html       |   44 +-
 .../res_parser/formatting_exotic/chapter.html      |  180 +--
 .../res_parser/formatting_exotic/chapter2.html     |   44 +-
 .../formatting_exotic/formatting_abt.html          |   44 +-
 .../formatting_exotic/formatting_ovr.html          |   44 +-
 .../formatting_exotic/formatting_toc.html          |   44 +-
 .../layout/res_parser/formatting_exotic/index.html |   44 +-
 .../formatting_exotic/s_002d_002dect_002cion.html  |   44 +-
 .../res_parser/formatting_exotic/subsection.html   |   44 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   44 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   44 +-
 .../res_parser/formatting_fr_icons/formatting.html |  272 ++---
 .../res_parser/formatting_html/formatting.html     |  272 ++---
 .../res_parser/formatting_html32/formatting.html   |  272 ++---
 .../formatting_html_no_texi2html/formatting.html   |  180 +--
 .../res_parser/formatting_html_nodes/anchor.html   |   44 +-
 .../res_parser/formatting_html_nodes/chapter.html  |  180 +--
 .../res_parser/formatting_html_nodes/chapter2.html |   44 +-
 .../formatting_html_nodes/formatting_abt.html      |   44 +-
 .../formatting_html_nodes/formatting_fot.html      |   44 +-
 .../formatting_html_nodes/formatting_ovr.html      |   44 +-
 .../formatting_html_nodes/formatting_toc.html      |   44 +-
 .../res_parser/formatting_html_nodes/index.html    |  136 +--
 .../s_002d_002dect_002cion.html                    |   44 +-
 .../formatting_html_nodes/subsection.html          |   44 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   44 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   44 +-
 .../res_parser/formatting_info/formatting.info     | 1207 ++++++++++----------
 .../formatting_inline_css/formatting.html          |  272 ++---
 .../res_parser/formatting_latex/formatting.tex     |  220 ++--
 .../formatting_macro_expand/formatting.texi        |  220 ++--
 .../res_parser/formatting_mathjax/formatting.html  |  272 ++---
 .../layout/res_parser/formatting_nodes/anchor.html |   44 +-
 .../res_parser/formatting_nodes/chapter.html       |  180 +--
 .../res_parser/formatting_nodes/chapter2.html      |   44 +-
 .../formatting_nodes/formatting_abt.html           |   44 +-
 .../formatting_nodes/formatting_fot.html           |   44 +-
 .../formatting_nodes/formatting_ovr.html           |   44 +-
 .../formatting_nodes/formatting_toc.html           |   44 +-
 .../layout/res_parser/formatting_nodes/index.html  |  136 +--
 .../formatting_nodes/s_002d_002dect_002cion.html   |   44 +-
 .../res_parser/formatting_nodes/subsection.html    |   44 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   44 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   44 +-
 .../formatting_numerical_entities/formatting.html  |  272 ++---
 .../res_parser/formatting_plaintext/formatting.txt | 1156 +++++++++----------
 .../res_parser/formatting_rawtext/formatting.txt   |   88 +-
 .../formatting_regions/formatting_regions.html     |  272 ++---
 .../formatting_sort_element_counts/formatting.html |  272 ++---
 .../formatting_elt_counts.txt                      |    4 +-
 .../res_parser/formatting_textcontent/formatting   |  176 +--
 .../formatting_weird_quotes/formatting.html        |  272 ++---
 .../res_parser/formatting_xhtml/formatting.html    |  272 ++---
 .../res_parser/formatting_xml/formatting.xml       |  226 ++--
 .../res_parser/formatting_singular/anchor.html     |   44 +-
 .../res_parser/formatting_singular/chapter.html    |  180 +--
 .../res_parser/formatting_singular/chapter2.html   |   44 +-
 .../res_parser/formatting_singular/index.htm       |   44 +-
 .../res_parser/formatting_singular/index.html      |   44 +-
 .../s_002d_002dect_002cion.html                    |   44 +-
 .../res_parser/formatting_singular/sing_abt.htm    |   44 +-
 .../res_parser/formatting_singular/sing_fot.htm    |   44 +-
 .../res_parser/formatting_singular/sing_ovr.htm    |   44 +-
 .../res_parser/formatting_singular/sing_toc.htm    |   44 +-
 .../res_parser/formatting_singular/subsection.html |   44 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   44 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   44 +-
 101 files changed, 6126 insertions(+), 5685 deletions(-)

diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 62f2faff30..78b0353717 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -31,12 +31,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -173,26 +195,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 99d39c0f10..d6a6d1a9d6 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 145a56b01a..4f230e239e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 1909b83701..48d48f0559 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -930,12 +932,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1071,26 +1095,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -2013,12 +2017,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2154,26 +2180,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -3100,13 +3106,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3244,26 +3272,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index d66615956e..7f0bb1a0a2 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 946a214f27..8eb8765536 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -916,12 +918,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1057,26 +1081,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2001,12 +2005,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2142,26 +2168,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index 3bf0624d27..e6e37300a9 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index c58238f6a6..d27b650a38 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index 5f0f906753..8a02764a79 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/layout/res_parser/formatting_chm/index.html
index cf583c5d98..ec4088413c 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 8179731d02..8fc6b70599 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 471060bebf..abfbe92a25 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index bc4f5e58d9..1a58d47e6e 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 0a93eab6de..63ebc81d4c 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 2227173317..fec62e212c 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -55,12 +55,34 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<literal>@H{a}</literal> a&#779;
+<literal>@dotaccent{a}</literal> &#551; (ȧ)
+<literal>@ringaccent{a}</literal> &#229; (å)
+<literal>@tieaccent{a}</literal> a&#865;
+<literal>@u{a}</literal> &#259; (ă)
+<literal>@ubaraccent{a}</literal> a&#818;
+<literal>@udotaccent{a}</literal> &#7841; (ạ)
+<literal>@v{a}</literal> &#462; (ǎ)
+@,c &#231; (ç)
+<literal>@,{c}</literal> &#231; (ç)
+<literal>@ogonek{a}</literal> &#261; (ą)
+</para>
+<para>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
+</para>
+<para><literal>@H{--a}</literal> &#8211;a&#779;
+<literal>@dotaccent{--a}</literal> &#8211;a&#775;
+<literal>@ringaccent{--a}</literal> &#8211;a&#778;
+<literal>@tieaccent{--a}</literal> &#8211;a&#865;
+<literal>@u{--a}</literal> &#8211;a&#774;
+<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
+<literal>@udotaccent{--a}</literal> &#8211;a&#803;
+<literal>@v{--a}</literal> &#8211;a&#780;
+<literal>@,{--c}</literal> &#8211;c&#807;
+<literal>@ogonek{--a}</literal> &#8211;a&#808;
 </para>
 <para>@U{0075} &#x0075;
 </para>
@@ -198,26 +220,6 @@ but , ,
 <literal>@verb{:--a:}</literal> <literal>--a</literal>
 <literal>@verb{:a  &lt; &amp; @ % &quot; --    b:}</literal> <literal>a  &lt; 
&amp; @ % &quot; --    b</literal>
 <literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a<!-- /@w -->
-<literal>@H{a}</literal> a&#779;
-<literal>@H{--a}</literal> &#8211;a&#779;
-<literal>@dotaccent{a}</literal> &#551; (ȧ)
-<literal>@dotaccent{--a}</literal> &#8211;a&#775;
-<literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@ringaccent{--a}</literal> &#8211;a&#778;
-<literal>@tieaccent{a}</literal> a&#865;
-<literal>@tieaccent{--a}</literal> &#8211;a&#865;
-<literal>@u{a}</literal> &#259; (ă)
-<literal>@u{--a}</literal> &#8211;a&#774;
-<literal>@ubaraccent{a}</literal> a&#818;
-<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
-<literal>@udotaccent{--a}</literal> &#8211;a&#803;
-<literal>@v{a}</literal> &#462; (ǎ)
-<literal>@v{--a}</literal> &#8211;a&#780;
-<literal>@,{c}</literal> &#231; (ç)
-<literal>@,{--c}</literal> &#8211;c&#807;
-<literal>@ogonek{a}</literal> &#261; (ą)
-<literal>@ogonek{--a}</literal> &#8211;a&#808;
 <literal>a@sup{h}@sub{l}</literal> 
a<superscript>h</superscript><subscript>l</subscript>
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
@@ -979,12 +981,34 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<literal>@H{a}</literal> a&#779;
+<literal>@dotaccent{a}</literal> &#551; (ȧ)
+<literal>@ringaccent{a}</literal> &#229; (å)
+<literal>@tieaccent{a}</literal> a&#865;
+<literal>@u{a}</literal> &#259; (ă)
+<literal>@ubaraccent{a}</literal> a&#818;
+<literal>@udotaccent{a}</literal> &#7841; (ạ)
+<literal>@v{a}</literal> &#462; (ǎ)
+@,c &#231; (ç)
+<literal>@,{c}</literal> &#231; (ç)
+<literal>@ogonek{a}</literal> &#261; (ą)
+</para>
+<para>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
+</para>
+<para><literal>@H{--a}</literal> &#8211;a&#779;
+<literal>@dotaccent{--a}</literal> &#8211;a&#775;
+<literal>@ringaccent{--a}</literal> &#8211;a&#778;
+<literal>@tieaccent{--a}</literal> &#8211;a&#865;
+<literal>@u{--a}</literal> &#8211;a&#774;
+<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
+<literal>@udotaccent{--a}</literal> &#8211;a&#803;
+<literal>@v{--a}</literal> &#8211;a&#780;
+<literal>@,{--c}</literal> &#8211;c&#807;
+<literal>@ogonek{--a}</literal> &#8211;a&#808;
 </para>
 <para>@U{0075} &#x0075;
 </para>
@@ -1122,26 +1146,6 @@ but , ,
 <literal>@verb{:--a:}</literal> <literal>--a</literal>
 <literal>@verb{:a  &lt; &amp; @ % &quot; --    b:}</literal> <literal>a  &lt; 
&amp; @ % &quot; --    b</literal>
 <literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a<!-- /@w -->
-<literal>@H{a}</literal> a&#779;
-<literal>@H{--a}</literal> &#8211;a&#779;
-<literal>@dotaccent{a}</literal> &#551; (ȧ)
-<literal>@dotaccent{--a}</literal> &#8211;a&#775;
-<literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@ringaccent{--a}</literal> &#8211;a&#778;
-<literal>@tieaccent{a}</literal> a&#865;
-<literal>@tieaccent{--a}</literal> &#8211;a&#865;
-<literal>@u{a}</literal> &#259; (ă)
-<literal>@u{--a}</literal> &#8211;a&#774;
-<literal>@ubaraccent{a}</literal> a&#818;
-<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
-<literal>@udotaccent{--a}</literal> &#8211;a&#803;
-<literal>@v{a}</literal> &#462; (ǎ)
-<literal>@v{--a}</literal> &#8211;a&#780;
-<literal>@,{c}</literal> &#231; (ç)
-<literal>@,{--c}</literal> &#8211;c&#807;
-<literal>@ogonek{a}</literal> &#261; (ą)
-<literal>@ogonek{--a}</literal> &#8211;a&#808;
 <literal>a@sup{h}@sub{l}</literal> 
a<superscript>h</superscript><subscript>l</subscript>
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
@@ -1890,12 +1894,34 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<literal>@H{a}</literal> a&#779;
+<literal>@dotaccent{a}</literal> &#551; (ȧ)
+<literal>@ringaccent{a}</literal> &#229; (å)
+<literal>@tieaccent{a}</literal> a&#865;
+<literal>@u{a}</literal> &#259; (ă)
+<literal>@ubaraccent{a}</literal> a&#818;
+<literal>@udotaccent{a}</literal> &#7841; (ạ)
+<literal>@v{a}</literal> &#462; (ǎ)
+@,c &#231; (ç)
+<literal>@,{c}</literal> &#231; (ç)
+<literal>@ogonek{a}</literal> &#261; (ą)
+</para>
+<para>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
+</para>
+<para><literal>@H{--a}</literal> &#8211;a&#779;
+<literal>@dotaccent{--a}</literal> &#8211;a&#775;
+<literal>@ringaccent{--a}</literal> &#8211;a&#778;
+<literal>@tieaccent{--a}</literal> &#8211;a&#865;
+<literal>@u{--a}</literal> &#8211;a&#774;
+<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
+<literal>@udotaccent{--a}</literal> &#8211;a&#803;
+<literal>@v{--a}</literal> &#8211;a&#780;
+<literal>@,{--c}</literal> &#8211;c&#807;
+<literal>@ogonek{--a}</literal> &#8211;a&#808;
 </para>
 <para>@U{0075} &#x0075;
 </para>
@@ -2033,26 +2059,6 @@ but , ,
 <literal>@verb{:--a:}</literal> <literal>--a</literal>
 <literal>@verb{:a  &lt; &amp; @ % &quot; --    b:}</literal> <literal>a  &lt; 
&amp; @ % &quot; --    b</literal>
 <literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a<!-- /@w -->
-<literal>@H{a}</literal> a&#779;
-<literal>@H{--a}</literal> &#8211;a&#779;
-<literal>@dotaccent{a}</literal> &#551; (ȧ)
-<literal>@dotaccent{--a}</literal> &#8211;a&#775;
-<literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@ringaccent{--a}</literal> &#8211;a&#778;
-<literal>@tieaccent{a}</literal> a&#865;
-<literal>@tieaccent{--a}</literal> &#8211;a&#865;
-<literal>@u{a}</literal> &#259; (ă)
-<literal>@u{--a}</literal> &#8211;a&#774;
-<literal>@ubaraccent{a}</literal> a&#818;
-<literal>@ubaraccent{--a}</literal> &#8211;a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
-<literal>@udotaccent{--a}</literal> &#8211;a&#803;
-<literal>@v{a}</literal> &#462; (ǎ)
-<literal>@v{--a}</literal> &#8211;a&#780;
-<literal>@,{c}</literal> &#231; (ç)
-<literal>@,{--c}</literal> &#8211;c&#807;
-<literal>@ogonek{a}</literal> &#261; (ą)
-<literal>@ogonek{--a}</literal> &#8211;a&#808;
 <literal>a@sup{h}@sub{l}</literal> 
a<superscript>h</superscript><subscript>l</subscript>
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
@@ -2797,13 +2803,35 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @'{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
+<literal>@H{a}</literal> a&#779;
+<literal>@dotaccent{a}</literal> &#551; (ȧ)
+<literal>@ringaccent{a}</literal> &#229; (å)
+<literal>@tieaccent{a}</literal> a&#865;
+<literal>@u{a}</literal> &#259; (ă)
+<literal>@ubaraccent{a}</literal> a&#818;
+<literal>@udotaccent{a}</literal> &#7841; (ạ)
+<literal>@v{a}</literal> &#462; (ǎ)
+@,c &#231; (ç)
+<literal>@,{c}</literal> &#231; (ç)
+<literal>@ogonek{a}</literal> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
 
+<literal>@H{--a}</literal> --a&#779;
+<literal>@dotaccent{--a}</literal> --a&#775;
+<literal>@ringaccent{--a}</literal> --a&#778;
+<literal>@tieaccent{--a}</literal> --a&#865;
+<literal>@u{--a}</literal> --a&#774;
+<literal>@ubaraccent{--a}</literal> --a&#818;
+<literal>@udotaccent{--a}</literal> --a&#803;
+<literal>@v{--a}</literal> --a&#780;
+<literal>@,{--c}</literal> --c&#807;
+<literal>@ogonek{--a}</literal> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -2940,26 +2968,6 @@ but , ,
 <literal>@verb{:--a:}</literal> <literal>--a</literal>
 <literal>@verb{:a  &lt; &amp; @ % &quot; --    b:}</literal> <literal>a  &lt; 
&amp; @ % &quot; --    b</literal>
 <literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a<!-- /@w -->
-<literal>@H{a}</literal> a&#779;
-<literal>@H{--a}</literal> --a&#779;
-<literal>@dotaccent{a}</literal> &#551; (ȧ)
-<literal>@dotaccent{--a}</literal> --a&#775;
-<literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@ringaccent{--a}</literal> --a&#778;
-<literal>@tieaccent{a}</literal> a&#865;
-<literal>@tieaccent{--a}</literal> --a&#865;
-<literal>@u{a}</literal> &#259; (ă)
-<literal>@u{--a}</literal> --a&#774;
-<literal>@ubaraccent{a}</literal> a&#818;
-<literal>@ubaraccent{--a}</literal> --a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
-<literal>@udotaccent{--a}</literal> --a&#803;
-<literal>@v{a}</literal> &#462; (ǎ)
-<literal>@v{--a}</literal> --a&#780;
-<literal>@,{c}</literal> &#231; (ç)
-<literal>@,{--c}</literal> --c&#807;
-<literal>@ogonek{a}</literal> &#261; (ą)
-<literal>@ogonek{--a}</literal> --a&#808;
 <literal>a@sup{h}@sub{l}</literal> 
a<superscript>h</superscript><subscript>l</subscript>
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
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 bdaca90cc2..3336a0d33b 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
-@‘{@=E} Ḕ
+<code class="code">@H{a}</code> a̋
+<code class="code">@dotaccent{a}</code> ȧ (ȧ)
+<code class="code">@ringaccent{a}</code> å (å)
+<code class="code">@tieaccent{a}</code> a͡
+<code class="code">@u{a}</code> ă (ă)
+<code class="code">@ubaraccent{a}</code> a̲
+<code class="code">@udotaccent{a}</code> ạ (ạ)
+<code class="code">@v{a}</code> ǎ (ǎ)
+@,c ç (ç)
+<code class="code">@,{c}</code> ç (ç)
+<code class="code">@ogonek{a}</code> ą (ą)
+</p>
+<p>@‘{@=E} Ḕ
 @l{} ł
 @,{@’C} Ḉ
-@,c ç (ç)
 @,c@&quot;u çü <br>
 </p>
+<p><code class="code">@H{--a}</code> –a̋
+<code class="code">@dotaccent{--a}</code> –ȧ
+<code class="code">@ringaccent{--a}</code> –å
+<code class="code">@tieaccent{--a}</code> –a͡
+<code class="code">@u{--a}</code> –ă
+<code class="code">@ubaraccent{--a}</code> –a̲
+<code class="code">@udotaccent{--a}</code> –ạ
+<code class="code">@v{--a}</code> –ǎ
+<code class="code">@,{--c}</code> –ç
+<code class="code">@ogonek{--a}</code> –ą
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a̋
-<code class="code">@H{--a}</code> –a̋
-<code class="code">@dotaccent{a}</code> ȧ (ȧ)
-<code class="code">@dotaccent{--a}</code> –ȧ
-<code class="code">@ringaccent{a}</code> å (å)
-<code class="code">@ringaccent{--a}</code> –å
-<code class="code">@tieaccent{a}</code> a͡
-<code class="code">@tieaccent{--a}</code> –a͡
-<code class="code">@u{a}</code> ă (ă)
-<code class="code">@u{--a}</code> –ă
-<code class="code">@ubaraccent{a}</code> a̲
-<code class="code">@ubaraccent{--a}</code> –a̲
-<code class="code">@udotaccent{a}</code> ạ (ạ)
-<code class="code">@udotaccent{--a}</code> –ạ
-<code class="code">@v{a}</code> ǎ (ǎ)
-<code class="code">@v{--a}</code> –ǎ
-<code class="code">@,{c}</code> ç (ç)
-<code class="code">@,{--c}</code> –ç
-<code class="code">@ogonek{a}</code> ą (ą)
-<code class="code">@ogonek{--a}</code> –ą
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
-@‘{@=E} Ḕ
+<code class="code">@H{a}</code> a̋
+<code class="code">@dotaccent{a}</code> ȧ (ȧ)
+<code class="code">@ringaccent{a}</code> å (å)
+<code class="code">@tieaccent{a}</code> a͡
+<code class="code">@u{a}</code> ă (ă)
+<code class="code">@ubaraccent{a}</code> a̲
+<code class="code">@udotaccent{a}</code> ạ (ạ)
+<code class="code">@v{a}</code> ǎ (ǎ)
+@,c ç (ç)
+<code class="code">@,{c}</code> ç (ç)
+<code class="code">@ogonek{a}</code> ą (ą)
+</p>
+<p>@‘{@=E} Ḕ
 @l{} ł
 @,{@’C} Ḉ
-@,c ç (ç)
 @,c@&quot;u çü <br>
 </p>
+<p><code class="code">@H{--a}</code> –a̋
+<code class="code">@dotaccent{--a}</code> –ȧ
+<code class="code">@ringaccent{--a}</code> –å
+<code class="code">@tieaccent{--a}</code> –a͡
+<code class="code">@u{--a}</code> –ă
+<code class="code">@ubaraccent{--a}</code> –a̲
+<code class="code">@udotaccent{--a}</code> –ạ
+<code class="code">@v{--a}</code> –ǎ
+<code class="code">@,{--c}</code> –ç
+<code class="code">@ogonek{--a}</code> –ą
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a̋
-<code class="code">@H{--a}</code> –a̋
-<code class="code">@dotaccent{a}</code> ȧ (ȧ)
-<code class="code">@dotaccent{--a}</code> –ȧ
-<code class="code">@ringaccent{a}</code> å (å)
-<code class="code">@ringaccent{--a}</code> –å
-<code class="code">@tieaccent{a}</code> a͡
-<code class="code">@tieaccent{--a}</code> –a͡
-<code class="code">@u{a}</code> ă (ă)
-<code class="code">@u{--a}</code> –ă
-<code class="code">@ubaraccent{a}</code> a̲
-<code class="code">@ubaraccent{--a}</code> –a̲
-<code class="code">@udotaccent{a}</code> ạ (ạ)
-<code class="code">@udotaccent{--a}</code> –ạ
-<code class="code">@v{a}</code> ǎ (ǎ)
-<code class="code">@v{--a}</code> –ǎ
-<code class="code">@,{c}</code> ç (ç)
-<code class="code">@,{--c}</code> –ç
-<code class="code">@ogonek{a}</code> ą (ą)
-<code class="code">@ogonek{--a}</code> –ą
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
-@‘{@=E} Ḕ
+<code class="code">@H{a}</code> a̋
+<code class="code">@dotaccent{a}</code> ȧ (ȧ)
+<code class="code">@ringaccent{a}</code> å (å)
+<code class="code">@tieaccent{a}</code> a͡
+<code class="code">@u{a}</code> ă (ă)
+<code class="code">@ubaraccent{a}</code> a̲
+<code class="code">@udotaccent{a}</code> ạ (ạ)
+<code class="code">@v{a}</code> ǎ (ǎ)
+@,c ç (ç)
+<code class="code">@,{c}</code> ç (ç)
+<code class="code">@ogonek{a}</code> ą (ą)
+</p>
+<p>@‘{@=E} Ḕ
 @l{} ł
 @,{@’C} Ḉ
-@,c ç (ç)
 @,c@&quot;u çü <br>
 </p>
+<p><code class="code">@H{--a}</code> –a̋
+<code class="code">@dotaccent{--a}</code> –ȧ
+<code class="code">@ringaccent{--a}</code> –å
+<code class="code">@tieaccent{--a}</code> –a͡
+<code class="code">@u{--a}</code> –ă
+<code class="code">@ubaraccent{--a}</code> –a̲
+<code class="code">@udotaccent{--a}</code> –ạ
+<code class="code">@v{--a}</code> –ǎ
+<code class="code">@,{--c}</code> –ç
+<code class="code">@ogonek{--a}</code> –ą
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a̋
-<code class="code">@H{--a}</code> –a̋
-<code class="code">@dotaccent{a}</code> ȧ (ȧ)
-<code class="code">@dotaccent{--a}</code> –ȧ
-<code class="code">@ringaccent{a}</code> å (å)
-<code class="code">@ringaccent{--a}</code> –å
-<code class="code">@tieaccent{a}</code> a͡
-<code class="code">@tieaccent{--a}</code> –a͡
-<code class="code">@u{a}</code> ă (ă)
-<code class="code">@u{--a}</code> –ă
-<code class="code">@ubaraccent{a}</code> a̲
-<code class="code">@ubaraccent{--a}</code> –a̲
-<code class="code">@udotaccent{a}</code> ạ (ạ)
-<code class="code">@udotaccent{--a}</code> –ạ
-<code class="code">@v{a}</code> ǎ (ǎ)
-<code class="code">@v{--a}</code> –ǎ
-<code class="code">@,{c}</code> ç (ç)
-<code class="code">@,{--c}</code> –ç
-<code class="code">@ogonek{a}</code> ą (ą)
-<code class="code">@ogonek{--a}</code> –ą
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
-@‘{@=E} Ḕ
+<code class="code">@H{a}</code> a̋
+<code class="code">@dotaccent{a}</code> ȧ (ȧ)
+<code class="code">@ringaccent{a}</code> å (å)
+<code class="code">@tieaccent{a}</code> a͡
+<code class="code">@u{a}</code> ă (ă)
+<code class="code">@ubaraccent{a}</code> a̲
+<code class="code">@udotaccent{a}</code> ạ (ạ)
+<code class="code">@v{a}</code> ǎ (ǎ)
+@,c ç (ç)
+<code class="code">@,{c}</code> ç (ç)
+<code class="code">@ogonek{a}</code> ą (ą)
+</p>
+<p>@‘{@=E} Ḕ
 @l{} ł
 @,{@’C} Ḉ
-@,c ç (ç)
 @,c@&quot;u çü <br>
 </p>
+<p><code class="code">@H{--a}</code> –a̋
+<code class="code">@dotaccent{--a}</code> –ȧ
+<code class="code">@ringaccent{--a}</code> –å
+<code class="code">@tieaccent{--a}</code> –a͡
+<code class="code">@u{--a}</code> –ă
+<code class="code">@ubaraccent{--a}</code> –a̲
+<code class="code">@udotaccent{--a}</code> –ạ
+<code class="code">@v{--a}</code> –ǎ
+<code class="code">@,{--c}</code> –ç
+<code class="code">@ogonek{--a}</code> –ą
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a̋
-<code class="code">@H{--a}</code> –a̋
-<code class="code">@dotaccent{a}</code> ȧ (ȧ)
-<code class="code">@dotaccent{--a}</code> –ȧ
-<code class="code">@ringaccent{a}</code> å (å)
-<code class="code">@ringaccent{--a}</code> –å
-<code class="code">@tieaccent{a}</code> a͡
-<code class="code">@tieaccent{--a}</code> –a͡
-<code class="code">@u{a}</code> ă (ă)
-<code class="code">@u{--a}</code> –ă
-<code class="code">@ubaraccent{a}</code> a̲
-<code class="code">@ubaraccent{--a}</code> –a̲
-<code class="code">@udotaccent{a}</code> ạ (ạ)
-<code class="code">@udotaccent{--a}</code> –ạ
-<code class="code">@v{a}</code> ǎ (ǎ)
-<code class="code">@v{--a}</code> –ǎ
-<code class="code">@,{c}</code> ç (ç)
-<code class="code">@,{--c}</code> –ç
-<code class="code">@ogonek{a}</code> ą (ą)
-<code class="code">@ogonek{--a}</code> –ą
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+<code class="code">@H{a}</code> a̋
+<code class="code">@dotaccent{a}</code> ȧ (ȧ)
+<code class="code">@ringaccent{a}</code> å (å)
+<code class="code">@tieaccent{a}</code> a͡
+<code class="code">@u{a}</code> ă (ă)
+<code class="code">@ubaraccent{a}</code> a̲
+<code class="code">@udotaccent{a}</code> ạ (ạ)
+<code class="code">@v{a}</code> ǎ (ǎ)
+@,c ç (ç)
+<code class="code">@,{c}</code> ç (ç)
+<code class="code">@ogonek{a}</code> ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@&quot;u çü 
 
 
+<code class="code">@H{--a}</code> --a̋
+<code class="code">@dotaccent{--a}</code> --ȧ
+<code class="code">@ringaccent{--a}</code> --å
+<code class="code">@tieaccent{--a}</code> --a͡
+<code class="code">@u{--a}</code> --ă
+<code class="code">@ubaraccent{--a}</code> --a̲
+<code class="code">@udotaccent{--a}</code> --ạ
+<code class="code">@v{--a}</code> --ǎ
+<code class="code">@,{--c}</code> --ç
+<code class="code">@ogonek{--a}</code> --ą
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a̋
-<code class="code">@H{--a}</code> --a̋
-<code class="code">@dotaccent{a}</code> ȧ (ȧ)
-<code class="code">@dotaccent{--a}</code> --ȧ
-<code class="code">@ringaccent{a}</code> å (å)
-<code class="code">@ringaccent{--a}</code> --å
-<code class="code">@tieaccent{a}</code> a͡
-<code class="code">@tieaccent{--a}</code> --a͡
-<code class="code">@u{a}</code> ă (ă)
-<code class="code">@u{--a}</code> --ă
-<code class="code">@ubaraccent{a}</code> a̲
-<code class="code">@ubaraccent{--a}</code> --a̲
-<code class="code">@udotaccent{a}</code> ạ (ạ)
-<code class="code">@udotaccent{--a}</code> --ạ
-<code class="code">@v{a}</code> ǎ (ǎ)
-<code class="code">@v{--a}</code> --ǎ
-<code class="code">@,{c}</code> ç (ç)
-<code class="code">@,{--c}</code> --ç
-<code class="code">@ogonek{a}</code> ą (ą)
-<code class="code">@ogonek{--a}</code> --ą
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
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 b00cc42ebc..f124974950 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
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -930,12 +932,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -1071,26 +1095,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.xhtml#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.xhtml#FOOT2_6"><sup>6</sup></a>
@@ -2013,12 +2017,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -2154,26 +2180,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.xhtml#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.xhtml#FOOT6"><sup>8</sup></a>
@@ -3100,13 +3106,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3244,26 +3272,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.xhtml#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.xhtml#FOOT8">(10)</a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 0878d58806..9edc00d65d 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 b9e584ff1c..2397b346d7 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
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -915,12 +917,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -1056,26 +1080,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.xhtml#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.xhtml#FOOT4"><sup>2</sup></a>
@@ -2000,12 +2004,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -2141,26 +2167,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.xhtml#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.xhtml#FOOT2"><sup>4</sup></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 7cce3e139b..aa0d6a8e71 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index eeb4ef37d0..072e51f4a5 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 0d2126b32c..f16c92cef0 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index b50e52d39a..a47596b4ab 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 ac3931d4c7..e52b53cea4 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
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -931,12 +933,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -1072,26 +1096,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.xhtml#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.xhtml#FOOT2_6"><sup>6</sup></a>
@@ -2014,12 +2018,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -2155,26 +2181,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.xhtml#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.xhtml#FOOT6"><sup>8</sup></a>
@@ -3101,13 +3107,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3245,26 +3273,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.xhtml#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.xhtml#FOOT8">(10)</a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 69729c0e4f..17d4154c93 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 178dcd44d9..47cc7c82c1 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
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -917,12 +919,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -1058,26 +1082,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.xhtml#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.xhtml#FOOT4"><sup>2</sup></a>
@@ -2002,12 +2006,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -2143,26 +2169,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.xhtml#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.xhtml#FOOT2"><sup>4</sup></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index e9bcf44e0d..52f29b6278 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index eecc93c5ae..6ae28e1c4d 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 8c10cc5602..d3f9288929 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 0726fca5d4..172ca999db 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index b77aaacfc7..396b06c543 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index fae4725c6d..fa3acee2ed 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 42b9f49b9e..a9ec7d7289 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index 83dd399b92..5c95111110 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 8f7687e16b..8b080d38a2 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 2b7daeb1bd..ac7e70382b 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -949,12 +951,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1090,26 +1114,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>2</sup></a>
@@ -2032,12 +2036,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2173,26 +2199,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>4</sup></a>
@@ -3119,13 +3125,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3263,26 +3291,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(5)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(6)</a>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 13c1d890a4..0ac326e3a2 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index 2389566a7f..e52d3f44ab 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index fec82679b8..2637335195 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index a99f849297..0ab1c70ecd 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index a82ee7d1b8..04c61703c5 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 73a1455da8..b2b52a6ad0 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 12e21243c5..d0bb3bdbbd 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index a7d97729c4..68a188b041 100644
--- 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 98c3297a1b..962f101fc5 100644
--- 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 8868de26bb..fffdffce7b 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 99d39c0f10..d6a6d1a9d6 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 40a31b18b0..79fa2f2d3e 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -894,12 +896,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@`{@=E} &#274;&#768;
+<code>@H{a}</code> a&#779;
+<code>@dotaccent{a}</code> &#551; (ȧ)
+<code>@ringaccent{a}</code> &aring; (å)
+<code>@tieaccent{a}</code> a&#865;
+<code>@u{a}</code> &#259; (ă)
+<code>@ubaraccent{a}</code> a&#818;
+<code>@udotaccent{a}</code> &#7841; (ạ)
+<code>@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code>@,{c}</code> &ccedil; (ç)
+<code>@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
+<p><code>@H{--a}</code> -a&#779;
+<code>@dotaccent{--a}</code> -a&#775;
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{--a}</code> -a&#865;
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{--a}</code> -a&#818;
+<code>@udotaccent{--a}</code> -a&#803;
+<code>@v{--a}</code> -a&#780;
+<code>@,{--c}</code> -c&#807;
+<code>@ogonek{--a}</code> -a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1035,26 +1059,6 @@ but , ,
 <code>@verb{:--a:}</code> <code>--a</code>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a&#779;
-<code>@H{--a}</code> -a&#779;
-<code>@dotaccent{a}</code> &#551; (ȧ)
-<code>@dotaccent{--a}</code> -a&#775;
-<code>@ringaccent{a}</code> &aring; (å)
-<code>@ringaccent{--a}</code> -a&#778;
-<code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> -a&#865;
-<code>@u{a}</code> &#259; (ă)
-<code>@u{--a}</code> -a&#774;
-<code>@ubaraccent{a}</code> a&#818;
-<code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
-<code>@udotaccent{--a}</code> -a&#803;
-<code>@v{a}</code> &#462; (ǎ)
-<code>@v{--a}</code> -a&#780;
-<code>@,{c}</code> &ccedil; (ç)
-<code>@,{--c}</code> -c&#807;
-<code>@ogonek{a}</code> &#261; (ą)
-<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -1953,12 +1957,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@`{@=E} &#274;&#768;
+<code>@H{a}</code> a&#779;
+<code>@dotaccent{a}</code> &#551; (ȧ)
+<code>@ringaccent{a}</code> &aring; (å)
+<code>@tieaccent{a}</code> a&#865;
+<code>@u{a}</code> &#259; (ă)
+<code>@ubaraccent{a}</code> a&#818;
+<code>@udotaccent{a}</code> &#7841; (ạ)
+<code>@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code>@,{c}</code> &ccedil; (ç)
+<code>@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
+<p><code>@H{--a}</code> -a&#779;
+<code>@dotaccent{--a}</code> -a&#775;
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{--a}</code> -a&#865;
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{--a}</code> -a&#818;
+<code>@udotaccent{--a}</code> -a&#803;
+<code>@v{--a}</code> -a&#780;
+<code>@,{--c}</code> -c&#807;
+<code>@ogonek{--a}</code> -a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2094,26 +2120,6 @@ but , ,
 <code>@verb{:--a:}</code> <code>--a</code>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a&#779;
-<code>@H{--a}</code> -a&#779;
-<code>@dotaccent{a}</code> &#551; (ȧ)
-<code>@dotaccent{--a}</code> -a&#775;
-<code>@ringaccent{a}</code> &aring; (å)
-<code>@ringaccent{--a}</code> -a&#778;
-<code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> -a&#865;
-<code>@u{a}</code> &#259; (ă)
-<code>@u{--a}</code> -a&#774;
-<code>@ubaraccent{a}</code> a&#818;
-<code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
-<code>@udotaccent{--a}</code> -a&#803;
-<code>@v{a}</code> &#462; (ǎ)
-<code>@v{--a}</code> -a&#780;
-<code>@,{c}</code> &ccedil; (ç)
-<code>@,{--c}</code> -c&#807;
-<code>@ogonek{a}</code> &#261; (ą)
-<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -3069,12 +3075,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@`{@=E} &#274;&#768;
+<code>@H{a}</code> a&#779;
+<code>@dotaccent{a}</code> &#551; (ȧ)
+<code>@ringaccent{a}</code> &aring; (å)
+<code>@tieaccent{a}</code> a&#865;
+<code>@u{a}</code> &#259; (ă)
+<code>@ubaraccent{a}</code> a&#818;
+<code>@udotaccent{a}</code> &#7841; (ạ)
+<code>@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code>@,{c}</code> &ccedil; (ç)
+<code>@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
+<p><code>@H{--a}</code> -a&#779;
+<code>@dotaccent{--a}</code> -a&#775;
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{--a}</code> -a&#865;
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{--a}</code> -a&#818;
+<code>@udotaccent{--a}</code> -a&#803;
+<code>@v{--a}</code> -a&#780;
+<code>@,{--c}</code> -c&#807;
+<code>@ogonek{--a}</code> -a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3210,26 +3238,6 @@ but , ,
 <code>@verb{:--a:}</code> <code>--a</code>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a&#779;
-<code>@H{--a}</code> -a&#779;
-<code>@dotaccent{a}</code> &#551; (ȧ)
-<code>@dotaccent{--a}</code> -a&#775;
-<code>@ringaccent{a}</code> &aring; (å)
-<code>@ringaccent{--a}</code> -a&#778;
-<code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> -a&#865;
-<code>@u{a}</code> &#259; (ă)
-<code>@u{--a}</code> -a&#774;
-<code>@ubaraccent{a}</code> a&#818;
-<code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
-<code>@udotaccent{--a}</code> -a&#803;
-<code>@v{a}</code> &#462; (ǎ)
-<code>@v{--a}</code> -a&#780;
-<code>@,{c}</code> &ccedil; (ç)
-<code>@,{--c}</code> -c&#807;
-<code>@ogonek{a}</code> &#261; (ą)
-<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -4126,12 +4134,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@`{@=E} &#274;&#768;
+<code>@H{a}</code> a&#779;
+<code>@dotaccent{a}</code> &#551; (ȧ)
+<code>@ringaccent{a}</code> &aring; (å)
+<code>@tieaccent{a}</code> a&#865;
+<code>@u{a}</code> &#259; (ă)
+<code>@ubaraccent{a}</code> a&#818;
+<code>@udotaccent{a}</code> &#7841; (ạ)
+<code>@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code>@,{c}</code> &ccedil; (ç)
+<code>@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
+<p><code>@H{--a}</code> -a&#779;
+<code>@dotaccent{--a}</code> -a&#775;
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{--a}</code> -a&#865;
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{--a}</code> -a&#818;
+<code>@udotaccent{--a}</code> -a&#803;
+<code>@v{--a}</code> -a&#780;
+<code>@,{--c}</code> -c&#807;
+<code>@ogonek{--a}</code> -a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4267,26 +4297,6 @@ but , ,
 <code>@verb{:--a:}</code> <code>--a</code>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a&#779;
-<code>@H{--a}</code> -a&#779;
-<code>@dotaccent{a}</code> &#551; (ȧ)
-<code>@dotaccent{--a}</code> -a&#775;
-<code>@ringaccent{a}</code> &aring; (å)
-<code>@ringaccent{--a}</code> -a&#778;
-<code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> -a&#865;
-<code>@u{a}</code> &#259; (ă)
-<code>@u{--a}</code> -a&#774;
-<code>@ubaraccent{a}</code> a&#818;
-<code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
-<code>@udotaccent{--a}</code> -a&#803;
-<code>@v{a}</code> &#462; (ǎ)
-<code>@v{--a}</code> -a&#780;
-<code>@,{c}</code> &ccedil; (ç)
-<code>@,{--c}</code> -c&#807;
-<code>@ogonek{a}</code> &#261; (ą)
-<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -5186,13 +5196,35 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
+<code>@H{a}</code> a&#779;
+<code>@dotaccent{a}</code> &#551; (ȧ)
+<code>@ringaccent{a}</code> &aring; (å)
+<code>@tieaccent{a}</code> a&#865;
+<code>@u{a}</code> &#259; (ă)
+<code>@ubaraccent{a}</code> a&#818;
+<code>@udotaccent{a}</code> &#7841; (ạ)
+<code>@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code>@,{c}</code> &ccedil; (ç)
+<code>@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&#34;u &ccedil;&uuml; 
 
 
+<code>@H{--a}</code> --a&#779;
+<code>@dotaccent{--a}</code> --a&#775;
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{--a}</code> --a&#865;
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{--a}</code> --a&#818;
+<code>@udotaccent{--a}</code> --a&#803;
+<code>@v{--a}</code> --a&#780;
+<code>@,{--c}</code> --c&#807;
+<code>@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5330,26 +5362,6 @@ but , ,
 <code>@verb{:--a:}</code> <code>--a</code>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a&#779;
-<code>@H{--a}</code> --a&#779;
-<code>@dotaccent{a}</code> &#551; (ȧ)
-<code>@dotaccent{--a}</code> --a&#775;
-<code>@ringaccent{a}</code> &aring; (å)
-<code>@ringaccent{--a}</code> --a&#778;
-<code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> --a&#865;
-<code>@u{a}</code> &#259; (ă)
-<code>@u{--a}</code> --a&#774;
-<code>@ubaraccent{a}</code> a&#818;
-<code>@ubaraccent{--a}</code> --a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
-<code>@udotaccent{--a}</code> --a&#803;
-<code>@v{a}</code> &#462; (ǎ)
-<code>@v{--a}</code> --a&#780;
-<code>@,{c}</code> &ccedil; (ç)
-<code>@,{--c}</code> --c&#807;
-<code>@ogonek{a}</code> &#261; (ą)
-<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
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 34cbf21c73..34fce33968 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
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -989,12 +991,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1130,26 +1154,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>2</sup></a>
@@ -2072,12 +2076,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2213,26 +2239,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>4</sup></a>
@@ -3159,13 +3165,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3303,26 +3331,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(5)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(6)</a>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 145a56b01a..4f230e239e 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 85626d3849..6dcf29e36d 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -950,12 +952,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1091,26 +1115,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.html#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.html#FOOT2_6"><sup>6</sup></a>
@@ -2033,12 +2037,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2174,26 +2200,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.html#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.html#FOOT6"><sup>8</sup></a>
@@ -3120,13 +3126,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3264,26 +3292,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.html#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.html#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index c2b3f8cd67..27a839d77d 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index 43fbf21ca9..2f8c701aee 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 91454b9f61..d0b672cc60 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index dbba808973..cc69eb3cec 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index ef76bcbf68..f5c8c597c7 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 8cc72de0ba..0843079936 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -921,12 +923,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1062,26 +1086,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.html#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.html#FOOT4"><sup>2</sup></a>
@@ -2006,12 +2010,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2147,26 +2173,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.html#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.html#FOOT2"><sup>4</sup></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 12c786fe17..39a686ede6 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index ea5b74360b..4a8f9b9b63 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 1b565e7ed1..d6e3a51f88 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 430ab3db12..8df0a2e35a 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 35b3b3f568..2320dbeefd 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -15,7 +15,15 @@ kbd: '``simple-double--three---four----'''
 
    @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
 (ì) @'{e} é (é) @'{@dotless{i}} í (í) @dotless{i} ı (ı) @dotless{j} ȷ
-(ȷ) @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç (ç) @,c@"u çü
+(ȷ) '@H{a}' a̋ '@dotaccent{a}' ȧ (ȧ) '@ringaccent{a}' å (å)
+'@tieaccent{a}' a͡ '@u{a}' ă (ă) '@ubaraccent{a}' a̲ '@udotaccent{a}' ạ
+(ạ) '@v{a}' ǎ (ǎ) @,c ç (ç) '@,{c}' ç (ç) '@ogonek{a}' ą (ą)
+
+   @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c@"u çü
+
+   '@H{--a}' -a̋ '@dotaccent{--a}' -ȧ '@ringaccent{--a}' -å
+'@tieaccent{--a}' -a͡ '@u{--a}' -ă '@ubaraccent{--a}' -a̲
+'@udotaccent{--a}' -ạ '@v{--a}' -ǎ '@,{--c}' -ç '@ogonek{--a}' -ą
 
    @U{0075} u
 
@@ -66,13 +74,8 @@ Now !  !@ but , ,
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}'
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ (ȧ) '@dotaccent{--a}' -ȧ
-'@ringaccent{a}' å (å) '@ringaccent{--a}' -å '@tieaccent{a}' a͡
-'@tieaccent{--a}' -a͡ '@u{a}' ă (ă) '@u{--a}' -ă '@ubaraccent{a}' a̲
-'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ (ạ) '@udotaccent{--a}' -ạ
-'@v{a}' ǎ (ǎ) '@v{--a}' -ǎ '@,{c}' ç (ç) '@,{--c}' -ç '@ogonek{a}' ą (ą)
-'@ogonek{--a}' -ą 'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}'
-(1) '@footnote{in footnote2}' (2)
+'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}' (1) '@footnote{in
+footnote2}' (2)
 
    '@sp 2'
 
@@ -733,7 +736,15 @@ kbd: '``simple-double--three---four----'''
 
    @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
 (ì) @'{e} é (é) @'{@dotless{i}} í (í) @dotless{i} ı (ı) @dotless{j} ȷ
-(ȷ) @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç (ç) @,c@"u çü
+(ȷ) '@H{a}' a̋ '@dotaccent{a}' ȧ (ȧ) '@ringaccent{a}' å (å)
+'@tieaccent{a}' a͡ '@u{a}' ă (ă) '@ubaraccent{a}' a̲ '@udotaccent{a}' ạ
+(ạ) '@v{a}' ǎ (ǎ) @,c ç (ç) '@,{c}' ç (ç) '@ogonek{a}' ą (ą)
+
+   @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c@"u çü
+
+   '@H{--a}' -a̋ '@dotaccent{--a}' -ȧ '@ringaccent{--a}' -å
+'@tieaccent{--a}' -a͡ '@u{--a}' -ă '@ubaraccent{--a}' -a̲
+'@udotaccent{--a}' -ạ '@v{--a}' -ǎ '@,{--c}' -ç '@ogonek{--a}' -ą
 
    @U{0075} u
 
@@ -784,13 +795,8 @@ Now !  !@ but , ,
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}'
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ (ȧ) '@dotaccent{--a}' -ȧ
-'@ringaccent{a}' å (å) '@ringaccent{--a}' -å '@tieaccent{a}' a͡
-'@tieaccent{--a}' -a͡ '@u{a}' ă (ă) '@u{--a}' -ă '@ubaraccent{a}' a̲
-'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ (ạ) '@udotaccent{--a}' -ạ
-'@v{a}' ǎ (ǎ) '@v{--a}' -ǎ '@,{c}' ç (ç) '@,{--c}' -ç '@ogonek{a}' ą (ą)
-'@ogonek{--a}' -ą 'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}'
-(1) '@footnote{in footnote2}' (2)
+'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}' (1) '@footnote{in
+footnote2}' (2)
 
    '@sp 2'
 
@@ -1408,7 +1414,15 @@ kbd: '``simple-double--three---four----'''
 
    @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
 (ì) @'{e} é (é) @'{@dotless{i}} í (í) @dotless{i} ı (ı) @dotless{j} ȷ
-(ȷ) @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç (ç) @,c@"u çü
+(ȷ) '@H{a}' a̋ '@dotaccent{a}' ȧ (ȧ) '@ringaccent{a}' å (å)
+'@tieaccent{a}' a͡ '@u{a}' ă (ă) '@ubaraccent{a}' a̲ '@udotaccent{a}' ạ
+(ạ) '@v{a}' ǎ (ǎ) @,c ç (ç) '@,{c}' ç (ç) '@ogonek{a}' ą (ą)
+
+   @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c@"u çü
+
+   '@H{--a}' -a̋ '@dotaccent{--a}' -ȧ '@ringaccent{--a}' -å
+'@tieaccent{--a}' -a͡ '@u{--a}' -ă '@ubaraccent{--a}' -a̲
+'@udotaccent{--a}' -ạ '@v{--a}' -ǎ '@,{--c}' -ç '@ogonek{--a}' -ą
 
    @U{0075} u
 
@@ -1459,13 +1473,8 @@ Now !  !@ but , ,
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}'
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ (ȧ) '@dotaccent{--a}' -ȧ
-'@ringaccent{a}' å (å) '@ringaccent{--a}' -å '@tieaccent{a}' a͡
-'@tieaccent{--a}' -a͡ '@u{a}' ă (ă) '@u{--a}' -ă '@ubaraccent{a}' a̲
-'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ (ạ) '@udotaccent{--a}' -ạ
-'@v{a}' ǎ (ǎ) '@v{--a}' -ǎ '@,{c}' ç (ç) '@,{--c}' -ç '@ogonek{a}' ą (ą)
-'@ogonek{--a}' -ą 'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}'
-(3) '@footnote{in footnote2}' (4)
+'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}' (3) '@footnote{in
+footnote2}' (4)
 
    '@sp 2'
 
@@ -2104,13 +2113,35 @@ cross ref name: (file name). '@inforef{}' *note ::
      @'{@dotless{i}} í (í)
      @dotless{i} ı (ı)
      @dotless{j} ȷ (ȷ)
+     @H{a} a̋
+     @dotaccent{a} ȧ (ȧ)
+     @ringaccent{a} å (å)
+     @tieaccent{a} a͡
+     @u{a} ă (ă)
+     @ubaraccent{a} a̲
+     @udotaccent{a} ạ (ạ)
+     @v{a} ǎ (ǎ)
+     @,c ç (ç)
+     @,{c} ç (ç)
+     @ogonek{a} ą (ą)
+
      @`{@=E} Ḕ
      @l{} ł
      @,{@'C} Ḉ
-     @,c ç (ç)
      @,c@"u çü
 
 
+     @H{--a} -a̋
+     @dotaccent{--a} -ȧ
+     @ringaccent{--a} -å
+     @tieaccent{--a} -a͡
+     @u{--a} -ă
+     @ubaraccent{--a} -a̲
+     @udotaccent{--a} -ạ
+     @v{--a} -ǎ
+     @,{--c} -ç
+     @ogonek{--a} -ą
+
      @U{0075} u
 
      @*
@@ -2249,26 +2280,6 @@ cross ref name: (file name). '@inforef{}' *note ::
      @verb{:--a:} --a
      @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
      @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-     @H{a} a̋
-     @H{--a} -a̋
-     @dotaccent{a} ȧ (ȧ)
-     @dotaccent{--a} -ȧ
-     @ringaccent{a} å (å)
-     @ringaccent{--a} -å
-     @tieaccent{a} a͡
-     @tieaccent{--a} -a͡
-     @u{a} ă (ă)
-     @u{--a} -ă
-     @ubaraccent{a} a̲
-     @ubaraccent{--a} -a̲
-     @udotaccent{a} ạ (ạ)
-     @udotaccent{--a} -ạ
-     @v{a} ǎ (ǎ)
-     @v{--a} -ǎ
-     @,{c} ç (ç)
-     @,{--c} -ç
-     @ogonek{a} ą (ą)
-     @ogonek{--a} -ą
      a@sup{h}@sub{l} a^{h}_{l}
      @footnote{in footnote} (5)
      @footnote{in footnote2} (6)
@@ -2928,14 +2939,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2194)
+* truc:                                  chapter.            (line 2202)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2194)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2202)
 
    cp
 
@@ -2943,116 +2954,116 @@ aaa"]
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  695)
-* " <2>:                                 chapter.            (line 1373)
+* " <1>:                                 chapter.            (line  698)
+* " <2>:                                 chapter.            (line 1379)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  695)
-* -option <2>:                           chapter.            (line 1373)
-* .:                                     chapter.            (line 2194)
-* ?:                                     chapter.            (line 2194)
-* a:                                     chapter.            (line 2194)
-* aaa, bbb:                              chapter.            (line 2194)
-* a--a:                                  chapter.            (line 2194)
-* a--asis:                               chapter.            (line  507)
-* a--asis <1>:                           chapter.            (line 1174)
-* a--asis <2>:                           chapter.            (line 1979)
-* b:                                     chapter.            (line  508)
-* b <1>:                                 chapter.            (line 1175)
-* b <2>:                                 chapter.            (line 1980)
-* b--b, c--c:                            chapter.            (line 2194)
+* -option <1>:                           chapter.            (line  698)
+* -option <2>:                           chapter.            (line 1379)
+* .:                                     chapter.            (line 2202)
+* ?:                                     chapter.            (line 2202)
+* a:                                     chapter.            (line 2202)
+* aaa, bbb:                              chapter.            (line 2202)
+* a--a:                                  chapter.            (line 2202)
+* a--asis:                               chapter.            (line  510)
+* a--asis <1>:                           chapter.            (line 1180)
+* a--asis <2>:                           chapter.            (line 1987)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line 1181)
+* b <2>:                                 chapter.            (line 1988)
+* b--b, c--c:                            chapter.            (line 2202)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2194)
-* d--efcv_name:                          chapter.            (line  348)
-* d--efcv_name <1>:                      chapter.            (line  351)
-* d--efcv_name <2>:                      chapter.            (line 1015)
-* d--efcv_name <3>:                      chapter.            (line 1018)
-* d--efcv_name <4>:                      chapter.            (line 1820)
-* d--efcv_name <5>:                      chapter.            (line 1823)
-* d--efivar_name of c--lass:             chapter.            (line  393)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1060)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1865)
-* d--efopt_name:                         chapter.            (line  384)
-* d--efopt_name <1>:                     chapter.            (line 1051)
-* d--efopt_name <2>:                     chapter.            (line 1856)
-* d--eftypecv_name of c--lass:           chapter.            (line  354)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  357)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1024)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1826)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1829)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  425)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  428)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1092)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1095)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1898)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1901)
-* d--eftypeivar_name of c--lass:         chapter.            (line  396)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1063)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1868)
-* d--eftypevar_name:                     chapter.            (line  390)
-* d--eftypevar_name <1>:                 chapter.            (line 1057)
-* d--eftypevar_name <2>:                 chapter.            (line 1862)
-* d--eftypevr_name:                      chapter.            (line  345)
-* d--eftypevr_name <1>:                  chapter.            (line 1012)
-* d--eftypevr_name <2>:                  chapter.            (line 1817)
-* d--efvar_name:                         chapter.            (line  378)
-* d--efvar_name <1>:                     chapter.            (line  381)
-* d--efvar_name <2>:                     chapter.            (line 1045)
-* d--efvar_name <3>:                     chapter.            (line 1048)
-* d--efvar_name <4>:                     chapter.            (line 1850)
-* d--efvar_name <5>:                     chapter.            (line 1853)
-* d--efvr_name:                          chapter.            (line  324)
-* d--efvr_name <1>:                      chapter.            (line  991)
-* d--efvr_name <2>:                      chapter.            (line 1796)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2194)
-* index entry between item and itemx:    chapter.            (line  512)
-* index entry between item and itemx <1>: chapter.           (line  630)
-* index entry between item and itemx <2>: chapter.           (line 1179)
-* index entry between item and itemx <3>: chapter.           (line 1297)
-* index entry between item and itemx <4>: chapter.           (line 1984)
-* index entry between item and itemx <5>: chapter.           (line 2135)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2202)
+* d--efcv_name:                          chapter.            (line  351)
+* d--efcv_name <1>:                      chapter.            (line  354)
+* d--efcv_name <2>:                      chapter.            (line 1021)
+* d--efcv_name <3>:                      chapter.            (line 1024)
+* d--efcv_name <4>:                      chapter.            (line 1828)
+* d--efcv_name <5>:                      chapter.            (line 1831)
+* d--efivar_name of c--lass:             chapter.            (line  396)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1066)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1873)
+* d--efopt_name:                         chapter.            (line  387)
+* d--efopt_name <1>:                     chapter.            (line 1057)
+* d--efopt_name <2>:                     chapter.            (line 1864)
+* d--eftypecv_name of c--lass:           chapter.            (line  357)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  360)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1027)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1030)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1834)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1837)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  428)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  431)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1906)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1909)
+* d--eftypeivar_name of c--lass:         chapter.            (line  399)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1069)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1876)
+* d--eftypevar_name:                     chapter.            (line  393)
+* d--eftypevar_name <1>:                 chapter.            (line 1063)
+* d--eftypevar_name <2>:                 chapter.            (line 1870)
+* d--eftypevr_name:                      chapter.            (line  348)
+* d--eftypevr_name <1>:                  chapter.            (line 1018)
+* d--eftypevr_name <2>:                  chapter.            (line 1825)
+* d--efvar_name:                         chapter.            (line  381)
+* d--efvar_name <1>:                     chapter.            (line  384)
+* d--efvar_name <2>:                     chapter.            (line 1051)
+* d--efvar_name <3>:                     chapter.            (line 1054)
+* d--efvar_name <4>:                     chapter.            (line 1858)
+* d--efvar_name <5>:                     chapter.            (line 1861)
+* d--efvr_name:                          chapter.            (line  327)
+* d--efvr_name <1>:                      chapter.            (line  997)
+* d--efvr_name <2>:                      chapter.            (line 1804)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2202)
+* index entry between item and itemx:    chapter.            (line  515)
+* index entry between item and itemx <1>: chapter.           (line  633)
+* index entry between item and itemx <2>: chapter.           (line 1185)
+* index entry between item and itemx <3>: chapter.           (line 1303)
+* index entry between item and itemx <4>: chapter.           (line 1992)
+* index entry between item and itemx <5>: chapter.           (line 2143)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  299)
-* index entry within deffn <1>:          chapter.            (line  966)
-* index entry within deffn <2>:          chapter.            (line 1769)
-* index entry within itemize:            chapter.            (line  210)
-* index entry within itemize <1>:        chapter.            (line  877)
-* index entry within itemize <2>:        chapter.            (line 1680)
-* index entry within multitable:         chapter.            (line  232)
-* index entry within multitable <1>:     chapter.            (line  899)
-* index entry within multitable <2>:     chapter.            (line 1703)
-* t-ruc:                                 chapter.            (line 2194)
-* T-ruc:                                 chapter.            (line 2194)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  134)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  801)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1603)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  129)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  796)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1598)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  144)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  811)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1613)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  139)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  806)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1608)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  136)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  803)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1605)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  131)
+* index entry within deffn:              chapter.            (line  302)
+* index entry within deffn <1>:          chapter.            (line  972)
+* index entry within deffn <2>:          chapter.            (line 1777)
+* index entry within itemize:            chapter.            (line  213)
+* index entry within itemize <1>:        chapter.            (line  883)
+* index entry within itemize <2>:        chapter.            (line 1688)
+* index entry within multitable:         chapter.            (line  235)
+* index entry within multitable <1>:     chapter.            (line  905)
+* index entry within multitable <2>:     chapter.            (line 1711)
+* t-ruc:                                 chapter.            (line 2202)
+* T-ruc:                                 chapter.            (line 2202)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  807)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1611)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  802)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1606)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  817)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1621)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  812)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1616)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  809)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1613)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  798)
+                                                             (line  804)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1600)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  146)
+                                                             (line 1608)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  813)
+                                                             (line  819)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1615)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  141)
+                                                             (line 1623)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  808)
+                                                             (line  814)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1610)
+                                                             (line 1618)
 
    fn
 
@@ -3060,171 +3071,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  695)
-* --foption <2>:                         chapter.            (line 1373)
-* .:                                     chapter.            (line 2194)
-* ?:                                     chapter.            (line 2194)
+* --foption <1>:                         chapter.            (line  698)
+* --foption <2>:                         chapter.            (line 1379)
+* .:                                     chapter.            (line 2202)
+* ?:                                     chapter.            (line 2202)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  695)
-* `` <2>:                                chapter.            (line 1373)
-* a:                                     chapter.            (line  312)
-* a <1>:                                 chapter.            (line  511)
-* a <2>:                                 chapter.            (line  629)
-* a <3>:                                 chapter.            (line  979)
-* a <4>:                                 chapter.            (line 1178)
-* a <5>:                                 chapter.            (line 1296)
-* a <6>:                                 chapter.            (line 1782)
-* a <7>:                                 chapter.            (line 1983)
-* a <8>:                                 chapter.            (line 2134)
-* a <9>:                                 chapter.            (line 2194)
-* after:                                 chapter.            (line  640)
-* after <1>:                             chapter.            (line 1307)
-* after <2>:                             chapter.            (line 2145)
-* arg2:                                  chapter.            (line  431)
-* arg2 <1>:                              chapter.            (line 1098)
-* arg2 <2>:                              chapter.            (line 1905)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line  630)
-* b <2>:                                 chapter.            (line 1179)
-* b <3>:                                 chapter.            (line 1297)
-* b <4>:                                 chapter.            (line 1984)
-* b <5>:                                 chapter.            (line 2135)
-* bidule machin:                         chapter.            (line  307)
-* bidule machin <1>:                     chapter.            (line  974)
-* bidule machin <2>:                     chapter.            (line 1777)
-* d--effn_name:                          chapter.            (line  291)
-* d--effn_name <1>:                      chapter.            (line  958)
-* d--effn_name <2>:                      chapter.            (line 1761)
-* d--efmac_name:                         chapter.            (line  372)
-* d--efmac_name <1>:                     chapter.            (line 1039)
-* d--efmac_name <2>:                     chapter.            (line 1844)
-* d--efmethod_name on c--lass:           chapter.            (line  399)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1066)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1871)
-* d--efop_name on c--lass:               chapter.            (line  360)
-* d--efop_name on c--lass <1>:           chapter.            (line  363)
-* d--efop_name on c--lass <2>:           chapter.            (line 1027)
-* d--efop_name on c--lass <3>:           chapter.            (line 1030)
-* d--efop_name on c--lass <4>:           chapter.            (line 1832)
-* d--efop_name on c--lass <5>:           chapter.            (line 1835)
-* d--efspec_name:                        chapter.            (line  375)
-* d--efspec_name <1>:                    chapter.            (line 1042)
-* d--efspec_name <2>:                    chapter.            (line 1847)
-* d--eftypefn_name:                      chapter.            (line  333)
-* d--eftypefn_name <1>:                  chapter.            (line  336)
-* d--eftypefn_name <2>:                  chapter.            (line 1000)
-* d--eftypefn_name <3>:                  chapter.            (line 1003)
-* d--eftypefn_name <4>:                  chapter.            (line 1805)
-* d--eftypefn_name <5>:                  chapter.            (line 1808)
-* d--eftypefn_name2:                     chapter.            (line  410)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1077)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1883)
-* d--eftypefun_name:                     chapter.            (line  387)
-* d--eftypefun_name <1>:                 chapter.            (line 1054)
-* d--eftypefun_name <2>:                 chapter.            (line 1859)
-* d--eftypemethod_name on c--lass:       chapter.            (line  402)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1069)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1874)
-* d--eftypeop_name on c--lass:           chapter.            (line  339)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  342)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1009)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1811)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1814)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  415)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  420)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1082)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1087)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1888)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1893)
-* d--efun_name:                          chapter.            (line  369)
-* d--efun_name <1>:                      chapter.            (line 1036)
-* d--efun_name <2>:                      chapter.            (line 1841)
-* de--ffn_name:                          chapter.            (line  294)
-* de--ffn_name <1>:                      chapter.            (line  961)
-* de--ffn_name <2>:                      chapter.            (line 1764)
-* deffn:                                 chapter.            (line  315)
-* deffn <1>:                             chapter.            (line  317)
-* deffn <2>:                             chapter.            (line  982)
-* deffn <3>:                             chapter.            (line  984)
-* deffn <4>:                             chapter.            (line 1786)
-* deffn <5>:                             chapter.            (line 1788)
-* deffnx:                                chapter.            (line  313)
-* deffnx <1>:                            chapter.            (line  318)
-* deffnx <2>:                            chapter.            (line  980)
-* deffnx <3>:                            chapter.            (line  985)
-* deffnx <4>:                            chapter.            (line 1783)
-* deffnx <5>:                            chapter.            (line 1789)
-* f---aa:                                chapter.            (line 2194)
-* f---bb, f---cc:                        chapter.            (line 2194)
-* f---ddd, f---eee, ffff:                chapter.            (line 2194)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2194)
-* followed:                              chapter.            (line  310)
-* followed <1>:                          chapter.            (line  638)
-* followed <2>:                          chapter.            (line  977)
-* followed <3>:                          chapter.            (line 1305)
-* followed <4>:                          chapter.            (line 1780)
-* followed <5>:                          chapter.            (line 2143)
-* I:                                     chapter.            (line  298)
-* I <1>:                                 chapter.            (line  320)
-* I <2>:                                 chapter.            (line  965)
-* I <3>:                                 chapter.            (line  987)
-* I <4>:                                 chapter.            (line 1768)
-* I <5>:                                 chapter.            (line 1791)
-* id i ule:                              chapter.            (line  304)
-* id i ule <1>:                          chapter.            (line  971)
-* id i ule <2>:                          chapter.            (line 1774)
-* id ule:                                chapter.            (line  303)
-* id ule <1>:                            chapter.            (line  970)
-* id ule <2>:                            chapter.            (line 1773)
-* INVALID:                               chapter.            (line  642)
-* INVALID <1>:                           chapter.            (line 1309)
-* INVALID <2>:                           chapter.            (line 2147)
-* log trap:                              chapter.            (line  300)
-* log trap <1>:                          chapter.            (line  967)
-* log trap <2>:                          chapter.            (line 1770)
-* log trap1:                             chapter.            (line  301)
-* log trap1 <1>:                         chapter.            (line  968)
-* log trap1 <2>:                         chapter.            (line 1771)
-* log trap2:                             chapter.            (line  302)
-* log trap2 <1>:                         chapter.            (line  969)
-* log trap2 <2>:                         chapter.            (line 1772)
-* machin:                                chapter.            (line  306)
-* machin <1>:                            chapter.            (line  308)
-* machin <2>:                            chapter.            (line  634)
-* machin <3>:                            chapter.            (line  635)
-* machin <4>:                            chapter.            (line  636)
-* machin <5>:                            chapter.            (line  637)
-* machin <6>:                            chapter.            (line  973)
-* machin <7>:                            chapter.            (line  975)
-* machin <8>:                            chapter.            (line 1301)
-* machin <9>:                            chapter.            (line 1302)
-* machin <10>:                           chapter.            (line 1303)
-* machin <11>:                           chapter.            (line 1304)
-* machin <12>:                           chapter.            (line 1776)
-* machin <13>:                           chapter.            (line 1778)
-* machin <14>:                           chapter.            (line 2139)
-* machin <15>:                           chapter.            (line 2140)
-* machin <16>:                           chapter.            (line 2141)
-* machin <17>:                           chapter.            (line 2142)
-* n--ame:                                chapter.            (line  327)
-* n--ame <1>:                            chapter.            (line  330)
-* n--ame <2>:                            chapter.            (line  994)
-* n--ame <3>:                            chapter.            (line  997)
-* n--ame <4>:                            chapter.            (line 1799)
-* n--ame <5>:                            chapter.            (line 1802)
-* name2:                                 chapter.            (line  405)
-* name2 <1>:                             chapter.            (line 1072)
-* name2 <2>:                             chapter.            (line 1878)
-* t--ruc:                                chapter.            (line 2194)
-* T--ruc:                                chapter.            (line 2194)
-* truc:                                  chapter.            (line  299)
-* truc <1>:                              chapter.            (line  321)
-* truc <2>:                              chapter.            (line  966)
-* truc <3>:                              chapter.            (line  988)
-* truc <4>:                              chapter.            (line 1769)
-* truc <5>:                              chapter.            (line 1792)
-* xxx, zzz:                              chapter.            (line 2194)
+* `` <1>:                                chapter.            (line  698)
+* `` <2>:                                chapter.            (line 1379)
+* a:                                     chapter.            (line  315)
+* a <1>:                                 chapter.            (line  514)
+* a <2>:                                 chapter.            (line  632)
+* a <3>:                                 chapter.            (line  985)
+* a <4>:                                 chapter.            (line 1184)
+* a <5>:                                 chapter.            (line 1302)
+* a <6>:                                 chapter.            (line 1790)
+* a <7>:                                 chapter.            (line 1991)
+* a <8>:                                 chapter.            (line 2142)
+* a <9>:                                 chapter.            (line 2202)
+* after:                                 chapter.            (line  643)
+* after <1>:                             chapter.            (line 1313)
+* after <2>:                             chapter.            (line 2153)
+* arg2:                                  chapter.            (line  434)
+* arg2 <1>:                              chapter.            (line 1104)
+* arg2 <2>:                              chapter.            (line 1913)
+* b:                                     chapter.            (line  515)
+* b <1>:                                 chapter.            (line  633)
+* b <2>:                                 chapter.            (line 1185)
+* b <3>:                                 chapter.            (line 1303)
+* b <4>:                                 chapter.            (line 1992)
+* b <5>:                                 chapter.            (line 2143)
+* bidule machin:                         chapter.            (line  310)
+* bidule machin <1>:                     chapter.            (line  980)
+* bidule machin <2>:                     chapter.            (line 1785)
+* d--effn_name:                          chapter.            (line  294)
+* d--effn_name <1>:                      chapter.            (line  964)
+* d--effn_name <2>:                      chapter.            (line 1769)
+* d--efmac_name:                         chapter.            (line  375)
+* d--efmac_name <1>:                     chapter.            (line 1045)
+* d--efmac_name <2>:                     chapter.            (line 1852)
+* d--efmethod_name on c--lass:           chapter.            (line  402)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1072)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1879)
+* d--efop_name on c--lass:               chapter.            (line  363)
+* d--efop_name on c--lass <1>:           chapter.            (line  366)
+* d--efop_name on c--lass <2>:           chapter.            (line 1033)
+* d--efop_name on c--lass <3>:           chapter.            (line 1036)
+* d--efop_name on c--lass <4>:           chapter.            (line 1840)
+* d--efop_name on c--lass <5>:           chapter.            (line 1843)
+* d--efspec_name:                        chapter.            (line  378)
+* d--efspec_name <1>:                    chapter.            (line 1048)
+* d--efspec_name <2>:                    chapter.            (line 1855)
+* d--eftypefn_name:                      chapter.            (line  336)
+* d--eftypefn_name <1>:                  chapter.            (line  339)
+* d--eftypefn_name <2>:                  chapter.            (line 1006)
+* d--eftypefn_name <3>:                  chapter.            (line 1009)
+* d--eftypefn_name <4>:                  chapter.            (line 1813)
+* d--eftypefn_name <5>:                  chapter.            (line 1816)
+* d--eftypefn_name2:                     chapter.            (line  413)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1083)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1891)
+* d--eftypefun_name:                     chapter.            (line  390)
+* d--eftypefun_name <1>:                 chapter.            (line 1060)
+* d--eftypefun_name <2>:                 chapter.            (line 1867)
+* d--eftypemethod_name on c--lass:       chapter.            (line  405)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1075)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1882)
+* d--eftypeop_name on c--lass:           chapter.            (line  342)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  345)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1012)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1015)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1819)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1822)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  418)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  423)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1896)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1901)
+* d--efun_name:                          chapter.            (line  372)
+* d--efun_name <1>:                      chapter.            (line 1042)
+* d--efun_name <2>:                      chapter.            (line 1849)
+* de--ffn_name:                          chapter.            (line  297)
+* de--ffn_name <1>:                      chapter.            (line  967)
+* de--ffn_name <2>:                      chapter.            (line 1772)
+* deffn:                                 chapter.            (line  318)
+* deffn <1>:                             chapter.            (line  320)
+* deffn <2>:                             chapter.            (line  988)
+* deffn <3>:                             chapter.            (line  990)
+* deffn <4>:                             chapter.            (line 1794)
+* deffn <5>:                             chapter.            (line 1796)
+* deffnx:                                chapter.            (line  316)
+* deffnx <1>:                            chapter.            (line  321)
+* deffnx <2>:                            chapter.            (line  986)
+* deffnx <3>:                            chapter.            (line  991)
+* deffnx <4>:                            chapter.            (line 1791)
+* deffnx <5>:                            chapter.            (line 1797)
+* f---aa:                                chapter.            (line 2202)
+* f---bb, f---cc:                        chapter.            (line 2202)
+* f---ddd, f---eee, ffff:                chapter.            (line 2202)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2202)
+* followed:                              chapter.            (line  313)
+* followed <1>:                          chapter.            (line  641)
+* followed <2>:                          chapter.            (line  983)
+* followed <3>:                          chapter.            (line 1311)
+* followed <4>:                          chapter.            (line 1788)
+* followed <5>:                          chapter.            (line 2151)
+* I:                                     chapter.            (line  301)
+* I <1>:                                 chapter.            (line  323)
+* I <2>:                                 chapter.            (line  971)
+* I <3>:                                 chapter.            (line  993)
+* I <4>:                                 chapter.            (line 1776)
+* I <5>:                                 chapter.            (line 1799)
+* id i ule:                              chapter.            (line  307)
+* id i ule <1>:                          chapter.            (line  977)
+* id i ule <2>:                          chapter.            (line 1782)
+* id ule:                                chapter.            (line  306)
+* id ule <1>:                            chapter.            (line  976)
+* id ule <2>:                            chapter.            (line 1781)
+* INVALID:                               chapter.            (line  645)
+* INVALID <1>:                           chapter.            (line 1315)
+* INVALID <2>:                           chapter.            (line 2155)
+* log trap:                              chapter.            (line  303)
+* log trap <1>:                          chapter.            (line  973)
+* log trap <2>:                          chapter.            (line 1778)
+* log trap1:                             chapter.            (line  304)
+* log trap1 <1>:                         chapter.            (line  974)
+* log trap1 <2>:                         chapter.            (line 1779)
+* log trap2:                             chapter.            (line  305)
+* log trap2 <1>:                         chapter.            (line  975)
+* log trap2 <2>:                         chapter.            (line 1780)
+* machin:                                chapter.            (line  309)
+* machin <1>:                            chapter.            (line  311)
+* machin <2>:                            chapter.            (line  637)
+* machin <3>:                            chapter.            (line  638)
+* machin <4>:                            chapter.            (line  639)
+* machin <5>:                            chapter.            (line  640)
+* machin <6>:                            chapter.            (line  979)
+* machin <7>:                            chapter.            (line  981)
+* machin <8>:                            chapter.            (line 1307)
+* machin <9>:                            chapter.            (line 1308)
+* machin <10>:                           chapter.            (line 1309)
+* machin <11>:                           chapter.            (line 1310)
+* machin <12>:                           chapter.            (line 1784)
+* machin <13>:                           chapter.            (line 1786)
+* machin <14>:                           chapter.            (line 2147)
+* machin <15>:                           chapter.            (line 2148)
+* machin <16>:                           chapter.            (line 2149)
+* machin <17>:                           chapter.            (line 2150)
+* n--ame:                                chapter.            (line  330)
+* n--ame <1>:                            chapter.            (line  333)
+* n--ame <2>:                            chapter.            (line 1000)
+* n--ame <3>:                            chapter.            (line 1003)
+* n--ame <4>:                            chapter.            (line 1807)
+* n--ame <5>:                            chapter.            (line 1810)
+* name2:                                 chapter.            (line  408)
+* name2 <1>:                             chapter.            (line 1078)
+* name2 <2>:                             chapter.            (line 1886)
+* t--ruc:                                chapter.            (line 2202)
+* T--ruc:                                chapter.            (line 2202)
+* truc:                                  chapter.            (line  302)
+* truc <1>:                              chapter.            (line  324)
+* truc <2>:                              chapter.            (line  972)
+* truc <3>:                              chapter.            (line  994)
+* truc <4>:                              chapter.            (line 1777)
+* truc <5>:                              chapter.            (line 1800)
+* xxx, zzz:                              chapter.            (line 2202)
 
    vr
 
@@ -3237,9 +3248,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  366)
-* d--eftp_name <1>:                      chapter.            (line 1033)
-* d--eftp_name <2>:                      chapter.            (line 1838)
+* d--eftp_name:                          chapter.            (line  369)
+* d--eftp_name <1>:                      chapter.            (line 1039)
+* d--eftp_name <2>:                      chapter.            (line 1846)
 
    (8)
 
@@ -3322,306 +3333,306 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  695)
-* " <2>:                                 chapter.            (line 1373)
+* " <1>:                                 chapter.            (line  698)
+* " <2>:                                 chapter.            (line 1379)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  695)
-* -option <2>:                           chapter.            (line 1373)
-* .:                                     chapter.            (line 2194)
-* ?:                                     chapter.            (line 2194)
-* a:                                     chapter.            (line 2194)
-* aaa, bbb:                              chapter.            (line 2194)
-* a--a:                                  chapter.            (line 2194)
-* a--asis:                               chapter.            (line  507)
-* a--asis <1>:                           chapter.            (line 1174)
-* a--asis <2>:                           chapter.            (line 1979)
-* b:                                     chapter.            (line  508)
-* b <1>:                                 chapter.            (line 1175)
-* b <2>:                                 chapter.            (line 1980)
-* b--b, c--c:                            chapter.            (line 2194)
-* counting entry:                        chapter.            (line 2544)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2194)
-* d--efcv_name:                          chapter.            (line  348)
-* d--efcv_name <1>:                      chapter.            (line  351)
-* d--efcv_name <2>:                      chapter.            (line 1015)
-* d--efcv_name <3>:                      chapter.            (line 1018)
-* d--efcv_name <4>:                      chapter.            (line 1820)
-* d--efcv_name <5>:                      chapter.            (line 1823)
-* d--efivar_name of c--lass:             chapter.            (line  393)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1060)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1865)
-* d--efopt_name:                         chapter.            (line  384)
-* d--efopt_name <1>:                     chapter.            (line 1051)
-* d--efopt_name <2>:                     chapter.            (line 1856)
-* d--eftypecv_name of c--lass:           chapter.            (line  354)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  357)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1024)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1826)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1829)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  425)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  428)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1092)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1095)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1898)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1901)
-* d--eftypeivar_name of c--lass:         chapter.            (line  396)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1063)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1868)
-* d--eftypevar_name:                     chapter.            (line  390)
-* d--eftypevar_name <1>:                 chapter.            (line 1057)
-* d--eftypevar_name <2>:                 chapter.            (line 1862)
-* d--eftypevr_name:                      chapter.            (line  345)
-* d--eftypevr_name <1>:                  chapter.            (line 1012)
-* d--eftypevr_name <2>:                  chapter.            (line 1817)
-* d--efvar_name:                         chapter.            (line  378)
-* d--efvar_name <1>:                     chapter.            (line  381)
-* d--efvar_name <2>:                     chapter.            (line 1045)
-* d--efvar_name <3>:                     chapter.            (line 1048)
-* d--efvar_name <4>:                     chapter.            (line 1850)
-* d--efvar_name <5>:                     chapter.            (line 1853)
-* d--efvr_name:                          chapter.            (line  324)
-* d--efvr_name <1>:                      chapter.            (line  991)
-* d--efvr_name <2>:                      chapter.            (line 1796)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2194)
-* index entry between item and itemx:    chapter.            (line  512)
-* index entry between item and itemx <1>: chapter.           (line  630)
-* index entry between item and itemx <2>: chapter.           (line 1179)
-* index entry between item and itemx <3>: chapter.           (line 1297)
-* index entry between item and itemx <4>: chapter.           (line 1984)
-* index entry between item and itemx <5>: chapter.           (line 2135)
-* index entry in footnote:               chapter.            (line 2539)
-* index entry within deffn:              chapter.            (line  299)
-* index entry within deffn <1>:          chapter.            (line  966)
-* index entry within deffn <2>:          chapter.            (line 1769)
-* index entry within itemize:            chapter.            (line  210)
-* index entry within itemize <1>:        chapter.            (line  877)
-* index entry within itemize <2>:        chapter.            (line 1680)
-* index entry within multitable:         chapter.            (line  232)
-* index entry within multitable <1>:     chapter.            (line  899)
-* index entry within multitable <2>:     chapter.            (line 1703)
-* t-ruc:                                 chapter.            (line 2194)
-* T-ruc:                                 chapter.            (line 2194)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  134)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  801)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1603)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  129)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  796)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1598)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  144)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  811)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1613)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  139)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  806)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1608)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  136)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  803)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1605)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  131)
+* -option <1>:                           chapter.            (line  698)
+* -option <2>:                           chapter.            (line 1379)
+* .:                                     chapter.            (line 2202)
+* ?:                                     chapter.            (line 2202)
+* a:                                     chapter.            (line 2202)
+* aaa, bbb:                              chapter.            (line 2202)
+* a--a:                                  chapter.            (line 2202)
+* a--asis:                               chapter.            (line  510)
+* a--asis <1>:                           chapter.            (line 1180)
+* a--asis <2>:                           chapter.            (line 1987)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line 1181)
+* b <2>:                                 chapter.            (line 1988)
+* b--b, c--c:                            chapter.            (line 2202)
+* counting entry:                        chapter.            (line 2552)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2202)
+* d--efcv_name:                          chapter.            (line  351)
+* d--efcv_name <1>:                      chapter.            (line  354)
+* d--efcv_name <2>:                      chapter.            (line 1021)
+* d--efcv_name <3>:                      chapter.            (line 1024)
+* d--efcv_name <4>:                      chapter.            (line 1828)
+* d--efcv_name <5>:                      chapter.            (line 1831)
+* d--efivar_name of c--lass:             chapter.            (line  396)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1066)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1873)
+* d--efopt_name:                         chapter.            (line  387)
+* d--efopt_name <1>:                     chapter.            (line 1057)
+* d--efopt_name <2>:                     chapter.            (line 1864)
+* d--eftypecv_name of c--lass:           chapter.            (line  357)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  360)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1027)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1030)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1834)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1837)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  428)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  431)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1906)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1909)
+* d--eftypeivar_name of c--lass:         chapter.            (line  399)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1069)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1876)
+* d--eftypevar_name:                     chapter.            (line  393)
+* d--eftypevar_name <1>:                 chapter.            (line 1063)
+* d--eftypevar_name <2>:                 chapter.            (line 1870)
+* d--eftypevr_name:                      chapter.            (line  348)
+* d--eftypevr_name <1>:                  chapter.            (line 1018)
+* d--eftypevr_name <2>:                  chapter.            (line 1825)
+* d--efvar_name:                         chapter.            (line  381)
+* d--efvar_name <1>:                     chapter.            (line  384)
+* d--efvar_name <2>:                     chapter.            (line 1051)
+* d--efvar_name <3>:                     chapter.            (line 1054)
+* d--efvar_name <4>:                     chapter.            (line 1858)
+* d--efvar_name <5>:                     chapter.            (line 1861)
+* d--efvr_name:                          chapter.            (line  327)
+* d--efvr_name <1>:                      chapter.            (line  997)
+* d--efvr_name <2>:                      chapter.            (line 1804)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2202)
+* index entry between item and itemx:    chapter.            (line  515)
+* index entry between item and itemx <1>: chapter.           (line  633)
+* index entry between item and itemx <2>: chapter.           (line 1185)
+* index entry between item and itemx <3>: chapter.           (line 1303)
+* index entry between item and itemx <4>: chapter.           (line 1992)
+* index entry between item and itemx <5>: chapter.           (line 2143)
+* index entry in footnote:               chapter.            (line 2547)
+* index entry within deffn:              chapter.            (line  302)
+* index entry within deffn <1>:          chapter.            (line  972)
+* index entry within deffn <2>:          chapter.            (line 1777)
+* index entry within itemize:            chapter.            (line  213)
+* index entry within itemize <1>:        chapter.            (line  883)
+* index entry within itemize <2>:        chapter.            (line 1688)
+* index entry within multitable:         chapter.            (line  235)
+* index entry within multitable <1>:     chapter.            (line  905)
+* index entry within multitable <2>:     chapter.            (line 1711)
+* t-ruc:                                 chapter.            (line 2202)
+* T-ruc:                                 chapter.            (line 2202)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  807)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1611)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  802)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1606)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  817)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1621)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  812)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1616)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  809)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1613)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  798)
+                                                             (line  804)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1600)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  146)
+                                                             (line 1608)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  813)
+                                                             (line  819)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1615)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  141)
+                                                             (line 1623)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  808)
+                                                             (line  814)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1610)
+                                                             (line 1618)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  695)
-* --foption <2>:                         chapter.            (line 1373)
-* .:                                     chapter.            (line 2194)
-* ?:                                     chapter.            (line 2194)
+* --foption <1>:                         chapter.            (line  698)
+* --foption <2>:                         chapter.            (line 1379)
+* .:                                     chapter.            (line 2202)
+* ?:                                     chapter.            (line 2202)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  695)
-* `` <2>:                                chapter.            (line 1373)
-* a:                                     chapter.            (line  312)
-* a <1>:                                 chapter.            (line  511)
-* a <2>:                                 chapter.            (line  629)
-* a <3>:                                 chapter.            (line  979)
-* a <4>:                                 chapter.            (line 1178)
-* a <5>:                                 chapter.            (line 1296)
-* a <6>:                                 chapter.            (line 1782)
-* a <7>:                                 chapter.            (line 1983)
-* a <8>:                                 chapter.            (line 2134)
-* a <9>:                                 chapter.            (line 2194)
-* after:                                 chapter.            (line  640)
-* after <1>:                             chapter.            (line 1307)
-* after <2>:                             chapter.            (line 2145)
-* arg2:                                  chapter.            (line  431)
-* arg2 <1>:                              chapter.            (line 1098)
-* arg2 <2>:                              chapter.            (line 1905)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line  630)
-* b <2>:                                 chapter.            (line 1179)
-* b <3>:                                 chapter.            (line 1297)
-* b <4>:                                 chapter.            (line 1984)
-* b <5>:                                 chapter.            (line 2135)
-* bidule machin:                         chapter.            (line  307)
-* bidule machin <1>:                     chapter.            (line  974)
-* bidule machin <2>:                     chapter.            (line 1777)
-* d--effn_name:                          chapter.            (line  291)
-* d--effn_name <1>:                      chapter.            (line  958)
-* d--effn_name <2>:                      chapter.            (line 1761)
-* d--efmac_name:                         chapter.            (line  372)
-* d--efmac_name <1>:                     chapter.            (line 1039)
-* d--efmac_name <2>:                     chapter.            (line 1844)
-* d--efmethod_name on c--lass:           chapter.            (line  399)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1066)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1871)
-* d--efop_name on c--lass:               chapter.            (line  360)
-* d--efop_name on c--lass <1>:           chapter.            (line  363)
-* d--efop_name on c--lass <2>:           chapter.            (line 1027)
-* d--efop_name on c--lass <3>:           chapter.            (line 1030)
-* d--efop_name on c--lass <4>:           chapter.            (line 1832)
-* d--efop_name on c--lass <5>:           chapter.            (line 1835)
-* d--efspec_name:                        chapter.            (line  375)
-* d--efspec_name <1>:                    chapter.            (line 1042)
-* d--efspec_name <2>:                    chapter.            (line 1847)
-* d--eftypefn_name:                      chapter.            (line  333)
-* d--eftypefn_name <1>:                  chapter.            (line  336)
-* d--eftypefn_name <2>:                  chapter.            (line 1000)
-* d--eftypefn_name <3>:                  chapter.            (line 1003)
-* d--eftypefn_name <4>:                  chapter.            (line 1805)
-* d--eftypefn_name <5>:                  chapter.            (line 1808)
-* d--eftypefn_name2:                     chapter.            (line  410)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1077)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1883)
-* d--eftypefun_name:                     chapter.            (line  387)
-* d--eftypefun_name <1>:                 chapter.            (line 1054)
-* d--eftypefun_name <2>:                 chapter.            (line 1859)
-* d--eftypemethod_name on c--lass:       chapter.            (line  402)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1069)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1874)
-* d--eftypeop_name on c--lass:           chapter.            (line  339)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  342)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1009)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1811)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1814)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  415)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  420)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1082)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1087)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1888)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1893)
-* d--efun_name:                          chapter.            (line  369)
-* d--efun_name <1>:                      chapter.            (line 1036)
-* d--efun_name <2>:                      chapter.            (line 1841)
-* de--ffn_name:                          chapter.            (line  294)
-* de--ffn_name <1>:                      chapter.            (line  961)
-* de--ffn_name <2>:                      chapter.            (line 1764)
-* deffn:                                 chapter.            (line  315)
-* deffn <1>:                             chapter.            (line  317)
-* deffn <2>:                             chapter.            (line  982)
-* deffn <3>:                             chapter.            (line  984)
-* deffn <4>:                             chapter.            (line 1786)
-* deffn <5>:                             chapter.            (line 1788)
-* deffnx:                                chapter.            (line  313)
-* deffnx <1>:                            chapter.            (line  318)
-* deffnx <2>:                            chapter.            (line  980)
-* deffnx <3>:                            chapter.            (line  985)
-* deffnx <4>:                            chapter.            (line 1783)
-* deffnx <5>:                            chapter.            (line 1789)
-* f---aa:                                chapter.            (line 2194)
-* f---bb, f---cc:                        chapter.            (line 2194)
-* f---ddd, f---eee, ffff:                chapter.            (line 2194)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2194)
-* followed:                              chapter.            (line  310)
-* followed <1>:                          chapter.            (line  638)
-* followed <2>:                          chapter.            (line  977)
-* followed <3>:                          chapter.            (line 1305)
-* followed <4>:                          chapter.            (line 1780)
-* followed <5>:                          chapter.            (line 2143)
-* I:                                     chapter.            (line  298)
-* I <1>:                                 chapter.            (line  320)
-* I <2>:                                 chapter.            (line  965)
-* I <3>:                                 chapter.            (line  987)
-* I <4>:                                 chapter.            (line 1768)
-* I <5>:                                 chapter.            (line 1791)
-* id i ule:                              chapter.            (line  304)
-* id i ule <1>:                          chapter.            (line  971)
-* id i ule <2>:                          chapter.            (line 1774)
-* id ule:                                chapter.            (line  303)
-* id ule <1>:                            chapter.            (line  970)
-* id ule <2>:                            chapter.            (line 1773)
-* INVALID:                               chapter.            (line  642)
-* INVALID <1>:                           chapter.            (line 1309)
-* INVALID <2>:                           chapter.            (line 2147)
-* log trap:                              chapter.            (line  300)
-* log trap <1>:                          chapter.            (line  967)
-* log trap <2>:                          chapter.            (line 1770)
-* log trap1:                             chapter.            (line  301)
-* log trap1 <1>:                         chapter.            (line  968)
-* log trap1 <2>:                         chapter.            (line 1771)
-* log trap2:                             chapter.            (line  302)
-* log trap2 <1>:                         chapter.            (line  969)
-* log trap2 <2>:                         chapter.            (line 1772)
-* machin:                                chapter.            (line  306)
-* machin <1>:                            chapter.            (line  308)
-* machin <2>:                            chapter.            (line  634)
-* machin <3>:                            chapter.            (line  635)
-* machin <4>:                            chapter.            (line  636)
-* machin <5>:                            chapter.            (line  637)
-* machin <6>:                            chapter.            (line  973)
-* machin <7>:                            chapter.            (line  975)
-* machin <8>:                            chapter.            (line 1301)
-* machin <9>:                            chapter.            (line 1302)
-* machin <10>:                           chapter.            (line 1303)
-* machin <11>:                           chapter.            (line 1304)
-* machin <12>:                           chapter.            (line 1776)
-* machin <13>:                           chapter.            (line 1778)
-* machin <14>:                           chapter.            (line 2139)
-* machin <15>:                           chapter.            (line 2140)
-* machin <16>:                           chapter.            (line 2141)
-* machin <17>:                           chapter.            (line 2142)
-* n--ame:                                chapter.            (line  327)
-* n--ame <1>:                            chapter.            (line  330)
-* n--ame <2>:                            chapter.            (line  994)
-* n--ame <3>:                            chapter.            (line  997)
-* n--ame <4>:                            chapter.            (line 1799)
-* n--ame <5>:                            chapter.            (line 1802)
-* name2:                                 chapter.            (line  405)
-* name2 <1>:                             chapter.            (line 1072)
-* name2 <2>:                             chapter.            (line 1878)
-* t--ruc:                                chapter.            (line 2194)
-* T--ruc:                                chapter.            (line 2194)
-* truc:                                  chapter.            (line  299)
-* truc <1>:                              chapter.            (line  321)
-* truc <2>:                              chapter.            (line  966)
-* truc <3>:                              chapter.            (line  988)
-* truc <4>:                              chapter.            (line 1769)
-* truc <5>:                              chapter.            (line 1792)
-* xxx, zzz:                              chapter.            (line 2194)
+* `` <1>:                                chapter.            (line  698)
+* `` <2>:                                chapter.            (line 1379)
+* a:                                     chapter.            (line  315)
+* a <1>:                                 chapter.            (line  514)
+* a <2>:                                 chapter.            (line  632)
+* a <3>:                                 chapter.            (line  985)
+* a <4>:                                 chapter.            (line 1184)
+* a <5>:                                 chapter.            (line 1302)
+* a <6>:                                 chapter.            (line 1790)
+* a <7>:                                 chapter.            (line 1991)
+* a <8>:                                 chapter.            (line 2142)
+* a <9>:                                 chapter.            (line 2202)
+* after:                                 chapter.            (line  643)
+* after <1>:                             chapter.            (line 1313)
+* after <2>:                             chapter.            (line 2153)
+* arg2:                                  chapter.            (line  434)
+* arg2 <1>:                              chapter.            (line 1104)
+* arg2 <2>:                              chapter.            (line 1913)
+* b:                                     chapter.            (line  515)
+* b <1>:                                 chapter.            (line  633)
+* b <2>:                                 chapter.            (line 1185)
+* b <3>:                                 chapter.            (line 1303)
+* b <4>:                                 chapter.            (line 1992)
+* b <5>:                                 chapter.            (line 2143)
+* bidule machin:                         chapter.            (line  310)
+* bidule machin <1>:                     chapter.            (line  980)
+* bidule machin <2>:                     chapter.            (line 1785)
+* d--effn_name:                          chapter.            (line  294)
+* d--effn_name <1>:                      chapter.            (line  964)
+* d--effn_name <2>:                      chapter.            (line 1769)
+* d--efmac_name:                         chapter.            (line  375)
+* d--efmac_name <1>:                     chapter.            (line 1045)
+* d--efmac_name <2>:                     chapter.            (line 1852)
+* d--efmethod_name on c--lass:           chapter.            (line  402)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1072)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1879)
+* d--efop_name on c--lass:               chapter.            (line  363)
+* d--efop_name on c--lass <1>:           chapter.            (line  366)
+* d--efop_name on c--lass <2>:           chapter.            (line 1033)
+* d--efop_name on c--lass <3>:           chapter.            (line 1036)
+* d--efop_name on c--lass <4>:           chapter.            (line 1840)
+* d--efop_name on c--lass <5>:           chapter.            (line 1843)
+* d--efspec_name:                        chapter.            (line  378)
+* d--efspec_name <1>:                    chapter.            (line 1048)
+* d--efspec_name <2>:                    chapter.            (line 1855)
+* d--eftypefn_name:                      chapter.            (line  336)
+* d--eftypefn_name <1>:                  chapter.            (line  339)
+* d--eftypefn_name <2>:                  chapter.            (line 1006)
+* d--eftypefn_name <3>:                  chapter.            (line 1009)
+* d--eftypefn_name <4>:                  chapter.            (line 1813)
+* d--eftypefn_name <5>:                  chapter.            (line 1816)
+* d--eftypefn_name2:                     chapter.            (line  413)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1083)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1891)
+* d--eftypefun_name:                     chapter.            (line  390)
+* d--eftypefun_name <1>:                 chapter.            (line 1060)
+* d--eftypefun_name <2>:                 chapter.            (line 1867)
+* d--eftypemethod_name on c--lass:       chapter.            (line  405)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1075)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1882)
+* d--eftypeop_name on c--lass:           chapter.            (line  342)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  345)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1012)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1015)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1819)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1822)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  418)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  423)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1896)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1901)
+* d--efun_name:                          chapter.            (line  372)
+* d--efun_name <1>:                      chapter.            (line 1042)
+* d--efun_name <2>:                      chapter.            (line 1849)
+* de--ffn_name:                          chapter.            (line  297)
+* de--ffn_name <1>:                      chapter.            (line  967)
+* de--ffn_name <2>:                      chapter.            (line 1772)
+* deffn:                                 chapter.            (line  318)
+* deffn <1>:                             chapter.            (line  320)
+* deffn <2>:                             chapter.            (line  988)
+* deffn <3>:                             chapter.            (line  990)
+* deffn <4>:                             chapter.            (line 1794)
+* deffn <5>:                             chapter.            (line 1796)
+* deffnx:                                chapter.            (line  316)
+* deffnx <1>:                            chapter.            (line  321)
+* deffnx <2>:                            chapter.            (line  986)
+* deffnx <3>:                            chapter.            (line  991)
+* deffnx <4>:                            chapter.            (line 1791)
+* deffnx <5>:                            chapter.            (line 1797)
+* f---aa:                                chapter.            (line 2202)
+* f---bb, f---cc:                        chapter.            (line 2202)
+* f---ddd, f---eee, ffff:                chapter.            (line 2202)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2202)
+* followed:                              chapter.            (line  313)
+* followed <1>:                          chapter.            (line  641)
+* followed <2>:                          chapter.            (line  983)
+* followed <3>:                          chapter.            (line 1311)
+* followed <4>:                          chapter.            (line 1788)
+* followed <5>:                          chapter.            (line 2151)
+* I:                                     chapter.            (line  301)
+* I <1>:                                 chapter.            (line  323)
+* I <2>:                                 chapter.            (line  971)
+* I <3>:                                 chapter.            (line  993)
+* I <4>:                                 chapter.            (line 1776)
+* I <5>:                                 chapter.            (line 1799)
+* id i ule:                              chapter.            (line  307)
+* id i ule <1>:                          chapter.            (line  977)
+* id i ule <2>:                          chapter.            (line 1782)
+* id ule:                                chapter.            (line  306)
+* id ule <1>:                            chapter.            (line  976)
+* id ule <2>:                            chapter.            (line 1781)
+* INVALID:                               chapter.            (line  645)
+* INVALID <1>:                           chapter.            (line 1315)
+* INVALID <2>:                           chapter.            (line 2155)
+* log trap:                              chapter.            (line  303)
+* log trap <1>:                          chapter.            (line  973)
+* log trap <2>:                          chapter.            (line 1778)
+* log trap1:                             chapter.            (line  304)
+* log trap1 <1>:                         chapter.            (line  974)
+* log trap1 <2>:                         chapter.            (line 1779)
+* log trap2:                             chapter.            (line  305)
+* log trap2 <1>:                         chapter.            (line  975)
+* log trap2 <2>:                         chapter.            (line 1780)
+* machin:                                chapter.            (line  309)
+* machin <1>:                            chapter.            (line  311)
+* machin <2>:                            chapter.            (line  637)
+* machin <3>:                            chapter.            (line  638)
+* machin <4>:                            chapter.            (line  639)
+* machin <5>:                            chapter.            (line  640)
+* machin <6>:                            chapter.            (line  979)
+* machin <7>:                            chapter.            (line  981)
+* machin <8>:                            chapter.            (line 1307)
+* machin <9>:                            chapter.            (line 1308)
+* machin <10>:                           chapter.            (line 1309)
+* machin <11>:                           chapter.            (line 1310)
+* machin <12>:                           chapter.            (line 1784)
+* machin <13>:                           chapter.            (line 1786)
+* machin <14>:                           chapter.            (line 2147)
+* machin <15>:                           chapter.            (line 2148)
+* machin <16>:                           chapter.            (line 2149)
+* machin <17>:                           chapter.            (line 2150)
+* n--ame:                                chapter.            (line  330)
+* n--ame <1>:                            chapter.            (line  333)
+* n--ame <2>:                            chapter.            (line 1000)
+* n--ame <3>:                            chapter.            (line 1003)
+* n--ame <4>:                            chapter.            (line 1807)
+* n--ame <5>:                            chapter.            (line 1810)
+* name2:                                 chapter.            (line  408)
+* name2 <1>:                             chapter.            (line 1078)
+* name2 <2>:                             chapter.            (line 1886)
+* t--ruc:                                chapter.            (line 2202)
+* T--ruc:                                chapter.            (line 2202)
+* truc:                                  chapter.            (line  302)
+* truc <1>:                              chapter.            (line  324)
+* truc <2>:                              chapter.            (line  972)
+* truc <3>:                              chapter.            (line  994)
+* truc <4>:                              chapter.            (line 1777)
+* truc <5>:                              chapter.            (line 1800)
+* xxx, zzz:                              chapter.            (line 2202)
 
 
 
 Tag Table:
-Node: Top19010
-Node: chapter19195
-Ref: chapter-Footnote-198965
-Ref: chapter-Footnote-298985
-Ref: chapter-Footnote-399006
-Ref: chapter-Footnote-499026
-Ref: chapter-Footnote-599047
-Ref: chapter-Footnote-699067
-Ref: chapter-Footnote-799088
-Ref: chapter-Footnote-899126
-Node: s--ect,ion99146
-Node: subsection99349
-Ref: anchor99530
-Node: subsubsection ``simple-double--99530
-Node: subsubsection three---four----''99730
-Node: chapter299902
+Node: Top19018
+Node: chapter19203
+Ref: chapter-Footnote-198991
+Ref: chapter-Footnote-299011
+Ref: chapter-Footnote-399032
+Ref: chapter-Footnote-499052
+Ref: chapter-Footnote-599073
+Ref: chapter-Footnote-699093
+Ref: chapter-Footnote-799114
+Ref: chapter-Footnote-899152
+Node: s--ect,ion99172
+Node: subsection99375
+Ref: anchor99556
+Node: subsubsection ``simple-double--99556
+Node: subsubsection three---four----''99756
+Node: chapter299928
 
 End Tag Table
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 992bd74401..3014ed7a9e 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -894,12 +896,34 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1035,26 +1059,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -1979,12 +1983,34 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2120,26 +2146,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3121,12 +3127,34 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3262,26 +3290,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4204,12 +4212,34 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4345,26 +4375,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5291,13 +5301,35 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5435,26 +5467,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 0121eb09c9..9fc20e3787 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -157,12 +157,34 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @'\{@dotless\{i\}\} \'{\i{}} (í)
 @dotless\{i\} \i{} (ı)
 @dotless\{j\} \j{} (ȷ)
+\texttt{@H\{a\}} \H{a}
+\texttt{@dotaccent\{a\}} \.{a} (ȧ)
+\texttt{@ringaccent\{a\}} \r{a} (å)
+\texttt{@tieaccent\{a\}} \t{a}
+\texttt{@u\{a\}} \u{a} (ă)
+\texttt{@ubaraccent\{a\}} \b{a}
+\texttt{@udotaccent\{a\}} \d{a} (ạ)
+\texttt{@v\{a\}} \v{a} (ǎ)
+@,c \c{c} (ç)
+\texttt{@,\{c\}} \c{c} (ç)
+\texttt{@ogonek\{a\}} \k{a} (ą)
+
 @`\{@=E\} \`{\={E}}
 @l\{\} \l{}
 @,\{@'C\} \c{\'{C}}
-@,c \c{c} (ç)
 @,c@"u \c{c}\"{u} \leavevmode{}\\
 
+\texttt{@H\{{-}{-}a\}} \H{--a}
+\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
+\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
+\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
+\texttt{@u\{{-}{-}a\}} \u{--a}
+\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
+\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
+\texttt{@v\{{-}{-}a\}} \v{--a}
+\texttt{@,\{{-}{-}c\}} \c{--c}
+\texttt{@ogonek\{{-}{-}a\}} \k{--a}
+
 @U\{0075\} u
 
 @* \leavevmode{}\\
@@ -298,26 +320,6 @@ but , ,\@
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
-\texttt{@H\{a\}} \H{a}
-\texttt{@H\{{-}{-}a\}} \H{--a}
-\texttt{@dotaccent\{a\}} \.{a} (ȧ)
-\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
-\texttt{@ringaccent\{a\}} \r{a} (å)
-\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
-\texttt{@tieaccent\{a\}} \t{a}
-\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
-\texttt{@u\{a\}} \u{a} (ă)
-\texttt{@u\{{-}{-}a\}} \u{--a}
-\texttt{@ubaraccent\{a\}} \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
-\texttt{@udotaccent\{a\}} \d{a} (ạ)
-\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
-\texttt{@v\{a\}} \v{a} (ǎ)
-\texttt{@v\{{-}{-}a\}} \v{--a}
-\texttt{@,\{c\}} \c{c} (ç)
-\texttt{@,\{{-}{-}c\}} \c{--c}
-\texttt{@ogonek\{a\}} \k{a} (ą)
-\texttt{@ogonek\{{-}{-}a\}} \k{--a}
 \texttt{a@sup\{h\}@sub\{l\}} a\textsuperscript{h}\textsubscript{l}
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
@@ -1817,12 +1819,34 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @'\{@dotless\{i\}\} \'{\i{}} (í)
 @dotless\{i\} \i{} (ı)
 @dotless\{j\} \j{} (ȷ)
+\texttt{@H\{a\}} \H{a}
+\texttt{@dotaccent\{a\}} \.{a} (ȧ)
+\texttt{@ringaccent\{a\}} \r{a} (å)
+\texttt{@tieaccent\{a\}} \t{a}
+\texttt{@u\{a\}} \u{a} (ă)
+\texttt{@ubaraccent\{a\}} \b{a}
+\texttt{@udotaccent\{a\}} \d{a} (ạ)
+\texttt{@v\{a\}} \v{a} (ǎ)
+@,c \c{c} (ç)
+\texttt{@,\{c\}} \c{c} (ç)
+\texttt{@ogonek\{a\}} \k{a} (ą)
+
 @`\{@=E\} \`{\={E}}
 @l\{\} \l{}
 @,\{@'C\} \c{\'{C}}
-@,c \c{c} (ç)
 @,c@"u \c{c}\"{u} \leavevmode{}\\
 
+\texttt{@H\{{-}{-}a\}} \H{--a}
+\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
+\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
+\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
+\texttt{@u\{{-}{-}a\}} \u{--a}
+\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
+\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
+\texttt{@v\{{-}{-}a\}} \v{--a}
+\texttt{@,\{{-}{-}c\}} \c{--c}
+\texttt{@ogonek\{{-}{-}a\}} \k{--a}
+
 @U\{0075\} u
 
 @* \leavevmode{}\\
@@ -1958,26 +1982,6 @@ but , ,\@
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
-\texttt{@H\{a\}} \H{a}
-\texttt{@H\{{-}{-}a\}} \H{--a}
-\texttt{@dotaccent\{a\}} \.{a} (ȧ)
-\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
-\texttt{@ringaccent\{a\}} \r{a} (å)
-\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
-\texttt{@tieaccent\{a\}} \t{a}
-\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
-\texttt{@u\{a\}} \u{a} (ă)
-\texttt{@u\{{-}{-}a\}} \u{--a}
-\texttt{@ubaraccent\{a\}} \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
-\texttt{@udotaccent\{a\}} \d{a} (ạ)
-\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
-\texttt{@v\{a\}} \v{a} (ǎ)
-\texttt{@v\{{-}{-}a\}} \v{--a}
-\texttt{@,\{c\}} \c{c} (ç)
-\texttt{@,\{{-}{-}c\}} \c{--c}
-\texttt{@ogonek\{a\}} \k{a} (ą)
-\texttt{@ogonek\{{-}{-}a\}} \k{--a}
 \texttt{a@sup\{h\}@sub\{l\}} a\textsuperscript{h}\textsubscript{l}
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
@@ -3490,12 +3494,34 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @'\{@dotless\{i\}\} \'{\i{}} (í)
 @dotless\{i\} \i{} (ı)
 @dotless\{j\} \j{} (ȷ)
+\texttt{@H\{a\}} \H{a}
+\texttt{@dotaccent\{a\}} \.{a} (ȧ)
+\texttt{@ringaccent\{a\}} \r{a} (å)
+\texttt{@tieaccent\{a\}} \t{a}
+\texttt{@u\{a\}} \u{a} (ă)
+\texttt{@ubaraccent\{a\}} \b{a}
+\texttt{@udotaccent\{a\}} \d{a} (ạ)
+\texttt{@v\{a\}} \v{a} (ǎ)
+@,c \c{c} (ç)
+\texttt{@,\{c\}} \c{c} (ç)
+\texttt{@ogonek\{a\}} \k{a} (ą)
+
 @`\{@=E\} \`{\={E}}
 @l\{\} \l{}
 @,\{@'C\} \c{\'{C}}
-@,c \c{c} (ç)
 @,c@"u \c{c}\"{u} \leavevmode{}\\
 
+\texttt{@H\{{-}{-}a\}} \H{--a}
+\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
+\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
+\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
+\texttt{@u\{{-}{-}a\}} \u{--a}
+\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
+\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
+\texttt{@v\{{-}{-}a\}} \v{--a}
+\texttt{@,\{{-}{-}c\}} \c{--c}
+\texttt{@ogonek\{{-}{-}a\}} \k{--a}
+
 @U\{0075\} u
 
 @* \leavevmode{}\\
@@ -3631,26 +3657,6 @@ but , ,\@
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
-\texttt{@H\{a\}} \H{a}
-\texttt{@H\{{-}{-}a\}} \H{--a}
-\texttt{@dotaccent\{a\}} \.{a} (ȧ)
-\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
-\texttt{@ringaccent\{a\}} \r{a} (å)
-\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
-\texttt{@tieaccent\{a\}} \t{a}
-\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
-\texttt{@u\{a\}} \u{a} (ă)
-\texttt{@u\{{-}{-}a\}} \u{--a}
-\texttt{@ubaraccent\{a\}} \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
-\texttt{@udotaccent\{a\}} \d{a} (ạ)
-\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
-\texttt{@v\{a\}} \v{a} (ǎ)
-\texttt{@v\{{-}{-}a\}} \v{--a}
-\texttt{@,\{c\}} \c{c} (ç)
-\texttt{@,\{{-}{-}c\}} \c{--c}
-\texttt{@ogonek\{a\}} \k{a} (ą)
-\texttt{@ogonek\{{-}{-}a\}} \k{--a}
 \texttt{a@sup\{h\}@sub\{l\}} a\textsuperscript{h}\textsubscript{l}
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
@@ -5146,12 +5152,34 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @'\{@dotless\{i\}\} \'{\i{}} (í)
 @dotless\{i\} \i{} (ı)
 @dotless\{j\} \j{} (ȷ)
+\texttt{@H\{a\}} \H{a}
+\texttt{@dotaccent\{a\}} \.{a} (ȧ)
+\texttt{@ringaccent\{a\}} \r{a} (å)
+\texttt{@tieaccent\{a\}} \t{a}
+\texttt{@u\{a\}} \u{a} (ă)
+\texttt{@ubaraccent\{a\}} \b{a}
+\texttt{@udotaccent\{a\}} \d{a} (ạ)
+\texttt{@v\{a\}} \v{a} (ǎ)
+@,c \c{c} (ç)
+\texttt{@,\{c\}} \c{c} (ç)
+\texttt{@ogonek\{a\}} \k{a} (ą)
+
 @`\{@=E\} \`{\={E}}
 @l\{\} \l{}
 @,\{@'C\} \c{\'{C}}
-@,c \c{c} (ç)
 @,c@"u \c{c}\"{u} \leavevmode{}\\
 
+\texttt{@H\{{-}{-}a\}} \H{--a}
+\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
+\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
+\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
+\texttt{@u\{{-}{-}a\}} \u{--a}
+\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
+\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
+\texttt{@v\{{-}{-}a\}} \v{--a}
+\texttt{@,\{{-}{-}c\}} \c{--c}
+\texttt{@ogonek\{{-}{-}a\}} \k{--a}
+
 @U\{0075\} u
 
 @* \leavevmode{}\\
@@ -5287,26 +5315,6 @@ but , ,\@
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
-\texttt{@H\{a\}} \H{a}
-\texttt{@H\{{-}{-}a\}} \H{--a}
-\texttt{@dotaccent\{a\}} \.{a} (ȧ)
-\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
-\texttt{@ringaccent\{a\}} \r{a} (å)
-\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
-\texttt{@tieaccent\{a\}} \t{a}
-\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
-\texttt{@u\{a\}} \u{a} (ă)
-\texttt{@u\{{-}{-}a\}} \u{--a}
-\texttt{@ubaraccent\{a\}} \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
-\texttt{@udotaccent\{a\}} \d{a} (ạ)
-\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
-\texttt{@v\{a\}} \v{a} (ǎ)
-\texttt{@v\{{-}{-}a\}} \v{--a}
-\texttt{@,\{c\}} \c{c} (ç)
-\texttt{@,\{{-}{-}c\}} \c{--c}
-\texttt{@ogonek\{a\}} \k{a} (ą)
-\texttt{@ogonek\{{-}{-}a\}} \k{--a}
 \texttt{a@sup\{h\}@sub\{l\}} a\textsuperscript{h}\textsubscript{l}
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
@@ -6804,12 +6812,34 @@ kbd:\ 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}
 @'\{@dotless\{i\}\}\ \'{\i{}}\ (í)
 @dotless\{i\}\ \i{}\ (ı)
 @dotless\{j\}\ \j{}\ (ȷ)
+\texttt{@H\{a\}}\ \H{a}
+\texttt{@dotaccent\{a\}}\ \.{a}\ (ȧ)
+\texttt{@ringaccent\{a\}}\ \r{a}\ (å)
+\texttt{@tieaccent\{a\}}\ \t{a}
+\texttt{@u\{a\}}\ \u{a}\ (ă)
+\texttt{@ubaraccent\{a\}}\ \b{a}
+\texttt{@udotaccent\{a\}}\ \d{a}\ (ạ)
+\texttt{@v\{a\}}\ \v{a}\ (ǎ)
+@,c \c{c}\ (ç)
+\texttt{@,\{c\}}\ \c{c}\ (ç)
+\texttt{@ogonek\{a\}}\ \k{a}\ (ą)
+
 @`\{@=E\}\ \`{\={E}}
 @l\{\}\ \l{}
 @,\{@'C\}\ \c{\'{C}}
-@,c \c{c}\ (ç)
 @,c@"u \c{c}\"{u}\ \leavevmode{}\\
 
+\texttt{@H\{{-}{-}a\}}\ \H{{-}{-}a}
+\texttt{@dotaccent\{{-}{-}a\}}\ \.{{-}{-}a}
+\texttt{@ringaccent\{{-}{-}a\}}\ \r{{-}{-}a}
+\texttt{@tieaccent\{{-}{-}a\}}\ \t{{-}{-}a}
+\texttt{@u\{{-}{-}a\}}\ \u{{-}{-}a}
+\texttt{@ubaraccent\{{-}{-}a\}}\ \b{{-}{-}a}
+\texttt{@udotaccent\{{-}{-}a\}}\ \d{{-}{-}a}
+\texttt{@v\{{-}{-}a\}}\ \v{{-}{-}a}
+\texttt{@,\{{-}{-}c\}}\ \c{{-}{-}c}
+\texttt{@ogonek\{{-}{-}a\}}\ \k{{-}{-}a}
+
 @U\{0075\}\ u
 
 @* \leavevmode{}\\
@@ -6947,26 +6977,6 @@ but ,\ ,\@
 \texttt{@verb\{:{-}{-}a:\}}\ \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}}\ \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}}\ \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
-\texttt{@H\{a\}}\ \H{a}
-\texttt{@H\{{-}{-}a\}}\ \H{{-}{-}a}
-\texttt{@dotaccent\{a\}}\ \.{a}\ (ȧ)
-\texttt{@dotaccent\{{-}{-}a\}}\ \.{{-}{-}a}
-\texttt{@ringaccent\{a\}}\ \r{a}\ (å)
-\texttt{@ringaccent\{{-}{-}a\}}\ \r{{-}{-}a}
-\texttt{@tieaccent\{a\}}\ \t{a}
-\texttt{@tieaccent\{{-}{-}a\}}\ \t{{-}{-}a}
-\texttt{@u\{a\}}\ \u{a}\ (ă)
-\texttt{@u\{{-}{-}a\}}\ \u{{-}{-}a}
-\texttt{@ubaraccent\{a\}}\ \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}}\ \b{{-}{-}a}
-\texttt{@udotaccent\{a\}}\ \d{a}\ (ạ)
-\texttt{@udotaccent\{{-}{-}a\}}\ \d{{-}{-}a}
-\texttt{@v\{a\}}\ \v{a}\ (ǎ)
-\texttt{@v\{{-}{-}a\}}\ \v{{-}{-}a}
-\texttt{@,\{c\}}\ \c{c}\ (ç)
-\texttt{@,\{{-}{-}c\}}\ \c{{-}{-}c}
-\texttt{@ogonek\{a\}}\ \k{a}\ (ą)
-\texttt{@ogonek\{{-}{-}a\}}\ \k{{-}{-}a}
 \texttt{a@sup\{h\}@sub\{l\}}\ a\textsuperscript{h}\textsubscript{l}
 \texttt{@footnote\{in footnote\}}\ \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}}\ \footnote{in footnote2}
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi 
b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
index 513550c517..53ec5b4869 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -48,12 +48,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -190,26 +212,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
@@ -1254,12 +1256,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -1396,26 +1420,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
@@ -2411,12 +2415,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -2553,26 +2579,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
@@ -3597,12 +3603,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -3739,26 +3767,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
@@ -4749,12 +4757,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@"u @,c@"u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -4891,26 +4921,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  < & @@ % " --    b:@}} @verb{:a  < & @ % " --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 2981c0613c..69987ff48a 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -944,12 +946,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1085,26 +1109,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2027,12 +2031,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2168,26 +2194,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3167,12 +3173,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3308,26 +3336,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4248,12 +4256,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4389,26 +4419,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5333,13 +5343,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5477,26 +5509,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 145a56b01a..4f230e239e 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 85626d3849..6dcf29e36d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -950,12 +952,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1091,26 +1115,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.html#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.html#FOOT2_6"><sup>6</sup></a>
@@ -2033,12 +2037,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2174,26 +2200,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.html#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.html#FOOT6"><sup>8</sup></a>
@@ -3120,13 +3126,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3264,26 +3292,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.html#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.html#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index c2b3f8cd67..27a839d77d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index 43fbf21ca9..2f8c701aee 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 91454b9f61..d0b672cc60 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index dbba808973..cc69eb3cec 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index ef76bcbf68..f5c8c597c7 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 8cc72de0ba..0843079936 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -921,12 +923,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1062,26 +1086,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.html#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.html#FOOT4"><sup>2</sup></a>
@@ -2006,12 +2010,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2147,26 +2173,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.html#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.html#FOOT2"><sup>4</sup></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index 12c786fe17..39a686ede6 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index ea5b74360b..4a8f9b9b63 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 1b565e7ed1..d6e3a51f88 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 430ab3db12..8df0a2e35a 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 c76137cf2a..c0bbe95552 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-@&#8216;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&#8216;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; <br>
 </p>
+<p><code class="code">@H{--a}</code> &#8211;a&#779;
+<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
+<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
+<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
+<code class="code">@u{--a}</code> &#8211;a&#774;
+<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
+<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
+<code class="code">@v{--a}</code> &#8211;a&#780;
+<code class="code">@,{--c}</code> &#8211;c&#807;
+<code class="code">@ogonek{--a}</code> &#8211;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &#8211;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &#8211;a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> &#8211;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &#8211;a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &#8211;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &#8211;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &#8211;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &#8211;a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> &#8211;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &#8211;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &#229; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &#231; (ç)
+<code class="code">@,{c}</code> &#231; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &#231; (ç)
 @,c@&quot;u &#231;&#252; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &#229; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &#231; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index 363df7f3a4..1fa814a8f2 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -28,7 +28,15 @@ kbd: '``simple-double--three---four----'''
 
    @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
 (ì) @'{e} é (é) @'{@dotless{i}} í (í) @dotless{i} ı (ı) @dotless{j} ȷ
-(ȷ) @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç (ç) @,c@"u çü
+(ȷ) '@H{a}' a̋ '@dotaccent{a}' ȧ (ȧ) '@ringaccent{a}' å (å)
+'@tieaccent{a}' a͡ '@u{a}' ă (ă) '@ubaraccent{a}' a̲ '@udotaccent{a}' ạ
+(ạ) '@v{a}' ǎ (ǎ) @,c ç (ç) '@,{c}' ç (ç) '@ogonek{a}' ą (ą)
+
+   @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c@"u çü
+
+   '@H{--a}' -a̋ '@dotaccent{--a}' -ȧ '@ringaccent{--a}' -å
+'@tieaccent{--a}' -a͡ '@u{--a}' -ă '@ubaraccent{--a}' -a̲
+'@udotaccent{--a}' -ạ '@v{--a}' -ǎ '@,{--c}' -ç '@ogonek{--a}' -ą
 
    @U{0075} u
 
@@ -79,13 +87,8 @@ Now !  !@ but , ,
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}'
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ (ȧ) '@dotaccent{--a}' -ȧ
-'@ringaccent{a}' å (å) '@ringaccent{--a}' -å '@tieaccent{a}' a͡
-'@tieaccent{--a}' -a͡ '@u{a}' ă (ă) '@u{--a}' -ă '@ubaraccent{a}' a̲
-'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ (ạ) '@udotaccent{--a}' -ạ
-'@v{a}' ǎ (ǎ) '@v{--a}' -ǎ '@,{c}' ç (ç) '@,{--c}' -ç '@ogonek{a}' ą (ą)
-'@ogonek{--a}' -ą 'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}'
-(1) '@footnote{in footnote2}' (2)
+'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}' (1) '@footnote{in
+footnote2}' (2)
 
    '@sp 2'
 
@@ -703,7 +706,15 @@ kbd: '``simple-double--three---four----'''
 
    @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
 (ì) @'{e} é (é) @'{@dotless{i}} í (í) @dotless{i} ı (ı) @dotless{j} ȷ
-(ȷ) @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç (ç) @,c@"u çü
+(ȷ) '@H{a}' a̋ '@dotaccent{a}' ȧ (ȧ) '@ringaccent{a}' å (å)
+'@tieaccent{a}' a͡ '@u{a}' ă (ă) '@ubaraccent{a}' a̲ '@udotaccent{a}' ạ
+(ạ) '@v{a}' ǎ (ǎ) @,c ç (ç) '@,{c}' ç (ç) '@ogonek{a}' ą (ą)
+
+   @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c@"u çü
+
+   '@H{--a}' -a̋ '@dotaccent{--a}' -ȧ '@ringaccent{--a}' -å
+'@tieaccent{--a}' -a͡ '@u{--a}' -ă '@ubaraccent{--a}' -a̲
+'@udotaccent{--a}' -ạ '@v{--a}' -ǎ '@,{--c}' -ç '@ogonek{--a}' -ą
 
    @U{0075} u
 
@@ -754,13 +765,8 @@ Now !  !@ but , ,
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}'
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ (ȧ) '@dotaccent{--a}' -ȧ
-'@ringaccent{a}' å (å) '@ringaccent{--a}' -å '@tieaccent{a}' a͡
-'@tieaccent{--a}' -a͡ '@u{a}' ă (ă) '@u{--a}' -ă '@ubaraccent{a}' a̲
-'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ (ạ) '@udotaccent{--a}' -ạ
-'@v{a}' ǎ (ǎ) '@v{--a}' -ǎ '@,{c}' ç (ç) '@,{--c}' -ç '@ogonek{a}' ą (ą)
-'@ogonek{--a}' -ą 'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}'
-(3) '@footnote{in footnote2}' (4)
+'a@sup{h}@sub{l}' a^{h}_{l} '@footnote{in footnote}' (3) '@footnote{in
+footnote2}' (4)
 
    '@sp 2'
 
@@ -1399,13 +1405,35 @@ cross ref name: (file name). '@inforef{}' *note ::
      @'{@dotless{i}} í (í)
      @dotless{i} ı (ı)
      @dotless{j} ȷ (ȷ)
+     @H{a} a̋
+     @dotaccent{a} ȧ (ȧ)
+     @ringaccent{a} å (å)
+     @tieaccent{a} a͡
+     @u{a} ă (ă)
+     @ubaraccent{a} a̲
+     @udotaccent{a} ạ (ạ)
+     @v{a} ǎ (ǎ)
+     @,c ç (ç)
+     @,{c} ç (ç)
+     @ogonek{a} ą (ą)
+
      @`{@=E} Ḕ
      @l{} ł
      @,{@'C} Ḉ
-     @,c ç (ç)
      @,c@"u çü
 
 
+     @H{--a} -a̋
+     @dotaccent{--a} -ȧ
+     @ringaccent{--a} -å
+     @tieaccent{--a} -a͡
+     @u{--a} -ă
+     @ubaraccent{--a} -a̲
+     @udotaccent{--a} -ạ
+     @v{--a} -ǎ
+     @,{--c} -ç
+     @ogonek{--a} -ą
+
      @U{0075} u
 
      @*
@@ -1544,26 +1572,6 @@ cross ref name: (file name). '@inforef{}' *note ::
      @verb{:--a:} --a
      @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
      @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-     @H{a} a̋
-     @H{--a} -a̋
-     @dotaccent{a} ȧ (ȧ)
-     @dotaccent{--a} -ȧ
-     @ringaccent{a} å (å)
-     @ringaccent{--a} -å
-     @tieaccent{a} a͡
-     @tieaccent{--a} -a͡
-     @u{a} ă (ă)
-     @u{--a} -ă
-     @ubaraccent{a} a̲
-     @ubaraccent{--a} -a̲
-     @udotaccent{a} ạ (ạ)
-     @udotaccent{--a} -ạ
-     @v{a} ǎ (ǎ)
-     @v{--a} -ǎ
-     @,{c} ç (ç)
-     @,{--c} -ç
-     @ogonek{a} ą (ą)
-     @ogonek{--a} -ą
      a@sup{h}@sub{l} a^{h}_{l}
      @footnote{in footnote} (5)
      @footnote{in footnote2} (6)
@@ -2222,300 +2230,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2218)
+* truc:                                  chapter.            (line 2226)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2218)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2226)
 
    cp
 
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  703)
-* " <2>:                                 chapter.            (line 1389)
+* " <1>:                                 chapter.            (line  706)
+* " <2>:                                 chapter.            (line 1395)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  703)
-* -option <2>:                           chapter.            (line 1389)
-* .:                                     chapter.            (line 2218)
-* ?:                                     chapter.            (line 2218)
-* a:                                     chapter.            (line 2218)
-* aaa, bbb:                              chapter.            (line 2218)
-* a--a:                                  chapter.            (line 2218)
-* a--asis:                               chapter.            (line  507)
-* a--asis <1>:                           chapter.            (line 1182)
-* a--asis <2>:                           chapter.            (line 1995)
-* b:                                     chapter.            (line  508)
-* b <1>:                                 chapter.            (line 1183)
-* b <2>:                                 chapter.            (line 1996)
-* b--b, c--c:                            chapter.            (line 2218)
+* -option <1>:                           chapter.            (line  706)
+* -option <2>:                           chapter.            (line 1395)
+* .:                                     chapter.            (line 2226)
+* ?:                                     chapter.            (line 2226)
+* a:                                     chapter.            (line 2226)
+* aaa, bbb:                              chapter.            (line 2226)
+* a--a:                                  chapter.            (line 2226)
+* a--asis:                               chapter.            (line  510)
+* a--asis <1>:                           chapter.            (line 1188)
+* a--asis <2>:                           chapter.            (line 2003)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line 1189)
+* b <2>:                                 chapter.            (line 2004)
+* b--b, c--c:                            chapter.            (line 2226)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2218)
-* d--efcv_name:                          chapter.            (line  348)
-* d--efcv_name <1>:                      chapter.            (line  351)
-* d--efcv_name <2>:                      chapter.            (line 1023)
-* d--efcv_name <3>:                      chapter.            (line 1026)
-* d--efcv_name <4>:                      chapter.            (line 1836)
-* d--efcv_name <5>:                      chapter.            (line 1839)
-* d--efivar_name of c--lass:             chapter.            (line  393)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1068)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1881)
-* d--efopt_name:                         chapter.            (line  384)
-* d--efopt_name <1>:                     chapter.            (line 1059)
-* d--efopt_name <2>:                     chapter.            (line 1872)
-* d--eftypecv_name of c--lass:           chapter.            (line  354)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  357)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1029)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1032)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1842)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1845)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  425)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  428)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1100)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1103)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1914)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1917)
-* d--eftypeivar_name of c--lass:         chapter.            (line  396)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1071)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1884)
-* d--eftypevar_name:                     chapter.            (line  390)
-* d--eftypevar_name <1>:                 chapter.            (line 1065)
-* d--eftypevar_name <2>:                 chapter.            (line 1878)
-* d--eftypevr_name:                      chapter.            (line  345)
-* d--eftypevr_name <1>:                  chapter.            (line 1020)
-* d--eftypevr_name <2>:                  chapter.            (line 1833)
-* d--efvar_name:                         chapter.            (line  378)
-* d--efvar_name <1>:                     chapter.            (line  381)
-* d--efvar_name <2>:                     chapter.            (line 1053)
-* d--efvar_name <3>:                     chapter.            (line 1056)
-* d--efvar_name <4>:                     chapter.            (line 1866)
-* d--efvar_name <5>:                     chapter.            (line 1869)
-* d--efvr_name:                          chapter.            (line  324)
-* d--efvr_name <1>:                      chapter.            (line  999)
-* d--efvr_name <2>:                      chapter.            (line 1812)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2218)
-* index entry between item and itemx:    chapter.            (line  512)
-* index entry between item and itemx <1>: chapter.           (line  638)
-* index entry between item and itemx <2>: chapter.           (line 1187)
-* index entry between item and itemx <3>: chapter.           (line 1313)
-* index entry between item and itemx <4>: chapter.           (line 2000)
-* index entry between item and itemx <5>: chapter.           (line 2159)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2226)
+* d--efcv_name:                          chapter.            (line  351)
+* d--efcv_name <1>:                      chapter.            (line  354)
+* d--efcv_name <2>:                      chapter.            (line 1029)
+* d--efcv_name <3>:                      chapter.            (line 1032)
+* d--efcv_name <4>:                      chapter.            (line 1844)
+* d--efcv_name <5>:                      chapter.            (line 1847)
+* d--efivar_name of c--lass:             chapter.            (line  396)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1074)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1889)
+* d--efopt_name:                         chapter.            (line  387)
+* d--efopt_name <1>:                     chapter.            (line 1065)
+* d--efopt_name <2>:                     chapter.            (line 1880)
+* d--eftypecv_name of c--lass:           chapter.            (line  357)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  360)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1035)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1038)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1850)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1853)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  428)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  431)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1106)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1109)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1922)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1925)
+* d--eftypeivar_name of c--lass:         chapter.            (line  399)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1077)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1892)
+* d--eftypevar_name:                     chapter.            (line  393)
+* d--eftypevar_name <1>:                 chapter.            (line 1071)
+* d--eftypevar_name <2>:                 chapter.            (line 1886)
+* d--eftypevr_name:                      chapter.            (line  348)
+* d--eftypevr_name <1>:                  chapter.            (line 1026)
+* d--eftypevr_name <2>:                  chapter.            (line 1841)
+* d--efvar_name:                         chapter.            (line  381)
+* d--efvar_name <1>:                     chapter.            (line  384)
+* d--efvar_name <2>:                     chapter.            (line 1059)
+* d--efvar_name <3>:                     chapter.            (line 1062)
+* d--efvar_name <4>:                     chapter.            (line 1874)
+* d--efvar_name <5>:                     chapter.            (line 1877)
+* d--efvr_name:                          chapter.            (line  327)
+* d--efvr_name <1>:                      chapter.            (line 1005)
+* d--efvr_name <2>:                      chapter.            (line 1820)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2226)
+* index entry between item and itemx:    chapter.            (line  515)
+* index entry between item and itemx <1>: chapter.           (line  641)
+* index entry between item and itemx <2>: chapter.           (line 1193)
+* index entry between item and itemx <3>: chapter.           (line 1319)
+* index entry between item and itemx <4>: chapter.           (line 2008)
+* index entry between item and itemx <5>: chapter.           (line 2167)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  299)
-* index entry within deffn <1>:          chapter.            (line  974)
-* index entry within deffn <2>:          chapter.            (line 1785)
-* index entry within itemize:            chapter.            (line  210)
-* index entry within itemize <1>:        chapter.            (line  885)
-* index entry within itemize <2>:        chapter.            (line 1696)
-* index entry within multitable:         chapter.            (line  232)
-* index entry within multitable <1>:     chapter.            (line  907)
-* index entry within multitable <2>:     chapter.            (line 1719)
-* t-ruc:                                 chapter.            (line 2218)
-* T-ruc:                                 chapter.            (line 2218)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  134)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  809)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1619)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  129)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  804)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1614)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  144)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  819)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1629)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  139)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  814)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1624)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  136)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  811)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1621)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  131)
+* index entry within deffn:              chapter.            (line  302)
+* index entry within deffn <1>:          chapter.            (line  980)
+* index entry within deffn <2>:          chapter.            (line 1793)
+* index entry within itemize:            chapter.            (line  213)
+* index entry within itemize <1>:        chapter.            (line  891)
+* index entry within itemize <2>:        chapter.            (line 1704)
+* index entry within multitable:         chapter.            (line  235)
+* index entry within multitable <1>:     chapter.            (line  913)
+* index entry within multitable <2>:     chapter.            (line 1727)
+* t-ruc:                                 chapter.            (line 2226)
+* T-ruc:                                 chapter.            (line 2226)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  815)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1627)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  810)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1622)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  825)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1637)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  820)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1632)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  817)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1629)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  806)
+                                                             (line  812)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1616)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  146)
+                                                             (line 1624)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  821)
+                                                             (line  827)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  141)
+                                                             (line 1639)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  816)
+                                                             (line  822)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1626)
+                                                             (line 1634)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  703)
-* --foption <2>:                         chapter.            (line 1389)
-* .:                                     chapter.            (line 2218)
-* ?:                                     chapter.            (line 2218)
+* --foption <1>:                         chapter.            (line  706)
+* --foption <2>:                         chapter.            (line 1395)
+* .:                                     chapter.            (line 2226)
+* ?:                                     chapter.            (line 2226)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  703)
-* `` <2>:                                chapter.            (line 1389)
-* a:                                     chapter.            (line  312)
-* a <1>:                                 chapter.            (line  511)
-* a <2>:                                 chapter.            (line  637)
-* a <3>:                                 chapter.            (line  987)
-* a <4>:                                 chapter.            (line 1186)
-* a <5>:                                 chapter.            (line 1312)
-* a <6>:                                 chapter.            (line 1798)
-* a <7>:                                 chapter.            (line 1999)
-* a <8>:                                 chapter.            (line 2158)
-* a <9>:                                 chapter.            (line 2218)
-* after:                                 chapter.            (line  648)
-* after <1>:                             chapter.            (line 1323)
-* after <2>:                             chapter.            (line 2169)
-* arg2:                                  chapter.            (line  431)
-* arg2 <1>:                              chapter.            (line 1106)
-* arg2 <2>:                              chapter.            (line 1921)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line  638)
-* b <2>:                                 chapter.            (line 1187)
-* b <3>:                                 chapter.            (line 1313)
-* b <4>:                                 chapter.            (line 2000)
-* b <5>:                                 chapter.            (line 2159)
-* bidule machin:                         chapter.            (line  307)
-* bidule machin <1>:                     chapter.            (line  982)
-* bidule machin <2>:                     chapter.            (line 1793)
-* d--effn_name:                          chapter.            (line  291)
-* d--effn_name <1>:                      chapter.            (line  966)
-* d--effn_name <2>:                      chapter.            (line 1777)
-* d--efmac_name:                         chapter.            (line  372)
-* d--efmac_name <1>:                     chapter.            (line 1047)
-* d--efmac_name <2>:                     chapter.            (line 1860)
-* d--efmethod_name on c--lass:           chapter.            (line  399)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1074)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1887)
-* d--efop_name on c--lass:               chapter.            (line  360)
-* d--efop_name on c--lass <1>:           chapter.            (line  363)
-* d--efop_name on c--lass <2>:           chapter.            (line 1035)
-* d--efop_name on c--lass <3>:           chapter.            (line 1038)
-* d--efop_name on c--lass <4>:           chapter.            (line 1848)
-* d--efop_name on c--lass <5>:           chapter.            (line 1851)
-* d--efspec_name:                        chapter.            (line  375)
-* d--efspec_name <1>:                    chapter.            (line 1050)
-* d--efspec_name <2>:                    chapter.            (line 1863)
-* d--eftypefn_name:                      chapter.            (line  333)
-* d--eftypefn_name <1>:                  chapter.            (line  336)
-* d--eftypefn_name <2>:                  chapter.            (line 1008)
-* d--eftypefn_name <3>:                  chapter.            (line 1011)
-* d--eftypefn_name <4>:                  chapter.            (line 1821)
-* d--eftypefn_name <5>:                  chapter.            (line 1824)
-* d--eftypefn_name2:                     chapter.            (line  410)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1085)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1899)
-* d--eftypefun_name:                     chapter.            (line  387)
-* d--eftypefun_name <1>:                 chapter.            (line 1062)
-* d--eftypefun_name <2>:                 chapter.            (line 1875)
-* d--eftypemethod_name on c--lass:       chapter.            (line  402)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1077)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1890)
-* d--eftypeop_name on c--lass:           chapter.            (line  339)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  342)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1014)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1017)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1827)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1830)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  415)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  420)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1090)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1095)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1904)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1909)
-* d--efun_name:                          chapter.            (line  369)
-* d--efun_name <1>:                      chapter.            (line 1044)
-* d--efun_name <2>:                      chapter.            (line 1857)
-* de--ffn_name:                          chapter.            (line  294)
-* de--ffn_name <1>:                      chapter.            (line  969)
-* de--ffn_name <2>:                      chapter.            (line 1780)
-* deffn:                                 chapter.            (line  315)
-* deffn <1>:                             chapter.            (line  317)
-* deffn <2>:                             chapter.            (line  990)
-* deffn <3>:                             chapter.            (line  992)
-* deffn <4>:                             chapter.            (line 1802)
-* deffn <5>:                             chapter.            (line 1804)
-* deffnx:                                chapter.            (line  313)
-* deffnx <1>:                            chapter.            (line  318)
-* deffnx <2>:                            chapter.            (line  988)
-* deffnx <3>:                            chapter.            (line  993)
-* deffnx <4>:                            chapter.            (line 1799)
-* deffnx <5>:                            chapter.            (line 1805)
-* f---aa:                                chapter.            (line 2218)
-* f---bb, f---cc:                        chapter.            (line 2218)
-* f---ddd, f---eee, ffff:                chapter.            (line 2218)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2218)
-* followed:                              chapter.            (line  310)
-* followed <1>:                          chapter.            (line  646)
-* followed <2>:                          chapter.            (line  985)
-* followed <3>:                          chapter.            (line 1321)
-* followed <4>:                          chapter.            (line 1796)
-* followed <5>:                          chapter.            (line 2167)
-* I:                                     chapter.            (line  298)
-* I <1>:                                 chapter.            (line  320)
-* I <2>:                                 chapter.            (line  973)
-* I <3>:                                 chapter.            (line  995)
-* I <4>:                                 chapter.            (line 1784)
-* I <5>:                                 chapter.            (line 1807)
-* id i ule:                              chapter.            (line  304)
-* id i ule <1>:                          chapter.            (line  979)
-* id i ule <2>:                          chapter.            (line 1790)
-* id ule:                                chapter.            (line  303)
-* id ule <1>:                            chapter.            (line  978)
-* id ule <2>:                            chapter.            (line 1789)
-* INVALID:                               chapter.            (line  650)
-* INVALID <1>:                           chapter.            (line 1325)
-* INVALID <2>:                           chapter.            (line 2171)
-* log trap:                              chapter.            (line  300)
-* log trap <1>:                          chapter.            (line  975)
-* log trap <2>:                          chapter.            (line 1786)
-* log trap1:                             chapter.            (line  301)
-* log trap1 <1>:                         chapter.            (line  976)
-* log trap1 <2>:                         chapter.            (line 1787)
-* log trap2:                             chapter.            (line  302)
-* log trap2 <1>:                         chapter.            (line  977)
-* log trap2 <2>:                         chapter.            (line 1788)
-* machin:                                chapter.            (line  306)
-* machin <1>:                            chapter.            (line  308)
-* machin <2>:                            chapter.            (line  642)
-* machin <3>:                            chapter.            (line  643)
-* machin <4>:                            chapter.            (line  644)
-* machin <5>:                            chapter.            (line  645)
-* machin <6>:                            chapter.            (line  981)
-* machin <7>:                            chapter.            (line  983)
-* machin <8>:                            chapter.            (line 1317)
-* machin <9>:                            chapter.            (line 1318)
-* machin <10>:                           chapter.            (line 1319)
-* machin <11>:                           chapter.            (line 1320)
-* machin <12>:                           chapter.            (line 1792)
-* machin <13>:                           chapter.            (line 1794)
-* machin <14>:                           chapter.            (line 2163)
-* machin <15>:                           chapter.            (line 2164)
-* machin <16>:                           chapter.            (line 2165)
-* machin <17>:                           chapter.            (line 2166)
-* n--ame:                                chapter.            (line  327)
-* n--ame <1>:                            chapter.            (line  330)
-* n--ame <2>:                            chapter.            (line 1002)
-* n--ame <3>:                            chapter.            (line 1005)
-* n--ame <4>:                            chapter.            (line 1815)
-* n--ame <5>:                            chapter.            (line 1818)
-* name2:                                 chapter.            (line  405)
-* name2 <1>:                             chapter.            (line 1080)
-* name2 <2>:                             chapter.            (line 1894)
-* t--ruc:                                chapter.            (line 2218)
-* T--ruc:                                chapter.            (line 2218)
-* truc:                                  chapter.            (line  299)
-* truc <1>:                              chapter.            (line  321)
-* truc <2>:                              chapter.            (line  974)
-* truc <3>:                              chapter.            (line  996)
-* truc <4>:                              chapter.            (line 1785)
-* truc <5>:                              chapter.            (line 1808)
-* xxx, zzz:                              chapter.            (line 2218)
+* `` <1>:                                chapter.            (line  706)
+* `` <2>:                                chapter.            (line 1395)
+* a:                                     chapter.            (line  315)
+* a <1>:                                 chapter.            (line  514)
+* a <2>:                                 chapter.            (line  640)
+* a <3>:                                 chapter.            (line  993)
+* a <4>:                                 chapter.            (line 1192)
+* a <5>:                                 chapter.            (line 1318)
+* a <6>:                                 chapter.            (line 1806)
+* a <7>:                                 chapter.            (line 2007)
+* a <8>:                                 chapter.            (line 2166)
+* a <9>:                                 chapter.            (line 2226)
+* after:                                 chapter.            (line  651)
+* after <1>:                             chapter.            (line 1329)
+* after <2>:                             chapter.            (line 2177)
+* arg2:                                  chapter.            (line  434)
+* arg2 <1>:                              chapter.            (line 1112)
+* arg2 <2>:                              chapter.            (line 1929)
+* b:                                     chapter.            (line  515)
+* b <1>:                                 chapter.            (line  641)
+* b <2>:                                 chapter.            (line 1193)
+* b <3>:                                 chapter.            (line 1319)
+* b <4>:                                 chapter.            (line 2008)
+* b <5>:                                 chapter.            (line 2167)
+* bidule machin:                         chapter.            (line  310)
+* bidule machin <1>:                     chapter.            (line  988)
+* bidule machin <2>:                     chapter.            (line 1801)
+* d--effn_name:                          chapter.            (line  294)
+* d--effn_name <1>:                      chapter.            (line  972)
+* d--effn_name <2>:                      chapter.            (line 1785)
+* d--efmac_name:                         chapter.            (line  375)
+* d--efmac_name <1>:                     chapter.            (line 1053)
+* d--efmac_name <2>:                     chapter.            (line 1868)
+* d--efmethod_name on c--lass:           chapter.            (line  402)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1080)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1895)
+* d--efop_name on c--lass:               chapter.            (line  363)
+* d--efop_name on c--lass <1>:           chapter.            (line  366)
+* d--efop_name on c--lass <2>:           chapter.            (line 1041)
+* d--efop_name on c--lass <3>:           chapter.            (line 1044)
+* d--efop_name on c--lass <4>:           chapter.            (line 1856)
+* d--efop_name on c--lass <5>:           chapter.            (line 1859)
+* d--efspec_name:                        chapter.            (line  378)
+* d--efspec_name <1>:                    chapter.            (line 1056)
+* d--efspec_name <2>:                    chapter.            (line 1871)
+* d--eftypefn_name:                      chapter.            (line  336)
+* d--eftypefn_name <1>:                  chapter.            (line  339)
+* d--eftypefn_name <2>:                  chapter.            (line 1014)
+* d--eftypefn_name <3>:                  chapter.            (line 1017)
+* d--eftypefn_name <4>:                  chapter.            (line 1829)
+* d--eftypefn_name <5>:                  chapter.            (line 1832)
+* d--eftypefn_name2:                     chapter.            (line  413)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1091)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1907)
+* d--eftypefun_name:                     chapter.            (line  390)
+* d--eftypefun_name <1>:                 chapter.            (line 1068)
+* d--eftypefun_name <2>:                 chapter.            (line 1883)
+* d--eftypemethod_name on c--lass:       chapter.            (line  405)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1083)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1898)
+* d--eftypeop_name on c--lass:           chapter.            (line  342)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  345)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1020)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1023)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1835)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1838)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  418)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  423)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1096)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1912)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1917)
+* d--efun_name:                          chapter.            (line  372)
+* d--efun_name <1>:                      chapter.            (line 1050)
+* d--efun_name <2>:                      chapter.            (line 1865)
+* de--ffn_name:                          chapter.            (line  297)
+* de--ffn_name <1>:                      chapter.            (line  975)
+* de--ffn_name <2>:                      chapter.            (line 1788)
+* deffn:                                 chapter.            (line  318)
+* deffn <1>:                             chapter.            (line  320)
+* deffn <2>:                             chapter.            (line  996)
+* deffn <3>:                             chapter.            (line  998)
+* deffn <4>:                             chapter.            (line 1810)
+* deffn <5>:                             chapter.            (line 1812)
+* deffnx:                                chapter.            (line  316)
+* deffnx <1>:                            chapter.            (line  321)
+* deffnx <2>:                            chapter.            (line  994)
+* deffnx <3>:                            chapter.            (line  999)
+* deffnx <4>:                            chapter.            (line 1807)
+* deffnx <5>:                            chapter.            (line 1813)
+* f---aa:                                chapter.            (line 2226)
+* f---bb, f---cc:                        chapter.            (line 2226)
+* f---ddd, f---eee, ffff:                chapter.            (line 2226)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2226)
+* followed:                              chapter.            (line  313)
+* followed <1>:                          chapter.            (line  649)
+* followed <2>:                          chapter.            (line  991)
+* followed <3>:                          chapter.            (line 1327)
+* followed <4>:                          chapter.            (line 1804)
+* followed <5>:                          chapter.            (line 2175)
+* I:                                     chapter.            (line  301)
+* I <1>:                                 chapter.            (line  323)
+* I <2>:                                 chapter.            (line  979)
+* I <3>:                                 chapter.            (line 1001)
+* I <4>:                                 chapter.            (line 1792)
+* I <5>:                                 chapter.            (line 1815)
+* id i ule:                              chapter.            (line  307)
+* id i ule <1>:                          chapter.            (line  985)
+* id i ule <2>:                          chapter.            (line 1798)
+* id ule:                                chapter.            (line  306)
+* id ule <1>:                            chapter.            (line  984)
+* id ule <2>:                            chapter.            (line 1797)
+* INVALID:                               chapter.            (line  653)
+* INVALID <1>:                           chapter.            (line 1331)
+* INVALID <2>:                           chapter.            (line 2179)
+* log trap:                              chapter.            (line  303)
+* log trap <1>:                          chapter.            (line  981)
+* log trap <2>:                          chapter.            (line 1794)
+* log trap1:                             chapter.            (line  304)
+* log trap1 <1>:                         chapter.            (line  982)
+* log trap1 <2>:                         chapter.            (line 1795)
+* log trap2:                             chapter.            (line  305)
+* log trap2 <1>:                         chapter.            (line  983)
+* log trap2 <2>:                         chapter.            (line 1796)
+* machin:                                chapter.            (line  309)
+* machin <1>:                            chapter.            (line  311)
+* machin <2>:                            chapter.            (line  645)
+* machin <3>:                            chapter.            (line  646)
+* machin <4>:                            chapter.            (line  647)
+* machin <5>:                            chapter.            (line  648)
+* machin <6>:                            chapter.            (line  987)
+* machin <7>:                            chapter.            (line  989)
+* machin <8>:                            chapter.            (line 1323)
+* machin <9>:                            chapter.            (line 1324)
+* machin <10>:                           chapter.            (line 1325)
+* machin <11>:                           chapter.            (line 1326)
+* machin <12>:                           chapter.            (line 1800)
+* machin <13>:                           chapter.            (line 1802)
+* machin <14>:                           chapter.            (line 2171)
+* machin <15>:                           chapter.            (line 2172)
+* machin <16>:                           chapter.            (line 2173)
+* machin <17>:                           chapter.            (line 2174)
+* n--ame:                                chapter.            (line  330)
+* n--ame <1>:                            chapter.            (line  333)
+* n--ame <2>:                            chapter.            (line 1008)
+* n--ame <3>:                            chapter.            (line 1011)
+* n--ame <4>:                            chapter.            (line 1823)
+* n--ame <5>:                            chapter.            (line 1826)
+* name2:                                 chapter.            (line  408)
+* name2 <1>:                             chapter.            (line 1086)
+* name2 <2>:                             chapter.            (line 1902)
+* t--ruc:                                chapter.            (line 2226)
+* T--ruc:                                chapter.            (line 2226)
+* truc:                                  chapter.            (line  302)
+* truc <1>:                              chapter.            (line  324)
+* truc <2>:                              chapter.            (line  980)
+* truc <3>:                              chapter.            (line 1002)
+* truc <4>:                              chapter.            (line 1793)
+* truc <5>:                              chapter.            (line 1816)
+* xxx, zzz:                              chapter.            (line 2226)
 
    vr
 
@@ -2527,9 +2535,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  366)
-* d--eftp_name <1>:                      chapter.            (line 1041)
-* d--eftp_name <2>:                      chapter.            (line 1854)
+* d--eftp_name:                          chapter.            (line  369)
+* d--eftp_name <1>:                      chapter.            (line 1047)
+* d--eftp_name <2>:                      chapter.            (line 1862)
 
    (8)
 
@@ -2574,285 +2582,285 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  703)
-* " <2>:                                 chapter.            (line 1389)
+* " <1>:                                 chapter.            (line  706)
+* " <2>:                                 chapter.            (line 1395)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  703)
-* -option <2>:                           chapter.            (line 1389)
-* .:                                     chapter.            (line 2218)
-* ?:                                     chapter.            (line 2218)
-* a:                                     chapter.            (line 2218)
-* aaa, bbb:                              chapter.            (line 2218)
-* a--a:                                  chapter.            (line 2218)
-* a--asis:                               chapter.            (line  507)
-* a--asis <1>:                           chapter.            (line 1182)
-* a--asis <2>:                           chapter.            (line 1995)
-* b:                                     chapter.            (line  508)
-* b <1>:                                 chapter.            (line 1183)
-* b <2>:                                 chapter.            (line 1996)
-* b--b, c--c:                            chapter.            (line 2218)
-* counting entry:                        chapter.            (line 2555)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2218)
-* d--efcv_name:                          chapter.            (line  348)
-* d--efcv_name <1>:                      chapter.            (line  351)
-* d--efcv_name <2>:                      chapter.            (line 1023)
-* d--efcv_name <3>:                      chapter.            (line 1026)
-* d--efcv_name <4>:                      chapter.            (line 1836)
-* d--efcv_name <5>:                      chapter.            (line 1839)
-* d--efivar_name of c--lass:             chapter.            (line  393)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1068)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1881)
-* d--efopt_name:                         chapter.            (line  384)
-* d--efopt_name <1>:                     chapter.            (line 1059)
-* d--efopt_name <2>:                     chapter.            (line 1872)
-* d--eftypecv_name of c--lass:           chapter.            (line  354)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  357)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1029)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1032)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1842)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1845)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  425)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  428)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1100)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1103)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1914)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1917)
-* d--eftypeivar_name of c--lass:         chapter.            (line  396)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1071)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1884)
-* d--eftypevar_name:                     chapter.            (line  390)
-* d--eftypevar_name <1>:                 chapter.            (line 1065)
-* d--eftypevar_name <2>:                 chapter.            (line 1878)
-* d--eftypevr_name:                      chapter.            (line  345)
-* d--eftypevr_name <1>:                  chapter.            (line 1020)
-* d--eftypevr_name <2>:                  chapter.            (line 1833)
-* d--efvar_name:                         chapter.            (line  378)
-* d--efvar_name <1>:                     chapter.            (line  381)
-* d--efvar_name <2>:                     chapter.            (line 1053)
-* d--efvar_name <3>:                     chapter.            (line 1056)
-* d--efvar_name <4>:                     chapter.            (line 1866)
-* d--efvar_name <5>:                     chapter.            (line 1869)
-* d--efvr_name:                          chapter.            (line  324)
-* d--efvr_name <1>:                      chapter.            (line  999)
-* d--efvr_name <2>:                      chapter.            (line 1812)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2218)
-* index entry between item and itemx:    chapter.            (line  512)
-* index entry between item and itemx <1>: chapter.           (line  638)
-* index entry between item and itemx <2>: chapter.           (line 1187)
-* index entry between item and itemx <3>: chapter.           (line 1313)
-* index entry between item and itemx <4>: chapter.           (line 2000)
-* index entry between item and itemx <5>: chapter.           (line 2159)
-* index entry in footnote:               chapter.            (line 2550)
-* index entry within deffn:              chapter.            (line  299)
-* index entry within deffn <1>:          chapter.            (line  974)
-* index entry within deffn <2>:          chapter.            (line 1785)
-* index entry within itemize:            chapter.            (line  210)
-* index entry within itemize <1>:        chapter.            (line  885)
-* index entry within itemize <2>:        chapter.            (line 1696)
-* index entry within multitable:         chapter.            (line  232)
-* index entry within multitable <1>:     chapter.            (line  907)
-* index entry within multitable <2>:     chapter.            (line 1719)
-* t-ruc:                                 chapter.            (line 2218)
-* T-ruc:                                 chapter.            (line 2218)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  134)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  809)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1619)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  129)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  804)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1614)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  144)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  819)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1629)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  139)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  814)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1624)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  136)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  811)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1621)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  131)
+* -option <1>:                           chapter.            (line  706)
+* -option <2>:                           chapter.            (line 1395)
+* .:                                     chapter.            (line 2226)
+* ?:                                     chapter.            (line 2226)
+* a:                                     chapter.            (line 2226)
+* aaa, bbb:                              chapter.            (line 2226)
+* a--a:                                  chapter.            (line 2226)
+* a--asis:                               chapter.            (line  510)
+* a--asis <1>:                           chapter.            (line 1188)
+* a--asis <2>:                           chapter.            (line 2003)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line 1189)
+* b <2>:                                 chapter.            (line 2004)
+* b--b, c--c:                            chapter.            (line 2226)
+* counting entry:                        chapter.            (line 2563)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2226)
+* d--efcv_name:                          chapter.            (line  351)
+* d--efcv_name <1>:                      chapter.            (line  354)
+* d--efcv_name <2>:                      chapter.            (line 1029)
+* d--efcv_name <3>:                      chapter.            (line 1032)
+* d--efcv_name <4>:                      chapter.            (line 1844)
+* d--efcv_name <5>:                      chapter.            (line 1847)
+* d--efivar_name of c--lass:             chapter.            (line  396)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1074)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1889)
+* d--efopt_name:                         chapter.            (line  387)
+* d--efopt_name <1>:                     chapter.            (line 1065)
+* d--efopt_name <2>:                     chapter.            (line 1880)
+* d--eftypecv_name of c--lass:           chapter.            (line  357)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  360)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1035)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1038)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1850)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1853)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  428)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  431)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1106)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1109)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1922)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1925)
+* d--eftypeivar_name of c--lass:         chapter.            (line  399)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1077)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1892)
+* d--eftypevar_name:                     chapter.            (line  393)
+* d--eftypevar_name <1>:                 chapter.            (line 1071)
+* d--eftypevar_name <2>:                 chapter.            (line 1886)
+* d--eftypevr_name:                      chapter.            (line  348)
+* d--eftypevr_name <1>:                  chapter.            (line 1026)
+* d--eftypevr_name <2>:                  chapter.            (line 1841)
+* d--efvar_name:                         chapter.            (line  381)
+* d--efvar_name <1>:                     chapter.            (line  384)
+* d--efvar_name <2>:                     chapter.            (line 1059)
+* d--efvar_name <3>:                     chapter.            (line 1062)
+* d--efvar_name <4>:                     chapter.            (line 1874)
+* d--efvar_name <5>:                     chapter.            (line 1877)
+* d--efvr_name:                          chapter.            (line  327)
+* d--efvr_name <1>:                      chapter.            (line 1005)
+* d--efvr_name <2>:                      chapter.            (line 1820)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2226)
+* index entry between item and itemx:    chapter.            (line  515)
+* index entry between item and itemx <1>: chapter.           (line  641)
+* index entry between item and itemx <2>: chapter.           (line 1193)
+* index entry between item and itemx <3>: chapter.           (line 1319)
+* index entry between item and itemx <4>: chapter.           (line 2008)
+* index entry between item and itemx <5>: chapter.           (line 2167)
+* index entry in footnote:               chapter.            (line 2558)
+* index entry within deffn:              chapter.            (line  302)
+* index entry within deffn <1>:          chapter.            (line  980)
+* index entry within deffn <2>:          chapter.            (line 1793)
+* index entry within itemize:            chapter.            (line  213)
+* index entry within itemize <1>:        chapter.            (line  891)
+* index entry within itemize <2>:        chapter.            (line 1704)
+* index entry within multitable:         chapter.            (line  235)
+* index entry within multitable <1>:     chapter.            (line  913)
+* index entry within multitable <2>:     chapter.            (line 1727)
+* t-ruc:                                 chapter.            (line 2226)
+* T-ruc:                                 chapter.            (line 2226)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  815)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1627)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  810)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1622)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  825)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1637)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  820)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1632)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  817)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1629)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  806)
+                                                             (line  812)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1616)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  146)
+                                                             (line 1624)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  821)
+                                                             (line  827)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  141)
+                                                             (line 1639)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  816)
+                                                             (line  822)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1626)
+                                                             (line 1634)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  703)
-* --foption <2>:                         chapter.            (line 1389)
-* .:                                     chapter.            (line 2218)
-* ?:                                     chapter.            (line 2218)
+* --foption <1>:                         chapter.            (line  706)
+* --foption <2>:                         chapter.            (line 1395)
+* .:                                     chapter.            (line 2226)
+* ?:                                     chapter.            (line 2226)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  703)
-* `` <2>:                                chapter.            (line 1389)
-* a:                                     chapter.            (line  312)
-* a <1>:                                 chapter.            (line  511)
-* a <2>:                                 chapter.            (line  637)
-* a <3>:                                 chapter.            (line  987)
-* a <4>:                                 chapter.            (line 1186)
-* a <5>:                                 chapter.            (line 1312)
-* a <6>:                                 chapter.            (line 1798)
-* a <7>:                                 chapter.            (line 1999)
-* a <8>:                                 chapter.            (line 2158)
-* a <9>:                                 chapter.            (line 2218)
-* after:                                 chapter.            (line  648)
-* after <1>:                             chapter.            (line 1323)
-* after <2>:                             chapter.            (line 2169)
-* arg2:                                  chapter.            (line  431)
-* arg2 <1>:                              chapter.            (line 1106)
-* arg2 <2>:                              chapter.            (line 1921)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line  638)
-* b <2>:                                 chapter.            (line 1187)
-* b <3>:                                 chapter.            (line 1313)
-* b <4>:                                 chapter.            (line 2000)
-* b <5>:                                 chapter.            (line 2159)
-* bidule machin:                         chapter.            (line  307)
-* bidule machin <1>:                     chapter.            (line  982)
-* bidule machin <2>:                     chapter.            (line 1793)
-* d--effn_name:                          chapter.            (line  291)
-* d--effn_name <1>:                      chapter.            (line  966)
-* d--effn_name <2>:                      chapter.            (line 1777)
-* d--efmac_name:                         chapter.            (line  372)
-* d--efmac_name <1>:                     chapter.            (line 1047)
-* d--efmac_name <2>:                     chapter.            (line 1860)
-* d--efmethod_name on c--lass:           chapter.            (line  399)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1074)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1887)
-* d--efop_name on c--lass:               chapter.            (line  360)
-* d--efop_name on c--lass <1>:           chapter.            (line  363)
-* d--efop_name on c--lass <2>:           chapter.            (line 1035)
-* d--efop_name on c--lass <3>:           chapter.            (line 1038)
-* d--efop_name on c--lass <4>:           chapter.            (line 1848)
-* d--efop_name on c--lass <5>:           chapter.            (line 1851)
-* d--efspec_name:                        chapter.            (line  375)
-* d--efspec_name <1>:                    chapter.            (line 1050)
-* d--efspec_name <2>:                    chapter.            (line 1863)
-* d--eftypefn_name:                      chapter.            (line  333)
-* d--eftypefn_name <1>:                  chapter.            (line  336)
-* d--eftypefn_name <2>:                  chapter.            (line 1008)
-* d--eftypefn_name <3>:                  chapter.            (line 1011)
-* d--eftypefn_name <4>:                  chapter.            (line 1821)
-* d--eftypefn_name <5>:                  chapter.            (line 1824)
-* d--eftypefn_name2:                     chapter.            (line  410)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1085)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1899)
-* d--eftypefun_name:                     chapter.            (line  387)
-* d--eftypefun_name <1>:                 chapter.            (line 1062)
-* d--eftypefun_name <2>:                 chapter.            (line 1875)
-* d--eftypemethod_name on c--lass:       chapter.            (line  402)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1077)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1890)
-* d--eftypeop_name on c--lass:           chapter.            (line  339)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  342)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1014)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1017)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1827)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1830)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  415)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  420)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1090)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1095)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1904)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1909)
-* d--efun_name:                          chapter.            (line  369)
-* d--efun_name <1>:                      chapter.            (line 1044)
-* d--efun_name <2>:                      chapter.            (line 1857)
-* de--ffn_name:                          chapter.            (line  294)
-* de--ffn_name <1>:                      chapter.            (line  969)
-* de--ffn_name <2>:                      chapter.            (line 1780)
-* deffn:                                 chapter.            (line  315)
-* deffn <1>:                             chapter.            (line  317)
-* deffn <2>:                             chapter.            (line  990)
-* deffn <3>:                             chapter.            (line  992)
-* deffn <4>:                             chapter.            (line 1802)
-* deffn <5>:                             chapter.            (line 1804)
-* deffnx:                                chapter.            (line  313)
-* deffnx <1>:                            chapter.            (line  318)
-* deffnx <2>:                            chapter.            (line  988)
-* deffnx <3>:                            chapter.            (line  993)
-* deffnx <4>:                            chapter.            (line 1799)
-* deffnx <5>:                            chapter.            (line 1805)
-* f---aa:                                chapter.            (line 2218)
-* f---bb, f---cc:                        chapter.            (line 2218)
-* f---ddd, f---eee, ffff:                chapter.            (line 2218)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2218)
-* followed:                              chapter.            (line  310)
-* followed <1>:                          chapter.            (line  646)
-* followed <2>:                          chapter.            (line  985)
-* followed <3>:                          chapter.            (line 1321)
-* followed <4>:                          chapter.            (line 1796)
-* followed <5>:                          chapter.            (line 2167)
-* I:                                     chapter.            (line  298)
-* I <1>:                                 chapter.            (line  320)
-* I <2>:                                 chapter.            (line  973)
-* I <3>:                                 chapter.            (line  995)
-* I <4>:                                 chapter.            (line 1784)
-* I <5>:                                 chapter.            (line 1807)
-* id i ule:                              chapter.            (line  304)
-* id i ule <1>:                          chapter.            (line  979)
-* id i ule <2>:                          chapter.            (line 1790)
-* id ule:                                chapter.            (line  303)
-* id ule <1>:                            chapter.            (line  978)
-* id ule <2>:                            chapter.            (line 1789)
-* INVALID:                               chapter.            (line  650)
-* INVALID <1>:                           chapter.            (line 1325)
-* INVALID <2>:                           chapter.            (line 2171)
-* log trap:                              chapter.            (line  300)
-* log trap <1>:                          chapter.            (line  975)
-* log trap <2>:                          chapter.            (line 1786)
-* log trap1:                             chapter.            (line  301)
-* log trap1 <1>:                         chapter.            (line  976)
-* log trap1 <2>:                         chapter.            (line 1787)
-* log trap2:                             chapter.            (line  302)
-* log trap2 <1>:                         chapter.            (line  977)
-* log trap2 <2>:                         chapter.            (line 1788)
-* machin:                                chapter.            (line  306)
-* machin <1>:                            chapter.            (line  308)
-* machin <2>:                            chapter.            (line  642)
-* machin <3>:                            chapter.            (line  643)
-* machin <4>:                            chapter.            (line  644)
-* machin <5>:                            chapter.            (line  645)
-* machin <6>:                            chapter.            (line  981)
-* machin <7>:                            chapter.            (line  983)
-* machin <8>:                            chapter.            (line 1317)
-* machin <9>:                            chapter.            (line 1318)
-* machin <10>:                           chapter.            (line 1319)
-* machin <11>:                           chapter.            (line 1320)
-* machin <12>:                           chapter.            (line 1792)
-* machin <13>:                           chapter.            (line 1794)
-* machin <14>:                           chapter.            (line 2163)
-* machin <15>:                           chapter.            (line 2164)
-* machin <16>:                           chapter.            (line 2165)
-* machin <17>:                           chapter.            (line 2166)
-* n--ame:                                chapter.            (line  327)
-* n--ame <1>:                            chapter.            (line  330)
-* n--ame <2>:                            chapter.            (line 1002)
-* n--ame <3>:                            chapter.            (line 1005)
-* n--ame <4>:                            chapter.            (line 1815)
-* n--ame <5>:                            chapter.            (line 1818)
-* name2:                                 chapter.            (line  405)
-* name2 <1>:                             chapter.            (line 1080)
-* name2 <2>:                             chapter.            (line 1894)
-* t--ruc:                                chapter.            (line 2218)
-* T--ruc:                                chapter.            (line 2218)
-* truc:                                  chapter.            (line  299)
-* truc <1>:                              chapter.            (line  321)
-* truc <2>:                              chapter.            (line  974)
-* truc <3>:                              chapter.            (line  996)
-* truc <4>:                              chapter.            (line 1785)
-* truc <5>:                              chapter.            (line 1808)
-* xxx, zzz:                              chapter.            (line 2218)
+* `` <1>:                                chapter.            (line  706)
+* `` <2>:                                chapter.            (line 1395)
+* a:                                     chapter.            (line  315)
+* a <1>:                                 chapter.            (line  514)
+* a <2>:                                 chapter.            (line  640)
+* a <3>:                                 chapter.            (line  993)
+* a <4>:                                 chapter.            (line 1192)
+* a <5>:                                 chapter.            (line 1318)
+* a <6>:                                 chapter.            (line 1806)
+* a <7>:                                 chapter.            (line 2007)
+* a <8>:                                 chapter.            (line 2166)
+* a <9>:                                 chapter.            (line 2226)
+* after:                                 chapter.            (line  651)
+* after <1>:                             chapter.            (line 1329)
+* after <2>:                             chapter.            (line 2177)
+* arg2:                                  chapter.            (line  434)
+* arg2 <1>:                              chapter.            (line 1112)
+* arg2 <2>:                              chapter.            (line 1929)
+* b:                                     chapter.            (line  515)
+* b <1>:                                 chapter.            (line  641)
+* b <2>:                                 chapter.            (line 1193)
+* b <3>:                                 chapter.            (line 1319)
+* b <4>:                                 chapter.            (line 2008)
+* b <5>:                                 chapter.            (line 2167)
+* bidule machin:                         chapter.            (line  310)
+* bidule machin <1>:                     chapter.            (line  988)
+* bidule machin <2>:                     chapter.            (line 1801)
+* d--effn_name:                          chapter.            (line  294)
+* d--effn_name <1>:                      chapter.            (line  972)
+* d--effn_name <2>:                      chapter.            (line 1785)
+* d--efmac_name:                         chapter.            (line  375)
+* d--efmac_name <1>:                     chapter.            (line 1053)
+* d--efmac_name <2>:                     chapter.            (line 1868)
+* d--efmethod_name on c--lass:           chapter.            (line  402)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1080)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1895)
+* d--efop_name on c--lass:               chapter.            (line  363)
+* d--efop_name on c--lass <1>:           chapter.            (line  366)
+* d--efop_name on c--lass <2>:           chapter.            (line 1041)
+* d--efop_name on c--lass <3>:           chapter.            (line 1044)
+* d--efop_name on c--lass <4>:           chapter.            (line 1856)
+* d--efop_name on c--lass <5>:           chapter.            (line 1859)
+* d--efspec_name:                        chapter.            (line  378)
+* d--efspec_name <1>:                    chapter.            (line 1056)
+* d--efspec_name <2>:                    chapter.            (line 1871)
+* d--eftypefn_name:                      chapter.            (line  336)
+* d--eftypefn_name <1>:                  chapter.            (line  339)
+* d--eftypefn_name <2>:                  chapter.            (line 1014)
+* d--eftypefn_name <3>:                  chapter.            (line 1017)
+* d--eftypefn_name <4>:                  chapter.            (line 1829)
+* d--eftypefn_name <5>:                  chapter.            (line 1832)
+* d--eftypefn_name2:                     chapter.            (line  413)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1091)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1907)
+* d--eftypefun_name:                     chapter.            (line  390)
+* d--eftypefun_name <1>:                 chapter.            (line 1068)
+* d--eftypefun_name <2>:                 chapter.            (line 1883)
+* d--eftypemethod_name on c--lass:       chapter.            (line  405)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1083)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1898)
+* d--eftypeop_name on c--lass:           chapter.            (line  342)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  345)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1020)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1023)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1835)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1838)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  418)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  423)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1096)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1912)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1917)
+* d--efun_name:                          chapter.            (line  372)
+* d--efun_name <1>:                      chapter.            (line 1050)
+* d--efun_name <2>:                      chapter.            (line 1865)
+* de--ffn_name:                          chapter.            (line  297)
+* de--ffn_name <1>:                      chapter.            (line  975)
+* de--ffn_name <2>:                      chapter.            (line 1788)
+* deffn:                                 chapter.            (line  318)
+* deffn <1>:                             chapter.            (line  320)
+* deffn <2>:                             chapter.            (line  996)
+* deffn <3>:                             chapter.            (line  998)
+* deffn <4>:                             chapter.            (line 1810)
+* deffn <5>:                             chapter.            (line 1812)
+* deffnx:                                chapter.            (line  316)
+* deffnx <1>:                            chapter.            (line  321)
+* deffnx <2>:                            chapter.            (line  994)
+* deffnx <3>:                            chapter.            (line  999)
+* deffnx <4>:                            chapter.            (line 1807)
+* deffnx <5>:                            chapter.            (line 1813)
+* f---aa:                                chapter.            (line 2226)
+* f---bb, f---cc:                        chapter.            (line 2226)
+* f---ddd, f---eee, ffff:                chapter.            (line 2226)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2226)
+* followed:                              chapter.            (line  313)
+* followed <1>:                          chapter.            (line  649)
+* followed <2>:                          chapter.            (line  991)
+* followed <3>:                          chapter.            (line 1327)
+* followed <4>:                          chapter.            (line 1804)
+* followed <5>:                          chapter.            (line 2175)
+* I:                                     chapter.            (line  301)
+* I <1>:                                 chapter.            (line  323)
+* I <2>:                                 chapter.            (line  979)
+* I <3>:                                 chapter.            (line 1001)
+* I <4>:                                 chapter.            (line 1792)
+* I <5>:                                 chapter.            (line 1815)
+* id i ule:                              chapter.            (line  307)
+* id i ule <1>:                          chapter.            (line  985)
+* id i ule <2>:                          chapter.            (line 1798)
+* id ule:                                chapter.            (line  306)
+* id ule <1>:                            chapter.            (line  984)
+* id ule <2>:                            chapter.            (line 1797)
+* INVALID:                               chapter.            (line  653)
+* INVALID <1>:                           chapter.            (line 1331)
+* INVALID <2>:                           chapter.            (line 2179)
+* log trap:                              chapter.            (line  303)
+* log trap <1>:                          chapter.            (line  981)
+* log trap <2>:                          chapter.            (line 1794)
+* log trap1:                             chapter.            (line  304)
+* log trap1 <1>:                         chapter.            (line  982)
+* log trap1 <2>:                         chapter.            (line 1795)
+* log trap2:                             chapter.            (line  305)
+* log trap2 <1>:                         chapter.            (line  983)
+* log trap2 <2>:                         chapter.            (line 1796)
+* machin:                                chapter.            (line  309)
+* machin <1>:                            chapter.            (line  311)
+* machin <2>:                            chapter.            (line  645)
+* machin <3>:                            chapter.            (line  646)
+* machin <4>:                            chapter.            (line  647)
+* machin <5>:                            chapter.            (line  648)
+* machin <6>:                            chapter.            (line  987)
+* machin <7>:                            chapter.            (line  989)
+* machin <8>:                            chapter.            (line 1323)
+* machin <9>:                            chapter.            (line 1324)
+* machin <10>:                           chapter.            (line 1325)
+* machin <11>:                           chapter.            (line 1326)
+* machin <12>:                           chapter.            (line 1800)
+* machin <13>:                           chapter.            (line 1802)
+* machin <14>:                           chapter.            (line 2171)
+* machin <15>:                           chapter.            (line 2172)
+* machin <16>:                           chapter.            (line 2173)
+* machin <17>:                           chapter.            (line 2174)
+* n--ame:                                chapter.            (line  330)
+* n--ame <1>:                            chapter.            (line  333)
+* n--ame <2>:                            chapter.            (line 1008)
+* n--ame <3>:                            chapter.            (line 1011)
+* n--ame <4>:                            chapter.            (line 1823)
+* n--ame <5>:                            chapter.            (line 1826)
+* name2:                                 chapter.            (line  408)
+* name2 <1>:                             chapter.            (line 1086)
+* name2 <2>:                             chapter.            (line 1902)
+* t--ruc:                                chapter.            (line 2226)
+* T--ruc:                                chapter.            (line 2226)
+* truc:                                  chapter.            (line  302)
+* truc <1>:                              chapter.            (line  324)
+* truc <2>:                              chapter.            (line  980)
+* truc <3>:                              chapter.            (line 1002)
+* truc <4>:                              chapter.            (line 1793)
+* truc <5>:                              chapter.            (line 1816)
+* xxx, zzz:                              chapter.            (line 2226)
 
 Top section
 1 chapter
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
index 9deeb53a16..6cecd7c3f1 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -68,13 +68,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -211,26 +233,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -907,13 +909,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -1050,26 +1074,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 3f7ede03ef..62eb20e2b0 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -37,13 +37,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -180,26 +202,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -931,12 +933,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1072,26 +1096,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2015,12 +2019,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2156,26 +2182,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3132,12 +3138,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3273,26 +3301,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>6</sup></a>
@@ -4218,13 +4226,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -4362,26 +4392,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(7)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(8)</a>
@@ -5452,12 +5462,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -5593,26 +5625,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_9" href="#FOOT1_9"><sup>9</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_10" href="#FOOT2_10"><sup>10</sup></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index 99d39c0f10..d6a6d1a9d6 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
index 8fb54bcb6d..e9eea1fa37 100644
--- 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
+++ 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
@@ -1,5 +1,5 @@
-1724  @chapter chapter
-1684  @top Top section
+1728  @chapter chapter
+1688  @top Top section
   10  @section A section
    7  @subsection subsection
    4  @centerchap chapter 2
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting 
b/tp/tests/layout/res_parser/formatting_textcontent/formatting
index aea1ff448f..f1584f96fa 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -41,13 +41,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -184,26 +206,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} in footnote
 @footnote{in footnote2} in footnote2
@@ -874,13 +876,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -1017,26 +1041,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} in footnote
 @footnote{in footnote2} in footnote2
@@ -1729,13 +1733,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -1872,26 +1898,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} in footnote
 @footnote{in footnote2} in footnote2
@@ -2557,13 +2563,35 @@ kbd: ``simple-double--three---four----''
 @'{@dotless{i}} i' (í)
 @dotless{i} i (ı)
 @dotless{j} j (ȷ)
+@H{a} a''
+@dotaccent{a} a. (ȧ)
+@ringaccent{a} a* (å)
+@tieaccent{a} a[
+@u{a} a( (ă)
+@ubaraccent{a} a_
+@udotaccent{a} .a (ạ)
+@v{a} a< (ǎ)
+@,c c, (ç)
+@,{c} c, (ç)
+@ogonek{a} a; (ą)
+
 @`{@=E} E=`
 @l{} /l
 @,{@'C} C',
-@,c c, (ç)
 @,c@"u c,u" 
 
 
+@H{--a} -a''
+@dotaccent{--a} -a.
+@ringaccent{--a} -a*
+@tieaccent{--a} -a[
+@u{--a} -a(
+@ubaraccent{--a} -a_
+@udotaccent{--a} .-a
+@v{--a} -a<
+@,{--c} -c,
+@ogonek{--a} -a;
+
 @U{0075} 0075
 
 @* 
@@ -2700,26 +2728,6 @@ but , ,
 @verb{:--a:} --a
 @verb{:a  < & @ % " --    b:} a  < & @ % " --    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a''
-@H{--a} -a''
-@dotaccent{a} a. (ȧ)
-@dotaccent{--a} -a.
-@ringaccent{a} a* (å)
-@ringaccent{--a} -a*
-@tieaccent{a} a[
-@tieaccent{--a} -a[
-@u{a} a( (ă)
-@u{--a} -a(
-@ubaraccent{a} a_
-@ubaraccent{--a} -a_
-@udotaccent{a} .a (ạ)
-@udotaccent{--a} .-a
-@v{a} a< (ǎ)
-@v{--a} -a<
-@,{c} c, (ç)
-@,{--c} -c,
-@ogonek{a} a; (ą)
-@ogonek{--a} -a;
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} in footnote
 @footnote{in footnote2} in footnote2
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 660aa933f8..8d29815504 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 40e0d3bb90..d3eba2f93e 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -934,12 +936,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -1075,26 +1099,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
@@ -2019,12 +2023,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -2160,26 +2186,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
@@ -3161,12 +3167,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -3302,26 +3330,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
@@ -4244,12 +4252,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br/>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br/>
@@ -4385,26 +4415,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
@@ -5331,13 +5341,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -5475,26 +5507,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 482f51a5cd..cc1ef951a2 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -51,12 +51,34 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@'@{@@dotless@{i@}@} @'{@dotless{i}} (í)
 @@dotless@{i@} @dotless{i} (ı)
 @@dotless@{j@} @dotless{j} (ȷ)
+@code{@@H@{a@}} @H{a}
+@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
+@code{@@ringaccent@{a@}} @ringaccent{a} (å)
+@code{@@tieaccent@{a@}} @tieaccent{a}
+@code{@@u@{a@}} @u{a} (ă)
+@code{@@ubaraccent@{a@}} @ubaraccent{a}
+@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
+@code{@@v@{a@}} @v{a} (ǎ)
+@@,c @,c (ç)
+@code{@@,@{c@}} @,{c} (ç)
+@code{@@ogonek@{a@}} @ogonek{a} (ą)
+
 @@`@{@@=E@} @`{@=E}
 @@l@{@} @l{}
 @@,@{@@'C@} @,{@'C}
-@@,c @,c (ç)
 @@,c@@&quot;u @,c@&quot;u @*
 
+@code{@@H@{--a@}} @H{--a}
+@code{@@dotaccent@{--a@}} @dotaccent{--a}
+@code{@@ringaccent@{--a@}} @ringaccent{--a}
+@code{@@tieaccent@{--a@}} @tieaccent{--a}
+@code{@@u@{--a@}} @u{--a}
+@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
+@code{@@udotaccent@{--a@}} @udotaccent{--a}
+@code{@@v@{--a@}} @v{--a}
+@code{@@,@{--c@}} @,{--c}
+@code{@@ogonek@{--a@}} @ogonek{--a}
+
 @@U@{0075@} @U{0075}
 
 @@* @*
@@ -193,26 +215,6 @@ but , ,@:
 @code{@@verb@{:--a:@}} @verb{:--a:}
 @code{@@verb@{:a  &lt; &amp; @@ % &quot; --    b:@}} @verb{:a  &lt; &amp; @ % 
&quot; --    b:}
 @code{@@w@{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a@}} @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
-@code{@@H@{a@}} @H{a}
-@code{@@H@{--a@}} @H{--a}
-@code{@@dotaccent@{a@}} @dotaccent{a} (ȧ)
-@code{@@dotaccent@{--a@}} @dotaccent{--a}
-@code{@@ringaccent@{a@}} @ringaccent{a} (å)
-@code{@@ringaccent@{--a@}} @ringaccent{--a}
-@code{@@tieaccent@{a@}} @tieaccent{a}
-@code{@@tieaccent@{--a@}} @tieaccent{--a}
-@code{@@u@{a@}} @u{a} (ă)
-@code{@@u@{--a@}} @u{--a}
-@code{@@ubaraccent@{a@}} @ubaraccent{a}
-@code{@@ubaraccent@{--a@}} @ubaraccent{--a}
-@code{@@udotaccent@{a@}} @udotaccent{a} (ạ)
-@code{@@udotaccent@{--a@}} @udotaccent{--a}
-@code{@@v@{a@}} @v{a} (ǎ)
-@code{@@v@{--a@}} @v{--a}
-@code{@@,@{c@}} @,{c} (ç)
-@code{@@,@{--c@}} @,{--c}
-@code{@@ogonek@{a@}} @ogonek{a} (ą)
-@code{@@ogonek@{--a@}} @ogonek{--a}
 @code{a@@sup@{h@}@@sub@{l@}} a@sup{h}@sub{l}
 @code{@@footnote@{in footnote@}} @footnote{in footnote}
 @code{@@footnote@{in footnote2@}} @footnote{in footnote2}
@@ -1257,12 +1259,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless> (ı)
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless> (ȷ)
-&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent>
+<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
+<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
+<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
+<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
+<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
+<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
+<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
+&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
+<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
+<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
+</para>
+<para>&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent 
type="grave"><accent type="macr" bracketed="off">E</accent></accent>
 &arobase;l&lbrace;&rbrace; &lslash;
 &arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute" bracketed="off">C</accent></accent>
-&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
 &arobase;,c&arobase;&quot;u <accent type="cedil" 
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent> 
&linebreak;
 </para>
+<para><code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
+<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
+<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
+<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
+<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
+<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
+<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
+<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
+<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
+<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
+</para>
 <para>&arobase;U&lbrace;0075&rbrace; <U>0075</U>
 </para>
 <para>&arobase;* &linebreak;
@@ -1398,26 +1422,6 @@ but , ,&noeos;
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
 <code>&arobase;verb&lbrace;:a  &lt; &amp; &arobase; % &quot; --    
b:&rbrace;</code> <verb delimiter=":">a  &lt; &amp; @ % &quot; --    b</verb>
 <code>&arobase;w&lbrace;a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a&rbrace;</code> <w>a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a a a a a</w>
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
-<code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
-<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
-<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
-<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
-<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
-<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
-<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
-<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
-<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
-<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
-<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
-<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
-<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
-<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
-<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
-<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
-<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
-<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
-<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
 <code>a&arobase;sup&lbrace;h&rbrace;&arobase;sub&lbrace;l&rbrace;</code> 
a<sup>h</sup><sub>l</sub>
 <code>&arobase;footnote&lbrace;in footnote&rbrace;</code> <footnote><para>in 
footnote</para></footnote>
 <code>&arobase;footnote&lbrace;in footnote2&rbrace;</code> <footnote><para>in 
footnote2</para></footnote>
@@ -2404,12 +2408,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless> (ı)
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless> (ȷ)
-&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent>
+<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
+<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
+<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
+<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
+<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
+<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
+<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
+&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
+<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
+<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
+</para>
+<para>&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent 
type="grave"><accent type="macr" bracketed="off">E</accent></accent>
 &arobase;l&lbrace;&rbrace; &lslash;
 &arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute" bracketed="off">C</accent></accent>
-&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
 &arobase;,c&arobase;&quot;u <accent type="cedil" 
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent> 
&linebreak;
 </para>
+<para><code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
+<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
+<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
+<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
+<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
+<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
+<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
+<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
+<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
+<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
+</para>
 <para>&arobase;U&lbrace;0075&rbrace; <U>0075</U>
 </para>
 <para>&arobase;* &linebreak;
@@ -2545,26 +2571,6 @@ but , ,&noeos;
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
 <code>&arobase;verb&lbrace;:a  &lt; &amp; &arobase; % &quot; --    
b:&rbrace;</code> <verb delimiter=":">a  &lt; &amp; @ % &quot; --    b</verb>
 <code>&arobase;w&lbrace;a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a&rbrace;</code> <w>a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a a a a a</w>
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
-<code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
-<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
-<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
-<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
-<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
-<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
-<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
-<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
-<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
-<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
-<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
-<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
-<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
-<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
-<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
-<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
-<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
-<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
-<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
 <code>a&arobase;sup&lbrace;h&rbrace;&arobase;sub&lbrace;l&rbrace;</code> 
a<sup>h</sup><sub>l</sub>
 <code>&arobase;footnote&lbrace;in footnote&rbrace;</code> <footnote><para>in 
footnote</para></footnote>
 <code>&arobase;footnote&lbrace;in footnote2&rbrace;</code> <footnote><para>in 
footnote2</para></footnote>
@@ -3581,12 +3587,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless> (ı)
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless> (ȷ)
-&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent>
+<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
+<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
+<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
+<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
+<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
+<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
+<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
+&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
+<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
+<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
+</para>
+<para>&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent 
type="grave"><accent type="macr" bracketed="off">E</accent></accent>
 &arobase;l&lbrace;&rbrace; &lslash;
 &arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute" bracketed="off">C</accent></accent>
-&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
 &arobase;,c&arobase;&quot;u <accent type="cedil" 
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent> 
&linebreak;
 </para>
+<para><code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
+<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
+<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
+<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
+<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
+<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
+<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
+<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
+<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
+<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
+</para>
 <para>&arobase;U&lbrace;0075&rbrace; <U>0075</U>
 </para>
 <para>&arobase;* &linebreak;
@@ -3722,26 +3750,6 @@ but , ,&noeos;
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
 <code>&arobase;verb&lbrace;:a  &lt; &amp; &arobase; % &quot; --    
b:&rbrace;</code> <verb delimiter=":">a  &lt; &amp; @ % &quot; --    b</verb>
 <code>&arobase;w&lbrace;a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a&rbrace;</code> <w>a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a a a a a</w>
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
-<code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">&textndash;a</accent>
-<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
-<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">&textndash;a</accent>
-<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
-<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">&textndash;a</accent>
-<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
-<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">&textndash;a</accent>
-<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
-<code>&arobase;u&lbrace;--a&rbrace;</code> <accent 
type="breve">&textndash;a</accent>
-<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
-<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">&textndash;a</accent>
-<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
-<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">&textndash;a</accent>
-<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
-<code>&arobase;v&lbrace;--a&rbrace;</code> <accent 
type="caron">&textndash;a</accent>
-<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
-<code>&arobase;,&lbrace;--c&rbrace;</code> <accent 
type="cedil">&textndash;c</accent>
-<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
-<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">&textndash;a</accent>
 <code>a&arobase;sup&lbrace;h&rbrace;&arobase;sub&lbrace;l&rbrace;</code> 
a<sup>h</sup><sub>l</sub>
 <code>&arobase;footnote&lbrace;in footnote&rbrace;</code> <footnote><para>in 
footnote</para></footnote>
 <code>&arobase;footnote&lbrace;in footnote2&rbrace;</code> <footnote><para>in 
footnote2</para></footnote>
@@ -4723,12 +4731,34 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;'&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless> (ı)
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless> (ȷ)
+<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
+<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
+<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
+<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
+<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
+<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
+<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
+&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
+<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
+<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
+
 &arobase;`&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &arobase;l&lbrace;&rbrace; &lslash;
 &arobase;,&lbrace;&arobase;'C&rbrace; <accent type="cedil"><accent 
type="acute" bracketed="off">C</accent></accent>
-&arobase;,c <accent type="cedil" bracketed="off">c</accent> (ç)
 &arobase;,c&arobase;&quot;u <accent type="cedil" 
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent> 
&linebreak;
 
+<code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">--a</accent>
+<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">--a</accent>
+<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">--a</accent>
+<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">--a</accent>
+<code>&arobase;u&lbrace;--a&rbrace;</code> <accent type="breve">--a</accent>
+<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">--a</accent>
+<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">--a</accent>
+<code>&arobase;v&lbrace;--a&rbrace;</code> <accent type="caron">--a</accent>
+<code>&arobase;,&lbrace;--c&rbrace;</code> <accent type="cedil">--c</accent>
+<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">--a</accent>
+
 &arobase;U&lbrace;0075&rbrace; <U>0075</U>
 
 &arobase;* &linebreak;
@@ -4864,26 +4894,6 @@ but , ,&noeos;
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
 <code>&arobase;verb&lbrace;:a  &lt; &amp; &arobase; % &quot; --    
b:&rbrace;</code> <verb delimiter=":">a  &lt; &amp; @ % &quot; --    b</verb>
 <code>&arobase;w&lbrace;a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a&rbrace;</code> <w>a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a a a a a a</w>
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
-<code>&arobase;H&lbrace;--a&rbrace;</code> <accent 
type="doubleacute">--a</accent>
-<code>&arobase;dotaccent&lbrace;a&rbrace;</code> <accent 
type="dotaccent">a</accent> (ȧ)
-<code>&arobase;dotaccent&lbrace;--a&rbrace;</code> <accent 
type="dotaccent">--a</accent>
-<code>&arobase;ringaccent&lbrace;a&rbrace;</code> <accent 
type="ring">a</accent> (å)
-<code>&arobase;ringaccent&lbrace;--a&rbrace;</code> <accent 
type="ring">--a</accent>
-<code>&arobase;tieaccent&lbrace;a&rbrace;</code> <accent 
type="tieaccent">a</accent>
-<code>&arobase;tieaccent&lbrace;--a&rbrace;</code> <accent 
type="tieaccent">--a</accent>
-<code>&arobase;u&lbrace;a&rbrace;</code> <accent type="breve">a</accent> (ă)
-<code>&arobase;u&lbrace;--a&rbrace;</code> <accent type="breve">--a</accent>
-<code>&arobase;ubaraccent&lbrace;a&rbrace;</code> <accent 
type="ubaraccent">a</accent>
-<code>&arobase;ubaraccent&lbrace;--a&rbrace;</code> <accent 
type="ubaraccent">--a</accent>
-<code>&arobase;udotaccent&lbrace;a&rbrace;</code> <accent 
type="udotaccent">a</accent> (ạ)
-<code>&arobase;udotaccent&lbrace;--a&rbrace;</code> <accent 
type="udotaccent">--a</accent>
-<code>&arobase;v&lbrace;a&rbrace;</code> <accent type="caron">a</accent> (ǎ)
-<code>&arobase;v&lbrace;--a&rbrace;</code> <accent type="caron">--a</accent>
-<code>&arobase;,&lbrace;c&rbrace;</code> <accent type="cedil">c</accent> (ç)
-<code>&arobase;,&lbrace;--c&rbrace;</code> <accent type="cedil">--c</accent>
-<code>&arobase;ogonek&lbrace;a&rbrace;</code> <accent type="ogon">a</accent> 
(ą)
-<code>&arobase;ogonek&lbrace;--a&rbrace;</code> <accent 
type="ogon">--a</accent>
 <code>a&arobase;sup&lbrace;h&rbrace;&arobase;sub&lbrace;l&rbrace;</code> 
a<sup>h</sup><sub>l</sub>
 <code>&arobase;footnote&lbrace;in footnote&rbrace;</code> <footnote><para>in 
footnote</para></footnote>
 <code>&arobase;footnote&lbrace;in footnote2&rbrace;</code> <footnote><para>in 
footnote2</para></footnote>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html 
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index ade049623d..821c3cf19d 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
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 bcde8dcdae..edebacc19f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
@@ -975,12 +977,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -1121,26 +1145,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="sing_fot.htm#FOOT1"><sup>1</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="sing_fot.htm#FOOT2"><sup>2</sup></a>
@@ -2194,12 +2198,34 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-@&lsquo;{@=E} &#274;&#768;
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+</p>
+<p>@&lsquo;{@=E} &#274;&#768;
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
+<p><code class="code">@H{--a}</code> &ndash;a&#779;
+<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
+<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
+<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
+<code class="code">@u{--a}</code> &ndash;a&#774;
+<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
+<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
+<code class="code">@v{--a}</code> &ndash;a&#780;
+<code class="code">@,{--c}</code> &ndash;c&#807;
+<code class="code">@ogonek{--a}</code> &ndash;a&#808;
+</p>
 <p>@U{0075} &#x0075;
 </p>
 <p>@* <br>
@@ -2340,26 +2366,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> &ndash;a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> &ndash;a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> &ndash;a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> &ndash;&#865;a
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> &ndash;a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> &ndash;a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> &ndash;a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> &ndash;a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> &ndash;c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> &ndash;a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="sing_fot.htm#FOOT5"><sup>3</sup></a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="sing_fot.htm#FOOT6"><sup>4</sup></a>
@@ -3417,13 +3423,35 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
+<code class="code">@H{a}</code> a&#779;
+<code class="code">@dotaccent{a}</code> &#551; (ȧ)
+<code class="code">@ringaccent{a}</code> &aring; (å)
+<code class="code">@tieaccent{a}</code> a&#865;
+<code class="code">@u{a}</code> &#259; (ă)
+<code class="code">@ubaraccent{a}</code> a&#818;
+<code class="code">@udotaccent{a}</code> &#7841; (ạ)
+<code class="code">@v{a}</code> &#462; (ǎ)
+@,c &ccedil; (ç)
+<code class="code">@,{c}</code> &ccedil; (ç)
+<code class="code">@ogonek{a}</code> &#261; (ą)
+
 @`{@=E} &#274;&#768;
 @l{} &#322;
 @,{@'C} &#262;&#807;
-@,c &ccedil; (ç)
 @,c@&quot;u &ccedil;&uuml; 
 
 
+<code class="code">@H{--a}</code> --a&#779;
+<code class="code">@dotaccent{--a}</code> --a&#775;
+<code class="code">@ringaccent{--a}</code> --a&#778;
+<code class="code">@tieaccent{--a}</code> --a&#865;
+<code class="code">@u{--a}</code> --a&#774;
+<code class="code">@ubaraccent{--a}</code> --a&#818;
+<code class="code">@udotaccent{--a}</code> --a&#803;
+<code class="code">@v{--a}</code> --a&#780;
+<code class="code">@,{--c}</code> --c&#807;
+<code class="code">@ogonek{--a}</code> --a&#808;
+
 @U{0075} &#x0075;
 
 @* 
@@ -3566,26 +3594,6 @@ but , ,
 <code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
-<code class="code">@H{a}</code> a&#779;
-<code class="code">@H{--a}</code> --a&#779;
-<code class="code">@dotaccent{a}</code> &#551; (ȧ)
-<code class="code">@dotaccent{--a}</code> --a&#775;
-<code class="code">@ringaccent{a}</code> &aring; (å)
-<code class="code">@ringaccent{--a}</code> --a&#778;
-<code class="code">@tieaccent{a}</code> a&#865;
-<code class="code">@tieaccent{--a}</code> --a&#865;
-<code class="code">@u{a}</code> &#259; (ă)
-<code class="code">@u{--a}</code> --a&#774;
-<code class="code">@ubaraccent{a}</code> a&#818;
-<code class="code">@ubaraccent{--a}</code> --a&#818;
-<code class="code">@udotaccent{a}</code> &#7841; (ạ)
-<code class="code">@udotaccent{--a}</code> --a&#803;
-<code class="code">@v{a}</code> &#462; (ǎ)
-<code class="code">@v{--a}</code> --a&#780;
-<code class="code">@,{c}</code> &ccedil; (ç)
-<code class="code">@,{--c}</code> --c&#807;
-<code class="code">@ogonek{a}</code> &#261; (ą)
-<code class="code">@ogonek{--a}</code> --a&#808;
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 <code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="sing_fot.htm#FOOT7">(5)</a>
 <code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="sing_fot.htm#FOOT8">(6)</a>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index 0d92df29db..8639d8eec8 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index bb86bc1837..e25dc93cbb 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html 
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index 09baa67819..d86419a170 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -39,13 +39,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -182,26 +204,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 23220eaa34..bc6209e500 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 57cbfcf376..3756c9d624 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 8776face03..9e7f89b37a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index 0e98cde295..75464a24e2 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index a7cd41d865..46c84a5c87 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html 
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 0fb690e282..97b18ea250 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 3e8ba4b6a1..b7e6072e57 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index f9c95233ca..2d06c97e58 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -38,13 +38,35 @@ kbd: ``simple-double-three-four-''
 @'{@dotless{i}} í (í)
 @dotless{i} ı (ı)
 @dotless{j} ȷ (ȷ)
+@H{a} a̋
+@dotaccent{a} ȧ (ȧ)
+@ringaccent{a} å (å)
+@tieaccent{a} a͡
+@u{a} ă (ă)
+@ubaraccent{a} a̲
+@udotaccent{a} ạ (ạ)
+@v{a} ǎ (ǎ)
+@,c ç (ç)
+@,{c} ç (ç)
+@ogonek{a} ą (ą)
+
 @`{@=E} Ḕ
 @l{} ł
 @,{@'C} Ḉ
-@,c ç (ç)
 @,c@"u çü 
 
 
+@H{-a} -a̋
+@dotaccent{-a} -ȧ
+@ringaccent{-a} -å
+@tieaccent{-a} -a͡
+@u{-a} -ă
+@ubaraccent{-a} -a̲
+@udotaccent{-a} -ạ
+@v{-a} -ǎ
+@,{-c} -ç
+@ogonek{-a} -ą
+
 @U{0075} 0075
 
 @* 
@@ -181,26 +203,6 @@ but , ,
 @verb{:-a:} -a
 @verb{:a  < & @ % " -    b:} a  < & @ % " -    b
 @w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-@H{a} a̋
-@H{-a} -a̋
-@dotaccent{a} ȧ (ȧ)
-@dotaccent{-a} -ȧ
-@ringaccent{a} å (å)
-@ringaccent{-a} -å
-@tieaccent{a} a͡
-@tieaccent{-a} -a͡
-@u{a} ă (ă)
-@u{-a} -ă
-@ubaraccent{a} a̲
-@ubaraccent{-a} -a̲
-@udotaccent{a} ạ (ạ)
-@udotaccent{-a} -ạ
-@v{a} ǎ (ǎ)
-@v{-a} -ǎ
-@,{c} ç (ç)
-@,{-c} -ç
-@ogonek{a} ą (ą)
-@ogonek{-a} -ą
 a@sup{h}@sub{l} ahl
 @footnote{in footnote} 
 @footnote{in footnote2} 



reply via email to

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