[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/tests/coverage_macro.texi: Insert blank line
From: |
Gavin D. Smith |
Subject: |
branch master updated: * tp/tests/coverage_macro.texi: Insert blank lines in block of accent commands to avoid divergent test results on MinGW, due to varying wcwidth values. Report from Eli. |
Date: |
Thu, 12 Oct 2023 11:56:19 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new b0f7be32ad * tp/tests/coverage_macro.texi: Insert blank lines in block
of accent commands to avoid divergent test results on MinGW, due to varying
wcwidth values. Report from Eli.
b0f7be32ad is described below
commit b0f7be32addd1b777d3688e90fd804e61659f2d3
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 12 16:56:06 2023 +0100
* tp/tests/coverage_macro.texi: Insert blank lines in block
of accent commands to avoid divergent test results on MinGW,
due to varying wcwidth values. Report from Eli.
---
ChangeLog | 6 +
.../coverage/res_parser/formatting_chm/anchor.html | 9 +
.../res_parser/formatting_chm/chapter.html | 68 +-
.../res_parser/formatting_chm/chapter2.html | 9 +
.../res_parser/formatting_chm/formatting.html | 59 +-
.../res_parser/formatting_chm/formatting_ovr.html | 9 +
.../res_parser/formatting_chm/formatting_toc.html | 9 +
.../coverage/res_parser/formatting_chm/index.html | 9 +
.../formatting_chm/s_002d_002dect_002cion.html | 9 +
.../res_parser/formatting_chm/subsection.html | 9 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 9 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 9 +
.../res_parser/formatting_docbook/formatting.xml | 84 +-
.../EPUB/xhtml/chapter.xhtml | 68 +-
.../EPUB/xhtml/chapter2.xhtml | 9 +
.../EPUB/xhtml/formatting.xhtml | 59 +-
.../res_parser/formatting_html32/formatting.html | 118 +-
.../formatting_html_no_split/formatting.html | 68 +-
.../res_parser/formatting_info/formatting.info | 1190 +++++++++----------
.../res_parser/formatting_latex/formatting.tex | 45 +
.../formatting_macro_expand/formatting.texi | 45 +
.../res_parser/formatting_plaintext/formatting.txt | 1133 ++++++++++---------
.../res_parser/formatting_rawtext/formatting.txt | 18 +
.../formatting_regions/formatting_regions.html | 118 +-
.../res_parser/formatting_textcontent/formatting | 36 +
.../res_parser/formatting_xhtml/formatting.html | 118 +-
.../res_parser/formatting_xml/formatting.xml | 93 +-
tp/tests/coverage_macro.texi | 9 +
.../formatting_enable_encoding/formatting.html | 118 +-
.../EPUB/xhtml/chapter.xhtml | 68 +-
.../EPUB/xhtml/chapter2.xhtml | 9 +
.../EPUB/xhtml/formatting.xhtml | 59 +-
.../EPUB/xhtml/formatting_fot.xhtml | 9 +
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 9 +
.../EPUB/xhtml/subsection.xhtml | 9 +
...ion-_0060_0060simple_002ddouble_002d_002d.xhtml | 9 +
...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 9 +
.../res_parser/formatting_exotic/anchor.html | 9 +
.../res_parser/formatting_exotic/chapter.html | 68 +-
.../res_parser/formatting_exotic/chapter2.html | 9 +
.../formatting_exotic/formatting_abt.html | 9 +
.../formatting_exotic/formatting_ovr.html | 9 +
.../formatting_exotic/formatting_toc.html | 9 +
.../layout/res_parser/formatting_exotic/index.html | 9 +
.../formatting_exotic/s_002d_002dect_002cion.html | 9 +
.../res_parser/formatting_exotic/subsection.html | 9 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 9 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 9 +
.../res_parser/formatting_fr/formatting.html | 118 +-
.../res_parser/formatting_fr_icons/formatting.html | 118 +-
.../res_parser/formatting_fr_info/formatting.info | 1190 +++++++++----------
.../formatting.info | 1190 +++++++++----------
.../formatting.info | 1193 ++++++++++----------
.../formatting_inline_css/formatting.html | 118 +-
.../res_parser/formatting_mathjax/formatting.html | 118 +-
.../formatting_numerical_entities/formatting.html | 118 +-
.../formatting.txt | 1133 ++++++++++---------
.../formatting_sort_element_counts/formatting.html | 68 +-
.../formatting_elt_counts.txt | 4 +-
.../formatting_texi2html/formatting.html | 118 +-
.../formatting_texi2html_nodes/anchor.html | 9 +
.../formatting_texi2html_nodes/chapter.html | 68 +-
.../formatting_texi2html_nodes/chapter2.html | 9 +
.../formatting_texi2html_nodes/formatting_abt.html | 9 +
.../formatting_texi2html_nodes/formatting_fot.html | 9 +
.../formatting_texi2html_nodes/formatting_ovr.html | 9 +
.../formatting_texi2html_nodes/formatting_toc.html | 9 +
.../formatting_texi2html_nodes/index.html | 59 +-
.../s_002d_002dect_002cion.html | 9 +
.../formatting_texi2html_nodes/subsection.html | 9 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 9 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 9 +
.../formatting_weird_quotes/formatting.html | 118 +-
73 files changed, 5724 insertions(+), 3979 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3adf7f1450..18c067ba48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/coverage_macro.texi: Insert blank lines in block
+ of accent commands to avoid divergent test results on MinGW,
+ due to varying wcwidth values. Report from Eli.
+
2023-10-08 Eli Zaretskii <eliz@gnu.org>
* install-info/install-info.c (readfile):
diff --git a/tp/tests/coverage/res_parser/formatting_chm/anchor.html
b/tp/tests/coverage/res_parser/formatting_chm/anchor.html
index 7c28287c16..59f92ebc2a 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/anchor.html
@@ -32,21 +32,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -60,9 +66,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -233,6 +241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/chapter.html
b/tp/tests/coverage/res_parser/formatting_chm/chapter.html
index 86b2030d24..08669e05f4 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/chapter.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -936,22 +945,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -963,10 +978,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -1132,6 +1149,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
@@ -2027,22 +2045,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -2054,10 +2078,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -2223,6 +2249,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
@@ -3122,21 +3149,27 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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> ą (ą)
@@ -3150,9 +3183,11 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<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> --ç
@@ -3327,6 +3362,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</pre><div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/chapter2.html
b/tp/tests/coverage/res_parser/formatting_chm/chapter2.html
index 29724011a7..afb0b5cece 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/chapter2.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/formatting.html
b/tp/tests/coverage/res_parser/formatting_chm/formatting.html
index 289f0bf549..108cf2409a 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/formatting.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -919,22 +928,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -946,10 +961,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -1115,6 +1132,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
@@ -2012,22 +2030,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -2039,10 +2063,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -2208,6 +2234,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
b/tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
index c67264f938..58c4a94e08 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
b/tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
index c0e91e01e8..db57efac44 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/index.html
b/tp/tests/coverage/res_parser/formatting_chm/index.html
index b9641b655d..d3ca682520 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/index.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/index.html
@@ -32,21 +32,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -60,9 +66,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -233,6 +241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
b/tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 7028cc5b7c..8efce259cd 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_chm/subsection.html
b/tp/tests/coverage/res_parser/formatting_chm/subsection.html
index e2097fe141..9bb61a91db 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/subsection.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index cc748bb9d8..494eff5af8 100644
---
a/tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index e0240b2283..339381e9a6 100644
---
a/tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
b/tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
index b87e9d5783..ea68ad3511 100644
--- a/tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
@@ -48,22 +48,28 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</para>
+<para>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</para>
+<para>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<literal>@H{a}</literal> a̋
+</para>
+<para><literal>@H{a}</literal> a̋
<literal>@dotaccent{a}</literal> ȧ (ȧ)
<literal>@ringaccent{a}</literal> å (å)
-<literal>@tieaccent{a}</literal> a͡
+</para>
+<para><literal>@tieaccent{a}</literal> a͡
<literal>@u{a}</literal> ă (ă)
<literal>@ubaraccent{a}</literal> a̲
-<literal>@udotaccent{a}</literal> ạ (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> ạ (ạ)
<literal>@v{a}</literal> ǎ (ǎ)
-@,c ç (ç)
+</para>
+<para>@,c ç (ç)
<literal>@,{c}</literal> ç (ç)
<literal>@ogonek{a}</literal> ą (ą)
</para>
@@ -76,10 +82,12 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<para><literal>@H{--a}</literal> –a̋
<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{--a}</literal> –å
-<literal>@tieaccent{--a}</literal> –a͡
+</para>
+<para><literal>@tieaccent{--a}</literal> –a͡
<literal>@u{--a}</literal> –ă
<literal>@ubaraccent{--a}</literal> –a̲
-<literal>@udotaccent{--a}</literal> –ạ
+</para>
+<para><literal>@udotaccent{--a}</literal> –ạ
<literal>@v{--a}</literal> –ǎ
<literal>@,{--c}</literal> –ç
<literal>@ogonek{--a}</literal> –ą
@@ -250,6 +258,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over
2}\left({x-\mu \over
</mathphrase></informalequation>
<informalequation><mathphrase>ı ȷ
ł ç
+
a̲ ạ ą a<superscript>h</superscript><subscript>l</subscript>
     ! @ } {
@@ -977,22 +986,28 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</para>
+<para>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</para>
+<para>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<literal>@H{a}</literal> a̋
+</para>
+<para><literal>@H{a}</literal> a̋
<literal>@dotaccent{a}</literal> ȧ (ȧ)
<literal>@ringaccent{a}</literal> å (å)
-<literal>@tieaccent{a}</literal> a͡
+</para>
+<para><literal>@tieaccent{a}</literal> a͡
<literal>@u{a}</literal> ă (ă)
<literal>@ubaraccent{a}</literal> a̲
-<literal>@udotaccent{a}</literal> ạ (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> ạ (ạ)
<literal>@v{a}</literal> ǎ (ǎ)
-@,c ç (ç)
+</para>
+<para>@,c ç (ç)
<literal>@,{c}</literal> ç (ç)
<literal>@ogonek{a}</literal> ą (ą)
</para>
@@ -1005,10 +1020,12 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<para><literal>@H{--a}</literal> –a̋
<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{--a}</literal> –å
-<literal>@tieaccent{--a}</literal> –a͡
+</para>
+<para><literal>@tieaccent{--a}</literal> –a͡
<literal>@u{--a}</literal> –ă
<literal>@ubaraccent{--a}</literal> –a̲
-<literal>@udotaccent{--a}</literal> –ạ
+</para>
+<para><literal>@udotaccent{--a}</literal> –ạ
<literal>@v{--a}</literal> –ǎ
<literal>@,{--c}</literal> –ç
<literal>@ogonek{--a}</literal> –ą
@@ -1179,6 +1196,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
</mathphrase></informalequation>
<informalequation><mathphrase>ı ȷ
ł ç
+
a̲ ạ ą a<superscript>h</superscript><subscript>l</subscript>
     ! @ } {
@@ -1893,22 +1911,28 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</para>
+<para>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</para>
+<para>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<literal>@H{a}</literal> a̋
+</para>
+<para><literal>@H{a}</literal> a̋
<literal>@dotaccent{a}</literal> ȧ (ȧ)
<literal>@ringaccent{a}</literal> å (å)
-<literal>@tieaccent{a}</literal> a͡
+</para>
+<para><literal>@tieaccent{a}</literal> a͡
<literal>@u{a}</literal> ă (ă)
<literal>@ubaraccent{a}</literal> a̲
-<literal>@udotaccent{a}</literal> ạ (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> ạ (ạ)
<literal>@v{a}</literal> ǎ (ǎ)
-@,c ç (ç)
+</para>
+<para>@,c ç (ç)
<literal>@,{c}</literal> ç (ç)
<literal>@ogonek{a}</literal> ą (ą)
</para>
@@ -1921,10 +1945,12 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<para><literal>@H{--a}</literal> –a̋
<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{--a}</literal> –å
-<literal>@tieaccent{--a}</literal> –a͡
+</para>
+<para><literal>@tieaccent{--a}</literal> –a͡
<literal>@u{--a}</literal> –ă
<literal>@ubaraccent{--a}</literal> –a̲
-<literal>@udotaccent{--a}</literal> –ạ
+</para>
+<para><literal>@udotaccent{--a}</literal> –ạ
<literal>@v{--a}</literal> –ǎ
<literal>@,{--c}</literal> –ç
<literal>@ogonek{--a}</literal> –ą
@@ -2095,6 +2121,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
</mathphrase></informalequation>
<informalequation><mathphrase>ı ȷ
ł ç
+
a̲ ạ ą a<superscript>h</superscript><subscript>l</subscript>
     ! @ } {
@@ -2805,21 +2832,27 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
+
<literal>@H{a}</literal> a̋
<literal>@dotaccent{a}</literal> ȧ (ȧ)
<literal>@ringaccent{a}</literal> å (å)
+
<literal>@tieaccent{a}</literal> a͡
<literal>@u{a}</literal> ă (ă)
<literal>@ubaraccent{a}</literal> a̲
+
<literal>@udotaccent{a}</literal> ạ (ạ)
<literal>@v{a}</literal> ǎ (ǎ)
+
@,c ç (ç)
<literal>@,{c}</literal> ç (ç)
<literal>@ogonek{a}</literal> ą (ą)
@@ -2833,9 +2866,11 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<literal>@H{--a}</literal> --a̋
<literal>@dotaccent{--a}</literal> --ȧ
<literal>@ringaccent{--a}</literal> --å
+
<literal>@tieaccent{--a}</literal> --a͡
<literal>@u{--a}</literal> --ă
<literal>@ubaraccent{--a}</literal> --a̲
+
<literal>@udotaccent{--a}</literal> --ạ
<literal>@v{--a}</literal> --ǎ
<literal>@,{--c}</literal> --ç
@@ -3007,6 +3042,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1
\over 2}\left({x-\mu \over
</mathphrase></informalequation><screen>
</screen><informalequation><mathphrase>ı ȷ
ł ç
+
a̲ ạ ą a<superscript>h</superscript><subscript>l</subscript>
     ! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 9af3159111..ab119c3ba0 100644
---
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -32,21 +32,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -60,9 +66,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -233,6 +241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -936,22 +945,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -963,10 +978,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<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͡
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -1132,6 +1149,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
     ! @ } {
@@ -2027,22 +2045,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -2054,10 +2078,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<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͡
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -2223,6 +2249,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
     ! @ } {
@@ -3122,21 +3149,27 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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> ą (ą)
@@ -3150,9 +3183,11 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<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> --ç
@@ -3327,6 +3362,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</pre><div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
     ! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index c71f83fa17..b5a2630ea3 100644
---
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -32,21 +32,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -60,9 +66,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -233,6 +241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index d330e2ed14..54bec7e4ab 100644
---
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -32,21 +32,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -60,9 +66,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -233,6 +241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -919,22 +928,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -946,10 +961,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<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͡
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -1115,6 +1132,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
     ! @ } {
@@ -2012,22 +2030,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -2039,10 +2063,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<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͡
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -2208,6 +2234,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
     ! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
index 8453d6e792..fdbc208c42 100644
--- a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -898,22 +907,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@'e é (é)
+</p>
+<p>@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
-@'{@dotless{i}} í (í)
+</p>
+<p>@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code>@H{a}</code> a̋
+</p>
+<p><code>@H{a}</code> a̋
<code>@dotaccent{a}</code> ȧ (ȧ)
<code>@ringaccent{a}</code> å (å)
-<code>@tieaccent{a}</code> a͡
+</p>
+<p><code>@tieaccent{a}</code> a͡
<code>@u{a}</code> ă (ă)
<code>@ubaraccent{a}</code> a̲
-<code>@udotaccent{a}</code> ạ (ạ)
+</p>
+<p><code>@udotaccent{a}</code> ạ (ạ)
<code>@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code>@,{c}</code> ç (ç)
<code>@ogonek{a}</code> ą (ą)
</p>
@@ -925,10 +940,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<p><code>@H{--a}</code> -a̋
<code>@dotaccent{--a}</code> -ȧ
<code>@ringaccent{--a}</code> -å
-<code>@tieaccent{--a}</code> -a͡
+</p>
+<p><code>@tieaccent{--a}</code> -a͡
<code>@u{--a}</code> -ă
<code>@ubaraccent{--a}</code> -a̲
-<code>@udotaccent{--a}</code> -ạ
+</p>
+<p><code>@udotaccent{--a}</code> -ạ
<code>@v{--a}</code> -ǎ
<code>@,{--c}</code> -ç
<code>@ogonek{--a}</code> -ą
@@ -1094,6 +1111,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</em></div>
<div><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup>h</sup><sub>l</sub>
! @ } {
@@ -1965,22 +1983,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@'e é (é)
+</p>
+<p>@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
-@'{@dotless{i}} í (í)
+</p>
+<p>@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code>@H{a}</code> a̋
+</p>
+<p><code>@H{a}</code> a̋
<code>@dotaccent{a}</code> ȧ (ȧ)
<code>@ringaccent{a}</code> å (å)
-<code>@tieaccent{a}</code> a͡
+</p>
+<p><code>@tieaccent{a}</code> a͡
<code>@u{a}</code> ă (ă)
<code>@ubaraccent{a}</code> a̲
-<code>@udotaccent{a}</code> ạ (ạ)
+</p>
+<p><code>@udotaccent{a}</code> ạ (ạ)
<code>@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code>@,{c}</code> ç (ç)
<code>@ogonek{a}</code> ą (ą)
</p>
@@ -1992,10 +2016,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<p><code>@H{--a}</code> -a̋
<code>@dotaccent{--a}</code> -ȧ
<code>@ringaccent{--a}</code> -å
-<code>@tieaccent{--a}</code> -a͡
+</p>
+<p><code>@tieaccent{--a}</code> -a͡
<code>@u{--a}</code> -ă
<code>@ubaraccent{--a}</code> -a̲
-<code>@udotaccent{--a}</code> -ạ
+</p>
+<p><code>@udotaccent{--a}</code> -ạ
<code>@v{--a}</code> -ǎ
<code>@,{--c}</code> -ç
<code>@ogonek{--a}</code> -ą
@@ -2161,6 +2187,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</em></div>
<div><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup>h</sup><sub>l</sub>
! @ } {
@@ -3100,22 +3127,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@'e é (é)
+</p>
+<p>@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
-@'{@dotless{i}} í (í)
+</p>
+<p>@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code>@H{a}</code> a̋
+</p>
+<p><code>@H{a}</code> a̋
<code>@dotaccent{a}</code> ȧ (ȧ)
<code>@ringaccent{a}</code> å (å)
-<code>@tieaccent{a}</code> a͡
+</p>
+<p><code>@tieaccent{a}</code> a͡
<code>@u{a}</code> ă (ă)
<code>@ubaraccent{a}</code> a̲
-<code>@udotaccent{a}</code> ạ (ạ)
+</p>
+<p><code>@udotaccent{a}</code> ạ (ạ)
<code>@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code>@,{c}</code> ç (ç)
<code>@ogonek{a}</code> ą (ą)
</p>
@@ -3127,10 +3160,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<p><code>@H{--a}</code> -a̋
<code>@dotaccent{--a}</code> -ȧ
<code>@ringaccent{--a}</code> -å
-<code>@tieaccent{--a}</code> -a͡
+</p>
+<p><code>@tieaccent{--a}</code> -a͡
<code>@u{--a}</code> -ă
<code>@ubaraccent{--a}</code> -a̲
-<code>@udotaccent{--a}</code> -ạ
+</p>
+<p><code>@udotaccent{--a}</code> -ạ
<code>@v{--a}</code> -ǎ
<code>@,{--c}</code> -ç
<code>@ogonek{--a}</code> -ą
@@ -3296,6 +3331,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</em></div>
<div><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup>h</sup><sub>l</sub>
! @ } {
@@ -4165,22 +4201,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@'e é (é)
+</p>
+<p>@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
-@'{@dotless{i}} í (í)
+</p>
+<p>@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code>@H{a}</code> a̋
+</p>
+<p><code>@H{a}</code> a̋
<code>@dotaccent{a}</code> ȧ (ȧ)
<code>@ringaccent{a}</code> å (å)
-<code>@tieaccent{a}</code> a͡
+</p>
+<p><code>@tieaccent{a}</code> a͡
<code>@u{a}</code> ă (ă)
<code>@ubaraccent{a}</code> a̲
-<code>@udotaccent{a}</code> ạ (ạ)
+</p>
+<p><code>@udotaccent{a}</code> ạ (ạ)
<code>@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code>@,{c}</code> ç (ç)
<code>@ogonek{a}</code> ą (ą)
</p>
@@ -4192,10 +4234,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<p><code>@H{--a}</code> -a̋
<code>@dotaccent{--a}</code> -ȧ
<code>@ringaccent{--a}</code> -å
-<code>@tieaccent{--a}</code> -a͡
+</p>
+<p><code>@tieaccent{--a}</code> -a͡
<code>@u{--a}</code> -ă
<code>@ubaraccent{--a}</code> -a̲
-<code>@udotaccent{--a}</code> -ạ
+</p>
+<p><code>@udotaccent{--a}</code> -ạ
<code>@v{--a}</code> -ǎ
<code>@,{--c}</code> -ç
<code>@ogonek{--a}</code> -ą
@@ -4361,6 +4405,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</em></div>
<div><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup>h</sup><sub>l</sub>
! @ } {
@@ -5233,21 +5278,27 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
+
<code>@H{a}</code> a̋
<code>@dotaccent{a}</code> ȧ (ȧ)
<code>@ringaccent{a}</code> å (å)
+
<code>@tieaccent{a}</code> a͡
<code>@u{a}</code> ă (ă)
<code>@ubaraccent{a}</code> a̲
+
<code>@udotaccent{a}</code> ạ (ạ)
<code>@v{a}</code> ǎ (ǎ)
+
@,c ç (ç)
<code>@,{c}</code> ç (ç)
<code>@ogonek{a}</code> ą (ą)
@@ -5261,9 +5312,11 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
<code>@H{--a}</code> --a̋
<code>@dotaccent{--a}</code> --ȧ
<code>@ringaccent{--a}</code> --å
+
<code>@tieaccent{--a}</code> --a͡
<code>@u{--a}</code> --ă
<code>@ubaraccent{--a}</code> --a̲
+
<code>@udotaccent{--a}</code> --ạ
<code>@v{--a}</code> --ǎ
<code>@,{--c}</code> --ç
@@ -5438,6 +5491,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</pre><div><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup>h</sup><sub>l</sub>
! @ } {
diff --git
a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
index 80499c5619..0f8dd0cada 100644
--- a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
@@ -31,21 +31,27 @@ kbd: ``simple-double-three-four-''
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -59,9 +65,11 @@ kbd: ``simple-double-three-four-''
@H{-a} -a̋
@dotaccent{-a} -ȧ
@ringaccent{-a} -å
+
@tieaccent{-a} -a͡
@u{-a} -ă
@ubaraccent{-a} -a̲
+
@udotaccent{-a} -ạ
@v{-a} -ǎ
@,{-c} -ç
@@ -232,6 +240,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over
2}\left({x-\mu \over \sigma}\right
ı ȷ
ł ç
+
a̲ ạ ą ahl
! @ } {
@@ -989,22 +998,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -1016,10 +1031,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -1185,6 +1202,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
@@ -2080,22 +2098,28 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
-@’e é (é)
+</p>
+<p>@’e é (é)
@=o ō (ō)
@‘i ì (ì)
@’{e} é (é)
-@’{@dotless{i}} í (í)
+</p>
+<p>@’{@dotless{i}} í (í)
@dotless{i} ı (ı)
@dotless{j} ȷ (ȷ)
-<code class="code">@H{a}</code> a̋
+</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͡
+</p>
+<p><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> ạ (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> ạ (ạ)
<code class="code">@v{a}</code> ǎ (ǎ)
-@,c ç (ç)
+</p>
+<p>@,c ç (ç)
<code class="code">@,{c}</code> ç (ç)
<code class="code">@ogonek{a}</code> ą (ą)
</p>
@@ -2107,10 +2131,12 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<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
+</p>
+<p><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> –ạ
+</p>
+<p><code class="code">@udotaccent{--a}</code> –ạ
<code class="code">@v{--a}</code> –ǎ
<code class="code">@,{--c}</code> –ç
<code class="code">@ogonek{--a}</code> –ą
@@ -2276,6 +2302,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</em></div>
<div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
@@ -3175,21 +3202,27 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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> ą (ą)
@@ -3203,9 +3236,11 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<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> --ç
@@ -3380,6 +3415,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
</pre><div class="displaymath"><em>ı ȷ
ł ç
+
a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
! @ } {
diff --git a/tp/tests/coverage/res_parser/formatting_info/formatting.info
b/tp/tests/coverage/res_parser/formatting_info/formatting.info
index 7fc8e835fd..11f19184c3 100644
--- a/tp/tests/coverage/res_parser/formatting_info/formatting.info
+++ b/tp/tests/coverage/res_parser/formatting_info/formatting.info
@@ -13,17 +13,27 @@ kbd: ‘``simple-double--three---four----''’
''simple-double--three--four---''
- @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
-(ì) @'{e} é (é) @'{@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}’ ą (ą)
+ @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â)
+
+ @'e é (é) @=o ō (ō) @'i ì (ì) @'{e} é (é)
+
+ @'{@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@"u çü
‘@H{--a}’ -a̋ ‘@dotaccent{--a}’ -ȧ ‘@ringaccent{--a}’ -å
-‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
-‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
+
+ ‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
+
+ ‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
@U{0075} u
@@ -96,6 +106,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\rig
ı ȷ
ł ç
+
a̲ ạ ą a^{h}_{l}
! @ } {
@@ -737,17 +748,27 @@ kbd: ‘``simple-double--three---four----''’
''simple-double--three--four---''
- @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
-(ì) @'{e} é (é) @'{@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}’ ą (ą)
+ @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â)
+
+ @'e é (é) @=o ō (ō) @'i ì (ì) @'{e} é (é)
+
+ @'{@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@"u çü
‘@H{--a}’ -a̋ ‘@dotaccent{--a}’ -ȧ ‘@ringaccent{--a}’ -å
-‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
-‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
+
+ ‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
+
+ ‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
@U{0075} u
@@ -820,6 +841,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\rig
ı ȷ
ł ç
+
a̲ ạ ą a^{h}_{l}
! @ } {
@@ -1418,17 +1440,27 @@ kbd: ‘``simple-double--three---four----''’
''simple-double--three--four---''
- @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â) @'e é (é) @=o ō (ō) @'i ì
-(ì) @'{e} é (é) @'{@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}’ ą (ą)
+ @"u ü (ü) @"{U} Ü (Ü) @~n ñ (ñ) @^a â (â)
+
+ @'e é (é) @=o ō (ō) @'i ì (ì) @'{e} é (é)
+
+ @'{@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@"u çü
‘@H{--a}’ -a̋ ‘@dotaccent{--a}’ -ȧ ‘@ringaccent{--a}’ -å
-‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
-‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
+
+ ‘@tieaccent{--a}’ -a͡ ‘@u{--a}’ -ă ‘@ubaraccent{--a}’ -a̲
+
+ ‘@udotaccent{--a}’ -ạ ‘@v{--a}’ -ǎ ‘@,{--c}’ -ç ‘@ogonek{--a}’ -ą
@U{0075} u
@@ -1501,6 +1533,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\rig
ı ȷ
ł ç
+
a̲ ạ ą a^{h}_{l}
! @ } {
@@ -2115,21 +2148,27 @@ cross ref name: (file name). ‘@inforef{}’ *note ::
@"{U} Ü (Ü)
@~n ñ (ñ)
@^a â (â)
+
@'e é (é)
@=o ō (ō)
@`i ì (ì)
@'{e} é (é)
+
@'{@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} ą (ą)
@@ -2143,9 +2182,11 @@ cross ref name: (file name). ‘@inforef{}’ *note ::
@H{--a} -a̋
@dotaccent{--a} -ȧ
@ringaccent{--a} -å
+
@tieaccent{--a} -a͡
@u{--a} -ă
@ubaraccent{--a} -a̲
+
@udotaccent{--a} -ạ
@v{--a} -ǎ
@,{--c} -ç
@@ -2317,6 +2358,7 @@ cross ref name: (file name). ‘@inforef{}’ *note ::
ı ȷ
ł ç
+
a̲ ạ ą a^{h}_{l}
! @ } {
@@ -2952,14 +2994,14 @@ aaa"