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: 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>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -963,10 +978,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2027,22 +2045,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2054,10 +2078,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3122,21 +3149,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -3150,9 +3183,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -946,10 +961,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2012,22 +2030,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2039,10 +2063,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</para>
+<para>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</para>
+<para>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<literal>@H{a}</literal> a&#779;
+</para>
+<para><literal>@H{a}</literal> a&#779;
 <literal>@dotaccent{a}</literal> &#551; (ȧ)
 <literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@tieaccent{a}</literal> a&#865;
+</para>
+<para><literal>@tieaccent{a}</literal> a&#865;
 <literal>@u{a}</literal> &#259; (ă)
 <literal>@ubaraccent{a}</literal> a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> &#7841; (ạ)
 <literal>@v{a}</literal> &#462; (ǎ)
-@,c &#231; (ç)
+</para>
+<para>@,c &#231; (ç)
 <literal>@,{c}</literal> &#231; (ç)
 <literal>@ogonek{a}</literal> &#261; (ą)
 </para>
@@ -76,10 +82,12 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 <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;
+</para>
+<para><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;
+</para>
+<para><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -977,22 +986,28 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</para>
+<para>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</para>
+<para>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<literal>@H{a}</literal> a&#779;
+</para>
+<para><literal>@H{a}</literal> a&#779;
 <literal>@dotaccent{a}</literal> &#551; (ȧ)
 <literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@tieaccent{a}</literal> a&#865;
+</para>
+<para><literal>@tieaccent{a}</literal> a&#865;
 <literal>@u{a}</literal> &#259; (ă)
 <literal>@ubaraccent{a}</literal> a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> &#7841; (ạ)
 <literal>@v{a}</literal> &#462; (ǎ)
-@,c &#231; (ç)
+</para>
+<para>@,c &#231; (ç)
 <literal>@,{c}</literal> &#231; (ç)
 <literal>@ogonek{a}</literal> &#261; (ą)
 </para>
@@ -1005,10 +1020,12 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 <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;
+</para>
+<para><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;
+</para>
+<para><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -1893,22 +1911,28 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</para>
+<para>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</para>
+<para>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<literal>@H{a}</literal> a&#779;
+</para>
+<para><literal>@H{a}</literal> a&#779;
 <literal>@dotaccent{a}</literal> &#551; (ȧ)
 <literal>@ringaccent{a}</literal> &#229; (å)
-<literal>@tieaccent{a}</literal> a&#865;
+</para>
+<para><literal>@tieaccent{a}</literal> a&#865;
 <literal>@u{a}</literal> &#259; (ă)
 <literal>@ubaraccent{a}</literal> a&#818;
-<literal>@udotaccent{a}</literal> &#7841; (ạ)
+</para>
+<para><literal>@udotaccent{a}</literal> &#7841; (ạ)
 <literal>@v{a}</literal> &#462; (ǎ)
-@,c &#231; (ç)
+</para>
+<para>@,c &#231; (ç)
 <literal>@,{c}</literal> &#231; (ç)
 <literal>@ogonek{a}</literal> &#261; (ą)
 </para>
@@ -1921,10 +1945,12 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 <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;
+</para>
+<para><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;
+</para>
+<para><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2805,21 +2832,27 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
+
 @'e &#233; (é)
 @=o &#333; (ō)
 @`i &#236; (ì)
 @'{e} &#233; (é)
+
 @'{@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; (ą)
@@ -2833,9 +2866,11 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 <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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
  &#160;&#160; &#160;  ! @ } { 
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/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -963,10 +978,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2027,22 +2045,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2054,10 +2078,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -3122,21 +3149,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
+
 @'e &#233; (é)
 @=o &#333; (ō)
 @`i &#236; (ì)
 @'{e} &#233; (é)
+
 @'{@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; (ą)
@@ -3150,9 +3183,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
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/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -946,10 +961,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2012,22 +2030,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2039,10 +2063,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
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>
 @&#34;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@'e &eacute; (é)
+</p>
+<p>@'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
-@'{@dotless{i}} &iacute; (í)
+</p>
+<p>@'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code>@H{a}</code> a&#779;
+</p>
+<p><code>@H{a}</code> a&#779;
 <code>@dotaccent{a}</code> &#551; (ȧ)
 <code>@ringaccent{a}</code> &aring; (å)
-<code>@tieaccent{a}</code> a&#865;
+</p>
+<p><code>@tieaccent{a}</code> a&#865;
 <code>@u{a}</code> &#259; (ă)
 <code>@ubaraccent{a}</code> a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
+</p>
+<p><code>@udotaccent{a}</code> &#7841; (ạ)
 <code>@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code>@,{c}</code> &ccedil; (ç)
 <code>@ogonek{a}</code> &#261; (ą)
 </p>
@@ -925,10 +940,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><code>@tieaccent{--a}</code> -a&#865;
 <code>@u{--a}</code> -a&#774;
 <code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{--a}</code> -a&#803;
+</p>
+<p><code>@udotaccent{--a}</code> -a&#803;
 <code>@v{--a}</code> -a&#780;
 <code>@,{--c}</code> -c&#807;
 <code>@ogonek{--a}</code> -a&#808;
@@ -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>&#305; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -1965,22 +1983,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&#34;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@'e &eacute; (é)
+</p>
+<p>@'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
-@'{@dotless{i}} &iacute; (í)
+</p>
+<p>@'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code>@H{a}</code> a&#779;
+</p>
+<p><code>@H{a}</code> a&#779;
 <code>@dotaccent{a}</code> &#551; (ȧ)
 <code>@ringaccent{a}</code> &aring; (å)
-<code>@tieaccent{a}</code> a&#865;
+</p>
+<p><code>@tieaccent{a}</code> a&#865;
 <code>@u{a}</code> &#259; (ă)
 <code>@ubaraccent{a}</code> a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
+</p>
+<p><code>@udotaccent{a}</code> &#7841; (ạ)
 <code>@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code>@,{c}</code> &ccedil; (ç)
 <code>@ogonek{a}</code> &#261; (ą)
 </p>
@@ -1992,10 +2016,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><code>@tieaccent{--a}</code> -a&#865;
 <code>@u{--a}</code> -a&#774;
 <code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{--a}</code> -a&#803;
+</p>
+<p><code>@udotaccent{--a}</code> -a&#803;
 <code>@v{--a}</code> -a&#780;
 <code>@,{--c}</code> -c&#807;
 <code>@ogonek{--a}</code> -a&#808;
@@ -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>&#305; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3100,22 +3127,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&#34;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@'e &eacute; (é)
+</p>
+<p>@'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
-@'{@dotless{i}} &iacute; (í)
+</p>
+<p>@'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code>@H{a}</code> a&#779;
+</p>
+<p><code>@H{a}</code> a&#779;
 <code>@dotaccent{a}</code> &#551; (ȧ)
 <code>@ringaccent{a}</code> &aring; (å)
-<code>@tieaccent{a}</code> a&#865;
+</p>
+<p><code>@tieaccent{a}</code> a&#865;
 <code>@u{a}</code> &#259; (ă)
 <code>@ubaraccent{a}</code> a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
+</p>
+<p><code>@udotaccent{a}</code> &#7841; (ạ)
 <code>@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code>@,{c}</code> &ccedil; (ç)
 <code>@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3127,10 +3160,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><code>@tieaccent{--a}</code> -a&#865;
 <code>@u{--a}</code> -a&#774;
 <code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{--a}</code> -a&#803;
+</p>
+<p><code>@udotaccent{--a}</code> -a&#803;
 <code>@v{--a}</code> -a&#780;
 <code>@,{--c}</code> -c&#807;
 <code>@ogonek{--a}</code> -a&#808;
@@ -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>&#305; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4165,22 +4201,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&#34;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@'e &eacute; (é)
+</p>
+<p>@'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
-@'{@dotless{i}} &iacute; (í)
+</p>
+<p>@'{@dotless{i}} &iacute; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code>@H{a}</code> a&#779;
+</p>
+<p><code>@H{a}</code> a&#779;
 <code>@dotaccent{a}</code> &#551; (ȧ)
 <code>@ringaccent{a}</code> &aring; (å)
-<code>@tieaccent{a}</code> a&#865;
+</p>
+<p><code>@tieaccent{a}</code> a&#865;
 <code>@u{a}</code> &#259; (ă)
 <code>@ubaraccent{a}</code> a&#818;
-<code>@udotaccent{a}</code> &#7841; (ạ)
+</p>
+<p><code>@udotaccent{a}</code> &#7841; (ạ)
 <code>@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code>@,{c}</code> &ccedil; (ç)
 <code>@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4192,10 +4234,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><code>@tieaccent{--a}</code> -a&#865;
 <code>@u{--a}</code> -a&#774;
 <code>@ubaraccent{--a}</code> -a&#818;
-<code>@udotaccent{--a}</code> -a&#803;
+</p>
+<p><code>@udotaccent{--a}</code> -a&#803;
 <code>@v{--a}</code> -a&#780;
 <code>@,{--c}</code> -c&#807;
 <code>@ogonek{--a}</code> -a&#808;
@@ -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>&#305; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5233,21 +5278,27 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @&#34;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5261,9 +5312,11 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 <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;
@@ -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>&#305; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -1016,10 +1031,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2080,22 +2098,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2107,10 +2131,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3175,21 +3202,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -3203,9 +3236,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2236)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2236)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2267)
 
    cp
 
@@ -2967,116 +3009,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
    fn
 
@@ -3084,171 +3126,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -3261,9 +3303,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  369)
-* d--eftp_name <1>:                      chapter.            (line 1050)
-* d--eftp_name <2>:                      chapter.            (line 1869)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -3346,306 +3388,306 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
-* counting entry:                        chapter.            (line 2586)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
-* index entry in footnote:               chapter.            (line 2581)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2612)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 
 
 Tag Table:
-Node: Top20028
-Node: chapter20213
-Ref: chapter-Footnote-1102199
-Ref: chapter-Footnote-2102219
-Ref: chapter-Footnote-3102240
-Ref: chapter-Footnote-4102260
-Ref: chapter-Footnote-5102281
-Ref: chapter-Footnote-6102301
-Ref: chapter-Footnote-7102322
-Ref: chapter-Footnote-8102360
-Node: s--ect,ion102380
-Node: subsection102583
-Ref: anchor102764
-Node: subsubsection ``simple-double--102764
-Node: subsubsection three---four----''102964
-Node: chapter2103136
+Node: Top20061
+Node: chapter20246
+Ref: chapter-Footnote-1102307
+Ref: chapter-Footnote-2102327
+Ref: chapter-Footnote-3102348
+Ref: chapter-Footnote-4102368
+Ref: chapter-Footnote-5102389
+Ref: chapter-Footnote-6102409
+Ref: chapter-Footnote-7102430
+Ref: chapter-Footnote-8102468
+Node: s--ect,ion102488
+Node: subsection102691
+Ref: anchor102872
+Node: subsubsection ``simple-double--102872
+Node: subsubsection three---four----''103072
+Node: chapter2103244
 
 End Tag Table
 
diff --git a/tp/tests/coverage/res_parser/formatting_latex/formatting.tex 
b/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
index 6519cad015..403a16ed17 100644
--- a/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
@@ -152,21 +152,27 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @"\{U\} \"{U} (Ü) 
 @\~{}n \~{n} (ñ)
 @\^{}a \^{a} (â)
+
 @'e \'{e} (é)
 @=o \={o} (ō)
 @`i \`{i} (ì)
 @'\{e\} \'{e} (é)
+
 @'\{@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} (ą)
@@ -179,9 +185,11 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 \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}
@@ -357,6 +365,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \[
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -1819,21 +1828,27 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @"\{U\} \"{U} (Ü) 
 @\~{}n \~{n} (ñ)
 @\^{}a \^{a} (â)
+
 @'e \'{e} (é)
 @=o \={o} (ō)
 @`i \`{i} (ì)
 @'\{e\} \'{e} (é)
+
 @'\{@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} (ą)
@@ -1846,9 +1861,11 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 \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}
@@ -2021,6 +2038,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \[
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -3500,21 +3518,27 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @"\{U\} \"{U} (Ü) 
 @\~{}n \~{n} (ñ)
 @\^{}a \^{a} (â)
+
 @'e \'{e} (é)
 @=o \={o} (ō)
 @`i \`{i} (ì)
 @'\{e\} \'{e} (é)
+
 @'\{@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} (ą)
@@ -3527,9 +3551,11 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 \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}
@@ -3702,6 +3728,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \[
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -5163,21 +5190,27 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 @"\{U\} \"{U} (Ü) 
 @\~{}n \~{n} (ñ)
 @\^{}a \^{a} (â)
+
 @'e \'{e} (é)
 @=o \={o} (ō)
 @`i \`{i} (ì)
 @'\{e\} \'{e} (é)
+
 @'\{@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} (ą)
@@ -5190,9 +5223,11 @@ kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
 \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}
@@ -5365,6 +5400,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \[
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -6828,21 +6864,27 @@ kbd:\ 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}
 @"\{U\}\ \"{U}\ (Ü) 
 @\~{}n \~{n}\ (ñ)
 @\^{}a \^{a}\ (â)
+
 @'e \'{e}\ (é)
 @=o \={o}\ (ō)
 @`i \`{i}\ (ì)
 @'\{e\}\ \'{e}\ (é)
+
 @'\{@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}\ (ą)
@@ -6855,9 +6897,11 @@ kbd:\ 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}
 \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}
@@ -7041,6 +7085,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \[
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
diff --git 
a/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi 
b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
index fa95e2e623..5e9f25a517 100644
--- a/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
@@ -41,21 +41,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -68,9 +74,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -254,6 +262,7 @@ f(x) = {1 \\over \\sigma \\sqrt{2\\pi}}e@sup{-{1 \\over 
2}\\left({x-\\mu \\over
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
@@ -1229,21 +1238,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -1256,9 +1271,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -1441,6 +1458,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
@@ -2397,21 +2415,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -2424,9 +2448,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -2609,6 +2635,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
@@ -3604,21 +3631,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -3631,9 +3664,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -3816,6 +3851,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
@@ -4766,21 +4802,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -4793,9 +4835,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -4978,6 +5022,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
diff --git a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
index 0193d16802..83f160f0f0 100644
--- a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
@@ -26,17 +26,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
 
@@ -109,6 +119,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 ı ȷ
 ł ç
+
 a̲ ạ ą a^{h}_{l}
 
        ! @ } {
@@ -707,17 +718,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
 
@@ -790,6 +811,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 ı ȷ
 ł ç
+
 a̲ ạ ą a^{h}_{l}
 
        ! @ } {
@@ -1404,21 +1426,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} ą (ą)
@@ -1432,9 +1460,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} -ç
@@ -1606,6 +1636,7 @@ cross ref name: (file name). ‘@inforef{}’ *note ::
 
      ı ȷ
      ł ç
+
      a̲ ạ ą a^{h}_{l}
 
             ! @ } {
@@ -2240,300 +2271,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2236)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2236)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2267)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -2545,9 +2576,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  369)
-* d--eftp_name <1>:                      chapter.            (line 1050)
-* d--eftp_name <2>:                      chapter.            (line 1869)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -2592,285 +2623,285 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
-* counting entry:                        chapter.            (line 2573)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
-* index entry in footnote:               chapter.            (line 2568)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2604)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2599)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 Top section
 1 chapter
diff --git a/tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt 
b/tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt
index 37a155badf..45810b92d6 100644
--- a/tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt
@@ -61,21 +61,27 @@ kbd: ``simple-double--three---four----''
 @"{U} U" (Ü) 
 @~n n~ (ñ)
 @^a a^ (â)
+
 @'e e' (é)
 @=o o= (ō)
 @`i i` (ì)
 @'{e} e' (é)
+
 @'{@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; (ą)
@@ -89,9 +95,11 @@ kbd: ``simple-double--three---four----''
 @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,
@@ -262,6 +270,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 i j
 /l c,
+
 a_ .a a; ahl
 
        ! @ } { 
@@ -906,21 +915,27 @@ kbd: ``simple-double--three---four----''
 @"{U} U" (Ü) 
 @~n n~ (ñ)
 @^a a^ (â)
+
 @'e e' (é)
 @=o o= (ō)
 @`i i` (ì)
 @'{e} e' (é)
+
 @'{@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; (ą)
@@ -934,9 +949,11 @@ kbd: ``simple-double--three---four----''
 @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,
@@ -1107,6 +1124,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 i j
 /l c,
+
 a_ .a a; ahl
 
        ! @ } { 
diff --git 
a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
index a75dc4497d..53e7e3f7ab 100644
--- a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
@@ -30,21 +30,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} ą (ą)
@@ -58,9 +64,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} -ç
@@ -231,6 +239,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 ı ȷ
 ł ç
+
 a̲ ạ ą ahl
 
        ! @ } { 
@@ -926,22 +935,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -953,10 +968,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1122,6 +1139,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2018,22 +2036,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2045,10 +2069,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2214,6 +2240,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3159,22 +3186,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3186,10 +3219,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3355,6 +3390,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4253,21 +4289,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -4281,9 +4323,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -4458,6 +4502,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5496,22 +5541,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -5523,10 +5574,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -5692,6 +5745,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/coverage/res_parser/formatting_textcontent/formatting 
b/tp/tests/coverage/res_parser/formatting_textcontent/formatting
index 28252325e6..a999f69e19 100644
--- a/tp/tests/coverage/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/coverage/res_parser/formatting_textcontent/formatting
@@ -34,21 +34,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} ą (ą)
@@ -62,9 +68,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
 
 ı ȷ
 /l ç
+
 a̲ ạ ą ahl
 
        ! @ } { 
@@ -876,21 +885,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} ą (ą)
@@ -904,9 +919,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} -ç
@@ -1075,6 +1092,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 ı ȷ
 /l ç
+
 a̲ ạ ą ahl
 
        ! @ } { 
@@ -1740,21 +1758,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} ą (ą)
@@ -1768,9 +1792,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} -ç
@@ -1939,6 +1965,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 ı ȷ
 /l ç
+
 a̲ ạ ą ahl
 
        ! @ } { 
@@ -2577,21 +2604,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} ą (ą)
@@ -2605,9 +2638,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} -ç
@@ -2776,6 +2811,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 
 ı ȷ
 /l ç
+
 a̲ ạ ą ahl
 
        ! @ } { 
diff --git a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
index 87b4df32a8..b2269e9cf4 100644
--- a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_xhtml/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
 
        ! @ } { 
@@ -932,22 +941,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -959,10 +974,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1128,6 +1145,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2025,22 +2043,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2052,10 +2076,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2221,6 +2247,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3182,22 +3209,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3209,10 +3242,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3378,6 +3413,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4273,22 +4309,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4300,10 +4342,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4469,6 +4513,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5368,21 +5413,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5396,9 +5447,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5573,6 +5626,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/coverage/res_parser/formatting_xml/formatting.xml 
b/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
index fde9aad86d..6546b83a6d 100644
--- a/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
@@ -45,21 +45,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@&quot;@{U@} @&quot;{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -72,9 +78,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -258,6 +266,7 @@ f(x) = {1 \\over \\sigma \\sqrt{2\\pi}}e@sup{-{1 \\over 
2}\\left({x-\\mu \\over
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
@@ -1233,22 +1242,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> (Ü) 
 &arobase;~n <accent type="tilde" bracketed="off">n</accent> (ñ)
 &arobase;^a <accent type="circ" bracketed="off">a</accent> (â)
-&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
+</para>
+<para>&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
 &arobase;=o <accent type="macr" bracketed="off">o</accent> (ō)
 &arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent> (ì)
 &arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent> (é)
-&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
+</para>
+<para>&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> (ȷ)
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+</para>
+<para><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>
+</para>
+<para><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> (ạ)
+</para>
+<para><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> (ç)
+</para>
+<para>&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>
@@ -1260,10 +1275,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <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>
+</para>
+<para><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>
+</para>
+<para><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>
@@ -1444,6 +1461,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 <displaymath endspaces=" ">
 <dotless>i</dotless> <dotless>j</dotless>
 &lslash; <accent type="cedil" bracketed="off">c</accent>
+
 <accent type="ubaraccent">a</accent> <accent type="udotaccent">a</accent> 
<accent type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
 &linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &eosexcl; &arobase; &rbrace; &lbrace; 
&slashbreak;
 <today/>
@@ -2392,22 +2410,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> (Ü) 
 &arobase;~n <accent type="tilde" bracketed="off">n</accent> (ñ)
 &arobase;^a <accent type="circ" bracketed="off">a</accent> (â)
-&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
+</para>
+<para>&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
 &arobase;=o <accent type="macr" bracketed="off">o</accent> (ō)
 &arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent> (ì)
 &arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent> (é)
-&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
+</para>
+<para>&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> (ȷ)
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+</para>
+<para><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>
+</para>
+<para><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> (ạ)
+</para>
+<para><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> (ç)
+</para>
+<para>&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>
@@ -2419,10 +2443,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <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>
+</para>
+<para><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>
+</para>
+<para><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>
@@ -2603,6 +2629,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 <displaymath endspaces=" ">
 <dotless>i</dotless> <dotless>j</dotless>
 &lslash; <accent type="cedil" bracketed="off">c</accent>
+
 <accent type="ubaraccent">a</accent> <accent type="udotaccent">a</accent> 
<accent type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
 &linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &eosexcl; &arobase; &rbrace; &lbrace; 
&slashbreak;
 <today/>
@@ -3591,22 +3618,28 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> (Ü) 
 &arobase;~n <accent type="tilde" bracketed="off">n</accent> (ñ)
 &arobase;^a <accent type="circ" bracketed="off">a</accent> (â)
-&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
+</para>
+<para>&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent> (é)
 &arobase;=o <accent type="macr" bracketed="off">o</accent> (ō)
 &arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent> (ì)
 &arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent> (é)
-&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> (í)
+</para>
+<para>&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> (ȷ)
-<code>&arobase;H&lbrace;a&rbrace;</code> <accent type="doubleacute">a</accent>
+</para>
+<para><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>
+</para>
+<para><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> (ạ)
+</para>
+<para><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> (ç)
+</para>
+<para>&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>
@@ -3618,10 +3651,12 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <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>
+</para>
+<para><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>
+</para>
+<para><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>
@@ -3802,6 +3837,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 <displaymath endspaces=" ">
 <dotless>i</dotless> <dotless>j</dotless>
 &lslash; <accent type="cedil" bracketed="off">c</accent>
+
 <accent type="ubaraccent">a</accent> <accent type="udotaccent">a</accent> 
<accent type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
 &linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &eosexcl; &arobase; &rbrace; &lbrace; 
&slashbreak;
 <today/>
@@ -4744,21 +4780,27 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> (Ü) 
 &arobase;~n <accent type="tilde" bracketed="off">n</accent> (ñ)
 &arobase;^a <accent type="circ" bracketed="off">a</accent> (â)
+
 &arobase;'e <accent type="acute" bracketed="off">e</accent> (é)
 &arobase;=o <accent type="macr" bracketed="off">o</accent> (ō)
 &arobase;`i <accent type="grave" bracketed="off">i</accent> (ì)
 &arobase;'&lbrace;e&rbrace; <accent type="acute">e</accent> (é)
+
 &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> 
(ą)
@@ -4771,9 +4813,11 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&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>
@@ -4955,6 +4999,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 </pre><displaymath endspaces=" ">
 <dotless>i</dotless> <dotless>j</dotless>
 &lslash; <accent type="cedil" bracketed="off">c</accent>
+
 <accent type="ubaraccent">a</accent> <accent type="udotaccent">a</accent> 
<accent type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
 &linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &eosexcl; &arobase; &rbrace; &lbrace; 
&slashbreak;
 <today/>
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 4c3f7408af..60e2b63cbc 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -24,21 +24,27 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @@"@{U@} @"{U} (Ü) 
 @@~n @~n (ñ)
 @@^a @^a (â)
+
 @@'e @'e (é)
 @@=o @=o (ō)
 @@`i @`i (ì)
 @@'@{e@} @'{e} (é)
+
 @@'@{@@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} (ą)
@@ -51,9 +57,11 @@ kbd: @kbd{``simple-double--three---four----''} @*
 @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}
@@ -237,6 +245,7 @@ f(x) = {1 \\over \\sigma \\sqrt{2\\pi}}e@sup{-{1 \\over 
2}\\left({x-\\mu \\over
 @displaymath
 @dotless{i} @dotless{j}
 @l{} @,c
+
 @ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
 @* @ @  @
 @- @| @! @@ @} @{ @/
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 c0a613ab18..f7f935d6a3 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/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
 
        ! @ } { 
@@ -938,22 +947,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{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>
@@ -965,10 +980,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> –ą
@@ -1134,6 +1151,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>
 
        ! @ } { 
@@ -2031,22 +2049,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{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>
@@ -2058,10 +2082,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> –ą
@@ -2227,6 +2253,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>
 
        ! @ } { 
@@ -3198,22 +3225,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{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>
@@ -3225,10 +3258,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> –ą
@@ -3394,6 +3429,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>
 
        ! @ } { 
@@ -4289,22 +4325,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{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>
@@ -4316,10 +4358,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> –ą
@@ -4485,6 +4529,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>
 
        ! @ } { 
@@ -5384,21 +5429,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{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> ą (ą)
@@ -5412,9 +5463,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> --ç
@@ -5589,6 +5642,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/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 82e568723c..a605e24afa 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
@@ -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
 
        ! @ } { 
@@ -937,22 +946,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -964,10 +979,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1133,6 +1150,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2028,22 +2046,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2055,10 +2079,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2224,6 +2250,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -3123,21 +3150,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
+
 @'e &#233; (é)
 @=o &#333; (ō)
 @`i &#236; (ì)
 @'{e} &#233; (é)
+
 @'{@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; (ą)
@@ -3151,9 +3184,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -3328,6 +3363,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
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 27299bd381..bd6c501b21 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
@@ -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/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 76abea7b41..62d91f1363 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
@@ -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
 
        ! @ } { 
@@ -921,22 +930,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -948,10 +963,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1117,6 +1134,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2014,22 +2032,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2041,10 +2065,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2210,6 +2236,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
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 437a99a303..304e3927d7 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
@@ -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/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 3f55de4cf9..86e2a71aa2 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
@@ -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/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 5e5a068472..69337ca0f9 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
@@ -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/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 f697bbd356..773888b148 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
@@ -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/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 e49067ebd9..07774b08d3 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
@@ -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/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 158ecad032..fb9c9e308c 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/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/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 8c27d06a57..2c6424eebd 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/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
 
        ! @ } { 
@@ -949,22 +958,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -976,10 +991,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1145,6 +1162,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2040,22 +2058,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2067,10 +2091,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2236,6 +2262,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3135,21 +3162,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -3163,9 +3196,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -3340,6 +3375,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 9dd5bc3529..7f5b95f1d5 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/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/layout/res_parser/formatting_exotic/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index 9db7f81ba7..57ea49822a 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.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/layout/res_parser/formatting_exotic/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index a913aa7718..582447c3f9 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/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/layout/res_parser/formatting_exotic/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index a97d86f051..ae8e50e3e4 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/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/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 24ee7f80af..3e6cf665cb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.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/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 0f95b8e6a1..480ab0dcd7 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
@@ -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/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index c608f019b1..29376f897a 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.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/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 e9089a7292..207335629f 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
@@ -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/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 67bf2815bf..9abd131d26 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
@@ -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/layout/res_parser/formatting_fr/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr/formatting.html
index 6b693291ba..70a6ed6e21 100644
--- a/tp/tests/layout/res_parser/formatting_fr/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr/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
 
        ! @ } { 
@@ -934,22 +943,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -961,10 +976,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1130,6 +1147,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2027,22 +2045,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2054,10 +2078,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3177,22 +3204,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3204,10 +3237,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3373,6 +3408,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4268,22 +4304,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4295,10 +4337,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4464,6 +4508,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5363,21 +5408,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5391,9 +5442,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5568,6 +5621,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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 3f36841724..9b943005cb 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/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
 
        ! @ } { 
@@ -934,22 +943,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -961,10 +976,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1130,6 +1147,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2027,22 +2045,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2054,10 +2078,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3177,22 +3204,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3204,10 +3237,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3373,6 +3408,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4268,22 +4304,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4295,10 +4337,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4464,6 +4508,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5363,21 +5408,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5391,9 +5442,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5568,6 +5621,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/layout/res_parser/formatting_fr_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_fr_info/formatting.info
index ce35184f7a..0dc43b08be 100644
--- a/tp/tests/layout/res_parser/formatting_fr_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_fr_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"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2236)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2236)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2267)
 
    cp
 
@@ -2967,116 +3009,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name de c--lass:             chapter.            (line  396)
-* d--efivar_name de c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name de c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* d--eftypecv_name de c--lass:           chapter.            (line  357)
-* d--eftypecv_name de c--lass <1>:       chapter.            (line  360)
-* d--eftypecv_name de c--lass <2>:       chapter.            (line 1038)
-* d--eftypecv_name de c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name de c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name de c--lass <5>:       chapter.            (line 1860)
-* d--eftypecv_name2 de c--lass2:         chapter.            (line  428)
-* d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  431)
-* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1109)
-* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name de c--lass:         chapter.            (line  399)
-* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name de c--lass:             chapter.            (line  407)
+* d--efivar_name de c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name de c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name de c--lass:           chapter.            (line  368)
+* d--eftypecv_name de c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name de c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name de c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name de c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name de c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 de c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name de c--lass:         chapter.            (line  410)
+* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
    fn
 
@@ -3084,171 +3126,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name de c--lass:           chapter.            (line  402)
-* d--efmethod_name de c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name de c--lass <2>:       chapter.            (line 1902)
-* d--efop_name de c--lass:               chapter.            (line  363)
-* d--efop_name de c--lass <1>:           chapter.            (line  366)
-* d--efop_name de c--lass <2>:           chapter.            (line 1044)
-* d--efop_name de c--lass <3>:           chapter.            (line 1047)
-* d--efop_name de c--lass <4>:           chapter.            (line 1863)
-* d--efop_name de c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name de c--lass:       chapter.            (line  405)
-* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1905)
-* d--eftypeop_name de c--lass:           chapter.            (line  342)
-* d--eftypeop_name de c--lass <1>:       chapter.            (line  345)
-* d--eftypeop_name de c--lass <2>:       chapter.            (line 1023)
-* d--eftypeop_name de c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name de c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name de c--lass <5>:       chapter.            (line 1845)
-* d--eftypeop_name2 de c--lass2:         chapter.            (line  418)
-* d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  423)
-* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1099)
-* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name de c--lass:           chapter.            (line  413)
+* d--efmethod_name de c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name de c--lass <2>:       chapter.            (line 1933)
+* d--efop_name de c--lass:               chapter.            (line  374)
+* d--efop_name de c--lass <1>:           chapter.            (line  377)
+* d--efop_name de c--lass <2>:           chapter.            (line 1066)
+* d--efop_name de c--lass <3>:           chapter.            (line 1069)
+* d--efop_name de c--lass <4>:           chapter.            (line 1894)
+* d--efop_name de c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name de c--lass:       chapter.            (line  416)
+* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name de c--lass:           chapter.            (line  353)
+* d--eftypeop_name de c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name de c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name de c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name de c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name de c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 de c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -3261,9 +3303,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  369)
-* d--eftp_name <1>:                      chapter.            (line 1050)
-* d--eftp_name <2>:                      chapter.            (line 1869)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -3346,306 +3388,306 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
-* counting entry:                        chapter.            (line 2586)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name de c--lass:             chapter.            (line  396)
-* d--efivar_name de c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name de c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* d--eftypecv_name de c--lass:           chapter.            (line  357)
-* d--eftypecv_name de c--lass <1>:       chapter.            (line  360)
-* d--eftypecv_name de c--lass <2>:       chapter.            (line 1038)
-* d--eftypecv_name de c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name de c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name de c--lass <5>:       chapter.            (line 1860)
-* d--eftypecv_name2 de c--lass2:         chapter.            (line  428)
-* d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  431)
-* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1109)
-* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name de c--lass:         chapter.            (line  399)
-* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
-* index entry in footnote:               chapter.            (line 2581)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name de c--lass:             chapter.            (line  407)
+* d--efivar_name de c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name de c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name de c--lass:           chapter.            (line  368)
+* d--eftypecv_name de c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name de c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name de c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name de c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name de c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 de c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name de c--lass:         chapter.            (line  410)
+* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2612)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name de c--lass:           chapter.            (line  402)
-* d--efmethod_name de c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name de c--lass <2>:       chapter.            (line 1902)
-* d--efop_name de c--lass:               chapter.            (line  363)
-* d--efop_name de c--lass <1>:           chapter.            (line  366)
-* d--efop_name de c--lass <2>:           chapter.            (line 1044)
-* d--efop_name de c--lass <3>:           chapter.            (line 1047)
-* d--efop_name de c--lass <4>:           chapter.            (line 1863)
-* d--efop_name de c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name de c--lass:       chapter.            (line  405)
-* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1905)
-* d--eftypeop_name de c--lass:           chapter.            (line  342)
-* d--eftypeop_name de c--lass <1>:       chapter.            (line  345)
-* d--eftypeop_name de c--lass <2>:       chapter.            (line 1023)
-* d--eftypeop_name de c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name de c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name de c--lass <5>:       chapter.            (line 1845)
-* d--eftypeop_name2 de c--lass2:         chapter.            (line  418)
-* d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  423)
-* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1099)
-* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name de c--lass:           chapter.            (line  413)
+* d--efmethod_name de c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name de c--lass <2>:       chapter.            (line 1933)
+* d--efop_name de c--lass:               chapter.            (line  374)
+* d--efop_name de c--lass <1>:           chapter.            (line  377)
+* d--efop_name de c--lass <2>:           chapter.            (line 1066)
+* d--efop_name de c--lass <3>:           chapter.            (line 1069)
+* d--efop_name de c--lass <4>:           chapter.            (line 1894)
+* d--efop_name de c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name de c--lass:       chapter.            (line  416)
+* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name de c--lass:           chapter.            (line  353)
+* d--eftypeop_name de c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name de c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name de c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name de c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name de c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 de c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 
 
 Tag Table:
-Node: Top20129
-Node: chapter20314
-Ref: chapter-Footnote-1102603
-Ref: chapter-Footnote-2102623
-Ref: chapter-Footnote-3102644
-Ref: chapter-Footnote-4102664
-Ref: chapter-Footnote-5102685
-Ref: chapter-Footnote-6102705
-Ref: chapter-Footnote-7102726
-Ref: chapter-Footnote-8102764
-Node: s--ect,ion102784
-Node: subsection102987
-Ref: anchor103168
-Node: subsubsection ``simple-double--103168
-Node: subsubsection three---four----''103368
-Node: chapter2103540
+Node: Top20162
+Node: chapter20347
+Ref: chapter-Footnote-1102711
+Ref: chapter-Footnote-2102731
+Ref: chapter-Footnote-3102752
+Ref: chapter-Footnote-4102772
+Ref: chapter-Footnote-5102793
+Ref: chapter-Footnote-6102813
+Ref: chapter-Footnote-7102834
+Ref: chapter-Footnote-8102872
+Node: s--ect,ion102892
+Node: subsection103095
+Ref: anchor103276
+Node: subsubsection ``simple-double--103276
+Node: subsubsection three---four----''103476
+Node: chapter2103648
 
 End Tag Table
 
diff --git 
a/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info 
b/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info
index ac7fcfccd9..170c073a82 100644
--- 
a/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info
+++ 
b/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/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"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2236)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2236)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2267)
 
    cp
 
@@ -2967,116 +3009,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
    fn
 
@@ -3084,171 +3126,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -3261,9 +3303,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  369)
-* d--eftp_name <1>:                      chapter.            (line 1050)
-* d--eftp_name <2>:                      chapter.            (line 1869)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -3346,306 +3388,306 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
-* counting entry:                        chapter.            (line 2586)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
-* index entry in footnote:               chapter.            (line 2581)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2612)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 
 
 Tag Table:
-Node: Top19095
-Node: chapter19280
-Ref: chapter-Footnote-199310
-Ref: chapter-Footnote-299330
-Ref: chapter-Footnote-399351
-Ref: chapter-Footnote-499371
-Ref: chapter-Footnote-599392
-Ref: chapter-Footnote-699412
-Ref: chapter-Footnote-799433
-Ref: chapter-Footnote-899471
-Node: s--ect,ion99491
-Node: subsection99694
-Ref: anchor99875
-Node: subsubsection ``simple-double--99875
-Node: subsubsection three---four----''100075
-Node: chapter2100247
+Node: Top19128
+Node: chapter19313
+Ref: chapter-Footnote-199418
+Ref: chapter-Footnote-299438
+Ref: chapter-Footnote-399459
+Ref: chapter-Footnote-499479
+Ref: chapter-Footnote-599500
+Ref: chapter-Footnote-699520
+Ref: chapter-Footnote-799541
+Ref: chapter-Footnote-899579
+Node: s--ect,ion99599
+Node: subsection99802
+Ref: anchor99983
+Node: subsubsection ``simple-double--99983
+Node: subsubsection three---four----''100183
+Node: chapter2100355
 
 End Tag Table
 
diff --git 
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info 
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
index 176b6baed5..ee3c08520b 100644
--- 
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
+++ 
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
@@ -13,18 +13,27 @@ kbd: '``simple-double--three---four----'''
 
    ''simple-double--three--four---''
 
-   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â) @'e e' (é) @=o o= (ō)
-@'i i` (ì) @'{e} e' (é) @'{@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; (ą)
+   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â)
+
+   @'e e' (é) @=o o= (ō) @'i i` (ì) @'{e} e' (é)
+
+   @'{@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@"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;
+
+   '@tieaccent{--a}' -a[ '@u{--a}' -a( '@ubaraccent{--a}' -a_
+
+   '@udotaccent{--a}' .-a '@v{--a}' -a< '@,{--c}' -c, '@ogonek{--a}' -a;
 
    @U{0075} U+0075
 
@@ -97,6 +106,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 i j
 /l c,
+
 a_ .a a; a^{h}_{l}
 
        ! @ } {
@@ -738,18 +748,27 @@ kbd: '``simple-double--three---four----'''
 
    ''simple-double--three--four---''
 
-   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â) @'e e' (é) @=o o= (ō)
-@'i i` (ì) @'{e} e' (é) @'{@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; (ą)
+   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â)
+
+   @'e e' (é) @=o o= (ō) @'i i` (ì) @'{e} e' (é)
+
+   @'{@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@"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;
+
+   '@tieaccent{--a}' -a[ '@u{--a}' -a( '@ubaraccent{--a}' -a_
+
+   '@udotaccent{--a}' .-a '@v{--a}' -a< '@,{--c}' -c, '@ogonek{--a}' -a;
 
    @U{0075} U+0075
 
@@ -822,6 +841,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 i j
 /l c,
+
 a_ .a a; a^{h}_{l}
 
        ! @ } {
@@ -1420,18 +1440,27 @@ kbd: '``simple-double--three---four----'''
 
    ''simple-double--three--four---''
 
-   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â) @'e e' (é) @=o o= (ō)
-@'i i` (ì) @'{e} e' (é) @'{@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; (ą)
+   @"u u" (ü) @"{U} U" (Ü) @~n n~ (ñ) @^a a^ (â)
+
+   @'e e' (é) @=o o= (ō) @'i i` (ì) @'{e} e' (é)
+
+   @'{@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@"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;
+
+   '@tieaccent{--a}' -a[ '@u{--a}' -a( '@ubaraccent{--a}' -a_
+
+   '@udotaccent{--a}' .-a '@v{--a}' -a< '@,{--c}' -c, '@ogonek{--a}' -a;
 
    @U{0075} U+0075
 
@@ -1504,6 +1533,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 i j
 /l c,
+
 a_ .a a; a^{h}_{l}
 
        ! @ } {
@@ -2118,21 +2148,27 @@ cross ref name: (file name). '@inforef{}' *note ::
      @"{U} U" (Ü)
      @~n n~ (ñ)
      @^a a^ (â)
+
      @'e e' (é)
      @=o o= (ō)
      @`i i` (ì)
      @'{e} e' (é)
+
      @'{@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; (ą)
@@ -2146,9 +2182,11 @@ cross ref name: (file name). '@inforef{}' *note ::
      @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,
@@ -2320,6 +2358,7 @@ cross ref name: (file name). '@inforef{}' *note ::
 
      i j
      /l c,
+
      a_ .a a; a^{h}_{l}
 
             ! @ } {
@@ -2955,14 +2994,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2238)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY te~ --- i^:            chapter.            (line 2238)
+* a INDEX---ENTRY te~ --- i^:            chapter.            (line 2267)
 
    cp
 
@@ -2970,116 +3009,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  710)
-* -option <2>:                           chapter.            (line 1403)
-* ?:                                     chapter.            (line 2238)
-* .:                                     chapter.            (line 2238)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  710)
-* " <2>:                                 chapter.            (line 1403)
-* a:                                     chapter.            (line 2238)
-* aaa, bbb:                              chapter.            (line 2238)
-* a--a:                                  chapter.            (line 2238)
-* a--asis:                               chapter.            (line  511)
-* a--asis <1>:                           chapter.            (line 1193)
-* a--asis <2>:                           chapter.            (line 2012)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line 1194)
-* b <2>:                                 chapter.            (line 2013)
-* b--b, c--c:                            chapter.            (line 2238)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2238)
-* d--efcv_name:                          chapter.            (line  352)
-* d--efcv_name <1>:                      chapter.            (line  355)
-* d--efcv_name <2>:                      chapter.            (line 1034)
-* d--efcv_name <3>:                      chapter.            (line 1037)
-* d--efcv_name <4>:                      chapter.            (line 1853)
-* d--efcv_name <5>:                      chapter.            (line 1856)
-* d--efivar_name of c--lass:             chapter.            (line  397)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1079)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1898)
-* d--efopt_name:                         chapter.            (line  388)
-* d--efopt_name <1>:                     chapter.            (line 1070)
-* d--efopt_name <2>:                     chapter.            (line 1889)
-* d--eftypecv_name of c--lass:           chapter.            (line  358)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  361)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1040)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1043)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1859)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1862)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  429)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  432)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1111)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1114)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1931)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1934)
-* d--eftypeivar_name of c--lass:         chapter.            (line  400)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1082)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1901)
-* d--eftypevar_name:                     chapter.            (line  394)
-* d--eftypevar_name <1>:                 chapter.            (line 1076)
-* d--eftypevar_name <2>:                 chapter.            (line 1895)
-* d--eftypevr_name:                      chapter.            (line  349)
-* d--eftypevr_name <1>:                  chapter.            (line 1031)
-* d--eftypevr_name <2>:                  chapter.            (line 1850)
-* d--efvar_name:                         chapter.            (line  382)
-* d--efvar_name <1>:                     chapter.            (line  385)
-* d--efvar_name <2>:                     chapter.            (line 1064)
-* d--efvar_name <3>:                     chapter.            (line 1067)
-* d--efvar_name <4>:                     chapter.            (line 1883)
-* d--efvar_name <5>:                     chapter.            (line 1886)
-* d--efvr_name:                          chapter.            (line  328)
-* d--efvr_name <1>:                      chapter.            (line 1010)
-* d--efvr_name <2>:                      chapter.            (line 1829)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2238)
-* index entry between item and itemx:    chapter.            (line  516)
-* index entry between item and itemx <1>: chapter.           (line  645)
-* index entry between item and itemx <2>: chapter.           (line 1198)
-* index entry between item and itemx <3>: chapter.           (line 1327)
-* index entry between item and itemx <4>: chapter.           (line 2017)
-* index entry between item and itemx <5>: chapter.           (line 2179)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  303)
-* index entry within deffn <1>:          chapter.            (line  985)
-* index entry within deffn <2>:          chapter.            (line 1802)
-* index entry within itemize:            chapter.            (line  214)
-* index entry within itemize <1>:        chapter.            (line  896)
-* index entry within itemize <2>:        chapter.            (line 1713)
-* index entry within multitable:         chapter.            (line  236)
-* index entry within multitable <1>:     chapter.            (line  918)
-* index entry within multitable <2>:     chapter.            (line 1736)
-* t-ruc:                                 chapter.            (line 2238)
-* T-ruc:                                 chapter.            (line 2238)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  138)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  820)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1636)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  133)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  815)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1631)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  148)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  830)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1646)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  143)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  825)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1641)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  140)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  822)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1638)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  135)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  817)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1633)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  150)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  832)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1648)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  145)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  827)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1643)
+                                                             (line 1672)
 
    fn
 
@@ -3087,171 +3126,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  710)
-* --foption <2>:                         chapter.            (line 1403)
-* ?:                                     chapter.            (line 2238)
-* .:                                     chapter.            (line 2238)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  710)
-* `` <2>:                                chapter.            (line 1403)
-* a:                                     chapter.            (line  316)
-* a <1>:                                 chapter.            (line  515)
-* a <2>:                                 chapter.            (line  644)
-* a <3>:                                 chapter.            (line  998)
-* a <4>:                                 chapter.            (line 1197)
-* a <5>:                                 chapter.            (line 1326)
-* a <6>:                                 chapter.            (line 1815)
-* a <7>:                                 chapter.            (line 2016)
-* a <8>:                                 chapter.            (line 2178)
-* a <9>:                                 chapter.            (line 2238)
-* after:                                 chapter.            (line  655)
-* after <1>:                             chapter.            (line 1337)
-* after <2>:                             chapter.            (line 2189)
-* arg2:                                  chapter.            (line  435)
-* arg2 <1>:                              chapter.            (line 1117)
-* arg2 <2>:                              chapter.            (line 1938)
-* b:                                     chapter.            (line  516)
-* b <1>:                                 chapter.            (line  645)
-* b <2>:                                 chapter.            (line 1198)
-* b <3>:                                 chapter.            (line 1327)
-* b <4>:                                 chapter.            (line 2017)
-* b <5>:                                 chapter.            (line 2179)
-* bidule machin:                         chapter.            (line  311)
-* bidule machin <1>:                     chapter.            (line  993)
-* bidule machin <2>:                     chapter.            (line 1810)
-* d--effn_name:                          chapter.            (line  295)
-* d--effn_name <1>:                      chapter.            (line  977)
-* d--effn_name <2>:                      chapter.            (line 1794)
-* d--efmac_name:                         chapter.            (line  376)
-* d--efmac_name <1>:                     chapter.            (line 1058)
-* d--efmac_name <2>:                     chapter.            (line 1877)
-* d--efmethod_name on c--lass:           chapter.            (line  403)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1085)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1904)
-* d--efop_name on c--lass:               chapter.            (line  364)
-* d--efop_name on c--lass <1>:           chapter.            (line  367)
-* d--efop_name on c--lass <2>:           chapter.            (line 1046)
-* d--efop_name on c--lass <3>:           chapter.            (line 1049)
-* d--efop_name on c--lass <4>:           chapter.            (line 1865)
-* d--efop_name on c--lass <5>:           chapter.            (line 1868)
-* d--efspec_name:                        chapter.            (line  379)
-* d--efspec_name <1>:                    chapter.            (line 1061)
-* d--efspec_name <2>:                    chapter.            (line 1880)
-* d--eftypefn_name:                      chapter.            (line  337)
-* d--eftypefn_name <1>:                  chapter.            (line  340)
-* d--eftypefn_name <2>:                  chapter.            (line 1019)
-* d--eftypefn_name <3>:                  chapter.            (line 1022)
-* d--eftypefn_name <4>:                  chapter.            (line 1838)
-* d--eftypefn_name <5>:                  chapter.            (line 1841)
-* d--eftypefn_name2:                     chapter.            (line  414)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1096)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1916)
-* d--eftypefun_name:                     chapter.            (line  391)
-* d--eftypefun_name <1>:                 chapter.            (line 1073)
-* d--eftypefun_name <2>:                 chapter.            (line 1892)
-* d--eftypemethod_name on c--lass:       chapter.            (line  406)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1088)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1907)
-* d--eftypeop_name on c--lass:           chapter.            (line  343)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  346)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1025)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1028)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1844)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1847)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  419)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  424)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1101)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1106)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1921)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1926)
-* d--efun_name:                          chapter.            (line  373)
-* d--efun_name <1>:                      chapter.            (line 1055)
-* d--efun_name <2>:                      chapter.            (line 1874)
-* de--ffn_name:                          chapter.            (line  298)
-* de--ffn_name <1>:                      chapter.            (line  980)
-* de--ffn_name <2>:                      chapter.            (line 1797)
-* deffn:                                 chapter.            (line  319)
-* deffn <1>:                             chapter.            (line  321)
-* deffn <2>:                             chapter.            (line 1001)
-* deffn <3>:                             chapter.            (line 1003)
-* deffn <4>:                             chapter.            (line 1819)
-* deffn <5>:                             chapter.            (line 1821)
-* deffnx:                                chapter.            (line  317)
-* deffnx <1>:                            chapter.            (line  322)
-* deffnx <2>:                            chapter.            (line  999)
-* deffnx <3>:                            chapter.            (line 1004)
-* deffnx <4>:                            chapter.            (line 1816)
-* deffnx <5>:                            chapter.            (line 1822)
-* f---aa:                                chapter.            (line 2238)
-* f---bb, f---cc:                        chapter.            (line 2238)
-* f---ddd, f---eee, ffff:                chapter.            (line 2238)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2238)
-* followed:                              chapter.            (line  314)
-* followed <1>:                          chapter.            (line  653)
-* followed <2>:                          chapter.            (line  996)
-* followed <3>:                          chapter.            (line 1335)
-* followed <4>:                          chapter.            (line 1813)
-* followed <5>:                          chapter.            (line 2187)
-* I:                                     chapter.            (line  302)
-* I <1>:                                 chapter.            (line  324)
-* I <2>:                                 chapter.            (line  984)
-* I <3>:                                 chapter.            (line 1006)
-* I <4>:                                 chapter.            (line 1801)
-* I <5>:                                 chapter.            (line 1824)
-* id i ule:                              chapter.            (line  308)
-* id i ule <1>:                          chapter.            (line  990)
-* id i ule <2>:                          chapter.            (line 1807)
-* id ule:                                chapter.            (line  307)
-* id ule <1>:                            chapter.            (line  989)
-* id ule <2>:                            chapter.            (line 1806)
-* INVALID:                               chapter.            (line  657)
-* INVALID <1>:                           chapter.            (line 1339)
-* INVALID <2>:                           chapter.            (line 2191)
-* log trap:                              chapter.            (line  304)
-* log trap <1>:                          chapter.            (line  986)
-* log trap <2>:                          chapter.            (line 1803)
-* log trap1:                             chapter.            (line  305)
-* log trap1 <1>:                         chapter.            (line  987)
-* log trap1 <2>:                         chapter.            (line 1804)
-* log trap2:                             chapter.            (line  306)
-* log trap2 <1>:                         chapter.            (line  988)
-* log trap2 <2>:                         chapter.            (line 1805)
-* machin:                                chapter.            (line  310)
-* machin <1>:                            chapter.            (line  312)
-* machin <2>:                            chapter.            (line  649)
-* machin <3>:                            chapter.            (line  650)
-* machin <4>:                            chapter.            (line  651)
-* machin <5>:                            chapter.            (line  652)
-* machin <6>:                            chapter.            (line  992)
-* machin <7>:                            chapter.            (line  994)
-* machin <8>:                            chapter.            (line 1331)
-* machin <9>:                            chapter.            (line 1332)
-* machin <10>:                           chapter.            (line 1333)
-* machin <11>:                           chapter.            (line 1334)
-* machin <12>:                           chapter.            (line 1809)
-* machin <13>:                           chapter.            (line 1811)
-* machin <14>:                           chapter.            (line 2183)
-* machin <15>:                           chapter.            (line 2184)
-* machin <16>:                           chapter.            (line 2185)
-* machin <17>:                           chapter.            (line 2186)
-* n--ame:                                chapter.            (line  331)
-* n--ame <1>:                            chapter.            (line  334)
-* n--ame <2>:                            chapter.            (line 1013)
-* n--ame <3>:                            chapter.            (line 1016)
-* n--ame <4>:                            chapter.            (line 1832)
-* n--ame <5>:                            chapter.            (line 1835)
-* name2:                                 chapter.            (line  409)
-* name2 <1>:                             chapter.            (line 1091)
-* name2 <2>:                             chapter.            (line 1911)
-* t--ruc:                                chapter.            (line 2238)
-* T--ruc:                                chapter.            (line 2238)
-* truc:                                  chapter.            (line  303)
-* truc <1>:                              chapter.            (line  325)
-* truc <2>:                              chapter.            (line  985)
-* truc <3>:                              chapter.            (line 1007)
-* truc <4>:                              chapter.            (line 1802)
-* truc <5>:                              chapter.            (line 1825)
-* xxx, zzz:                              chapter.            (line 2238)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -3264,9 +3303,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  370)
-* d--eftp_name <1>:                      chapter.            (line 1052)
-* d--eftp_name <2>:                      chapter.            (line 1871)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -3349,306 +3388,306 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  710)
-* -option <2>:                           chapter.            (line 1403)
-* ?:                                     chapter.            (line 2238)
-* .:                                     chapter.            (line 2238)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  710)
-* " <2>:                                 chapter.            (line 1403)
-* a:                                     chapter.            (line 2238)
-* aaa, bbb:                              chapter.            (line 2238)
-* a--a:                                  chapter.            (line 2238)
-* a--asis:                               chapter.            (line  511)
-* a--asis <1>:                           chapter.            (line 1193)
-* a--asis <2>:                           chapter.            (line 2012)
-* b:                                     chapter.            (line  512)
-* b <1>:                                 chapter.            (line 1194)
-* b <2>:                                 chapter.            (line 2013)
-* b--b, c--c:                            chapter.            (line 2238)
-* counting entry:                        chapter.            (line 2588)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2238)
-* d--efcv_name:                          chapter.            (line  352)
-* d--efcv_name <1>:                      chapter.            (line  355)
-* d--efcv_name <2>:                      chapter.            (line 1034)
-* d--efcv_name <3>:                      chapter.            (line 1037)
-* d--efcv_name <4>:                      chapter.            (line 1853)
-* d--efcv_name <5>:                      chapter.            (line 1856)
-* d--efivar_name of c--lass:             chapter.            (line  397)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1079)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1898)
-* d--efopt_name:                         chapter.            (line  388)
-* d--efopt_name <1>:                     chapter.            (line 1070)
-* d--efopt_name <2>:                     chapter.            (line 1889)
-* d--eftypecv_name of c--lass:           chapter.            (line  358)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  361)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1040)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1043)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1859)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1862)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  429)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  432)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1111)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1114)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1931)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1934)
-* d--eftypeivar_name of c--lass:         chapter.            (line  400)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1082)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1901)
-* d--eftypevar_name:                     chapter.            (line  394)
-* d--eftypevar_name <1>:                 chapter.            (line 1076)
-* d--eftypevar_name <2>:                 chapter.            (line 1895)
-* d--eftypevr_name:                      chapter.            (line  349)
-* d--eftypevr_name <1>:                  chapter.            (line 1031)
-* d--eftypevr_name <2>:                  chapter.            (line 1850)
-* d--efvar_name:                         chapter.            (line  382)
-* d--efvar_name <1>:                     chapter.            (line  385)
-* d--efvar_name <2>:                     chapter.            (line 1064)
-* d--efvar_name <3>:                     chapter.            (line 1067)
-* d--efvar_name <4>:                     chapter.            (line 1883)
-* d--efvar_name <5>:                     chapter.            (line 1886)
-* d--efvr_name:                          chapter.            (line  328)
-* d--efvr_name <1>:                      chapter.            (line 1010)
-* d--efvr_name <2>:                      chapter.            (line 1829)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2238)
-* index entry between item and itemx:    chapter.            (line  516)
-* index entry between item and itemx <1>: chapter.           (line  645)
-* index entry between item and itemx <2>: chapter.           (line 1198)
-* index entry between item and itemx <3>: chapter.           (line 1327)
-* index entry between item and itemx <4>: chapter.           (line 2017)
-* index entry between item and itemx <5>: chapter.           (line 2179)
-* index entry in footnote:               chapter.            (line 2583)
-* index entry within deffn:              chapter.            (line  303)
-* index entry within deffn <1>:          chapter.            (line  985)
-* index entry within deffn <2>:          chapter.            (line 1802)
-* index entry within itemize:            chapter.            (line  214)
-* index entry within itemize <1>:        chapter.            (line  896)
-* index entry within itemize <2>:        chapter.            (line 1713)
-* index entry within multitable:         chapter.            (line  236)
-* index entry within multitable <1>:     chapter.            (line  918)
-* index entry within multitable <2>:     chapter.            (line 1736)
-* t-ruc:                                 chapter.            (line 2238)
-* T-ruc:                                 chapter.            (line 2238)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  138)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  820)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1636)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  133)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  815)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1631)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  148)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  830)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1646)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  143)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  825)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1641)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  140)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  822)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1638)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  135)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2612)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  817)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1633)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  150)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  832)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1648)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  145)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  827)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1643)
+                                                             (line 1672)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  710)
-* --foption <2>:                         chapter.            (line 1403)
-* ?:                                     chapter.            (line 2238)
-* .:                                     chapter.            (line 2238)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  710)
-* `` <2>:                                chapter.            (line 1403)
-* a:                                     chapter.            (line  316)
-* a <1>:                                 chapter.            (line  515)
-* a <2>:                                 chapter.            (line  644)
-* a <3>:                                 chapter.            (line  998)
-* a <4>:                                 chapter.            (line 1197)
-* a <5>:                                 chapter.            (line 1326)
-* a <6>:                                 chapter.            (line 1815)
-* a <7>:                                 chapter.            (line 2016)
-* a <8>:                                 chapter.            (line 2178)
-* a <9>:                                 chapter.            (line 2238)
-* after:                                 chapter.            (line  655)
-* after <1>:                             chapter.            (line 1337)
-* after <2>:                             chapter.            (line 2189)
-* arg2:                                  chapter.            (line  435)
-* arg2 <1>:                              chapter.            (line 1117)
-* arg2 <2>:                              chapter.            (line 1938)
-* b:                                     chapter.            (line  516)
-* b <1>:                                 chapter.            (line  645)
-* b <2>:                                 chapter.            (line 1198)
-* b <3>:                                 chapter.            (line 1327)
-* b <4>:                                 chapter.            (line 2017)
-* b <5>:                                 chapter.            (line 2179)
-* bidule machin:                         chapter.            (line  311)
-* bidule machin <1>:                     chapter.            (line  993)
-* bidule machin <2>:                     chapter.            (line 1810)
-* d--effn_name:                          chapter.            (line  295)
-* d--effn_name <1>:                      chapter.            (line  977)
-* d--effn_name <2>:                      chapter.            (line 1794)
-* d--efmac_name:                         chapter.            (line  376)
-* d--efmac_name <1>:                     chapter.            (line 1058)
-* d--efmac_name <2>:                     chapter.            (line 1877)
-* d--efmethod_name on c--lass:           chapter.            (line  403)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1085)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1904)
-* d--efop_name on c--lass:               chapter.            (line  364)
-* d--efop_name on c--lass <1>:           chapter.            (line  367)
-* d--efop_name on c--lass <2>:           chapter.            (line 1046)
-* d--efop_name on c--lass <3>:           chapter.            (line 1049)
-* d--efop_name on c--lass <4>:           chapter.            (line 1865)
-* d--efop_name on c--lass <5>:           chapter.            (line 1868)
-* d--efspec_name:                        chapter.            (line  379)
-* d--efspec_name <1>:                    chapter.            (line 1061)
-* d--efspec_name <2>:                    chapter.            (line 1880)
-* d--eftypefn_name:                      chapter.            (line  337)
-* d--eftypefn_name <1>:                  chapter.            (line  340)
-* d--eftypefn_name <2>:                  chapter.            (line 1019)
-* d--eftypefn_name <3>:                  chapter.            (line 1022)
-* d--eftypefn_name <4>:                  chapter.            (line 1838)
-* d--eftypefn_name <5>:                  chapter.            (line 1841)
-* d--eftypefn_name2:                     chapter.            (line  414)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1096)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1916)
-* d--eftypefun_name:                     chapter.            (line  391)
-* d--eftypefun_name <1>:                 chapter.            (line 1073)
-* d--eftypefun_name <2>:                 chapter.            (line 1892)
-* d--eftypemethod_name on c--lass:       chapter.            (line  406)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1088)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1907)
-* d--eftypeop_name on c--lass:           chapter.            (line  343)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  346)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1025)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1028)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1844)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1847)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  419)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  424)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1101)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1106)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1921)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1926)
-* d--efun_name:                          chapter.            (line  373)
-* d--efun_name <1>:                      chapter.            (line 1055)
-* d--efun_name <2>:                      chapter.            (line 1874)
-* de--ffn_name:                          chapter.            (line  298)
-* de--ffn_name <1>:                      chapter.            (line  980)
-* de--ffn_name <2>:                      chapter.            (line 1797)
-* deffn:                                 chapter.            (line  319)
-* deffn <1>:                             chapter.            (line  321)
-* deffn <2>:                             chapter.            (line 1001)
-* deffn <3>:                             chapter.            (line 1003)
-* deffn <4>:                             chapter.            (line 1819)
-* deffn <5>:                             chapter.            (line 1821)
-* deffnx:                                chapter.            (line  317)
-* deffnx <1>:                            chapter.            (line  322)
-* deffnx <2>:                            chapter.            (line  999)
-* deffnx <3>:                            chapter.            (line 1004)
-* deffnx <4>:                            chapter.            (line 1816)
-* deffnx <5>:                            chapter.            (line 1822)
-* f---aa:                                chapter.            (line 2238)
-* f---bb, f---cc:                        chapter.            (line 2238)
-* f---ddd, f---eee, ffff:                chapter.            (line 2238)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2238)
-* followed:                              chapter.            (line  314)
-* followed <1>:                          chapter.            (line  653)
-* followed <2>:                          chapter.            (line  996)
-* followed <3>:                          chapter.            (line 1335)
-* followed <4>:                          chapter.            (line 1813)
-* followed <5>:                          chapter.            (line 2187)
-* I:                                     chapter.            (line  302)
-* I <1>:                                 chapter.            (line  324)
-* I <2>:                                 chapter.            (line  984)
-* I <3>:                                 chapter.            (line 1006)
-* I <4>:                                 chapter.            (line 1801)
-* I <5>:                                 chapter.            (line 1824)
-* id i ule:                              chapter.            (line  308)
-* id i ule <1>:                          chapter.            (line  990)
-* id i ule <2>:                          chapter.            (line 1807)
-* id ule:                                chapter.            (line  307)
-* id ule <1>:                            chapter.            (line  989)
-* id ule <2>:                            chapter.            (line 1806)
-* INVALID:                               chapter.            (line  657)
-* INVALID <1>:                           chapter.            (line 1339)
-* INVALID <2>:                           chapter.            (line 2191)
-* log trap:                              chapter.            (line  304)
-* log trap <1>:                          chapter.            (line  986)
-* log trap <2>:                          chapter.            (line 1803)
-* log trap1:                             chapter.            (line  305)
-* log trap1 <1>:                         chapter.            (line  987)
-* log trap1 <2>:                         chapter.            (line 1804)
-* log trap2:                             chapter.            (line  306)
-* log trap2 <1>:                         chapter.            (line  988)
-* log trap2 <2>:                         chapter.            (line 1805)
-* machin:                                chapter.            (line  310)
-* machin <1>:                            chapter.            (line  312)
-* machin <2>:                            chapter.            (line  649)
-* machin <3>:                            chapter.            (line  650)
-* machin <4>:                            chapter.            (line  651)
-* machin <5>:                            chapter.            (line  652)
-* machin <6>:                            chapter.            (line  992)
-* machin <7>:                            chapter.            (line  994)
-* machin <8>:                            chapter.            (line 1331)
-* machin <9>:                            chapter.            (line 1332)
-* machin <10>:                           chapter.            (line 1333)
-* machin <11>:                           chapter.            (line 1334)
-* machin <12>:                           chapter.            (line 1809)
-* machin <13>:                           chapter.            (line 1811)
-* machin <14>:                           chapter.            (line 2183)
-* machin <15>:                           chapter.            (line 2184)
-* machin <16>:                           chapter.            (line 2185)
-* machin <17>:                           chapter.            (line 2186)
-* n--ame:                                chapter.            (line  331)
-* n--ame <1>:                            chapter.            (line  334)
-* n--ame <2>:                            chapter.            (line 1013)
-* n--ame <3>:                            chapter.            (line 1016)
-* n--ame <4>:                            chapter.            (line 1832)
-* n--ame <5>:                            chapter.            (line 1835)
-* name2:                                 chapter.            (line  409)
-* name2 <1>:                             chapter.            (line 1091)
-* name2 <2>:                             chapter.            (line 1911)
-* t--ruc:                                chapter.            (line 2238)
-* T--ruc:                                chapter.            (line 2238)
-* truc:                                  chapter.            (line  303)
-* truc <1>:                              chapter.            (line  325)
-* truc <2>:                              chapter.            (line  985)
-* truc <3>:                              chapter.            (line 1007)
-* truc <4>:                              chapter.            (line 1802)
-* truc <5>:                              chapter.            (line 1825)
-* xxx, zzz:                              chapter.            (line 2238)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 
 
 Tag Table:
-Node: Top19058
-Node: chapter19243
-Ref: chapter-Footnote-199159
-Ref: chapter-Footnote-299179
-Ref: chapter-Footnote-399200
-Ref: chapter-Footnote-499220
-Ref: chapter-Footnote-599241
-Ref: chapter-Footnote-699261
-Ref: chapter-Footnote-799282
-Ref: chapter-Footnote-899320
-Node: s--ect,ion99340
-Node: subsection99543
-Ref: anchor99724
-Node: subsubsection ``simple-double--99724
-Node: subsubsection three---four----''99924
-Node: chapter2100096
+Node: Top19091
+Node: chapter19276
+Ref: chapter-Footnote-199267
+Ref: chapter-Footnote-299287
+Ref: chapter-Footnote-399308
+Ref: chapter-Footnote-499328
+Ref: chapter-Footnote-599349
+Ref: chapter-Footnote-699369
+Ref: chapter-Footnote-799390
+Ref: chapter-Footnote-899428
+Node: s--ect,ion99448
+Node: subsection99651
+Ref: anchor99832
+Node: subsubsection ``simple-double--99832
+Node: subsubsection three---four----''100032
+Node: chapter2100204
 
 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 4d8d88e789..1e1f36d395 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/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 class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -925,10 +940,12 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1094,6 +1111,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -1991,22 +2009,28 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2018,10 +2042,12 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2187,6 +2213,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3127,22 +3154,28 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3154,10 +3187,12 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3323,6 +3358,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4218,22 +4254,28 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4245,10 +4287,12 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4414,6 +4458,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5313,21 +5358,27 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5341,9 +5392,11 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 <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;
@@ -5518,6 +5571,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 589d4f4151..e60b552647 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/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
 
        ! @ } { 
@@ -939,22 +948,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -966,10 +981,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1134,6 +1151,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \]</em></div>
 <div class="displaymath"><em class="tex2jax_process">\[\imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -2030,22 +2048,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2057,10 +2081,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2225,6 +2251,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \]</em></div>
 <div class="displaymath"><em class="tex2jax_process">\[\imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -3185,22 +3212,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3212,10 +3245,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3380,6 +3415,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \]</em></div>
 <div class="displaymath"><em class="tex2jax_process">\[\imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -4274,22 +4310,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4301,10 +4343,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4469,6 +4513,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 \]</em></div>
 <div class="displaymath"><em class="tex2jax_process">\[\imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
@@ -5367,21 +5412,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5395,9 +5446,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5571,6 +5624,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 </pre><div class="displaymath"><em class="tex2jax_process">\[\imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
+
 \textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
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 ae98c3fb42..b9de14e0aa 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/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
 
        ! @ } { 
@@ -938,22 +947,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -965,10 +980,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1134,6 +1151,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -2031,22 +2049,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2058,10 +2082,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2227,6 +2253,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -3198,22 +3225,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3225,10 +3258,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3394,6 +3429,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -4289,22 +4325,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
-@&#8217;e &#233; (é)
+</p>
+<p>@&#8217;e &#233; (é)
 @=o &#333; (ō)
 @&#8216;i &#236; (ì)
 @&#8217;{e} &#233; (é)
-@&#8217;{@dotless{i}} &#237; (í)
+</p>
+<p>@&#8217;{@dotless{i}} &#237; (í)
 @dotless{i} &#305; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &#231; (ç)
+</p>
+<p>@,c &#231; (ç)
 <code class="code">@,{c}</code> &#231; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4316,10 +4358,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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;
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4485,6 +4529,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
@@ -5384,21 +5429,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &#220; (Ü) 
 @~n &#241; (ñ)
 @^a &#226; (â)
+
 @'e &#233; (é)
 @=o &#333; (ō)
 @`i &#236; (ì)
 @'{e} &#233; (é)
+
 @'{@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; (ą)
@@ -5412,9 +5463,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5589,6 +5642,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>&#305; &#567;
 &#322; &#231;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &#160;&#160; &#160;  ! @ } { 
diff --git 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
index 22a78450f6..0e273eb191 100644
--- 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
+++ 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
@@ -26,17 +26,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
 
@@ -109,6 +119,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 ı ȷ
 ł ç
+
 a̲ ạ ą a^{h}_{l}
 
        ! @ } {
@@ -707,17 +718,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
 
@@ -790,6 +811,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 
 ı ȷ
 ł ç
+
 a̲ ạ ą a^{h}_{l}
 
        ! @ } {
@@ -1404,21 +1426,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} ą (ą)
@@ -1432,9 +1460,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} -ç
@@ -1606,6 +1636,7 @@ cross ref name: (file name). '@inforef{}' *note ::
 
      ı ȷ
      ł ç
+
      a̲ ạ ą a^{h}_{l}
 
             ! @ } {
@@ -2240,300 +2271,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2236)
+* truc:                                  chapter.            (line 2267)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2236)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2267)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
    vr
 
@@ -2545,9 +2576,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  369)
-* d--eftp_name <1>:                      chapter.            (line 1050)
-* d--eftp_name <2>:                      chapter.            (line 1869)
+* d--eftp_name:                          chapter.            (line  380)
+* d--eftp_name <1>:                      chapter.            (line 1072)
+* d--eftp_name <2>:                      chapter.            (line 1900)
 
    (8)
 
@@ -2592,285 +2623,285 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  709)
-* -option <2>:                           chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  709)
-* " <2>:                                 chapter.            (line 1401)
-* a:                                     chapter.            (line 2236)
-* aaa, bbb:                              chapter.            (line 2236)
-* a--a:                                  chapter.            (line 2236)
-* a--asis:                               chapter.            (line  510)
-* a--asis <1>:                           chapter.            (line 1191)
-* a--asis <2>:                           chapter.            (line 2010)
-* b:                                     chapter.            (line  511)
-* b <1>:                                 chapter.            (line 1192)
-* b <2>:                                 chapter.            (line 2011)
-* b--b, c--c:                            chapter.            (line 2236)
-* counting entry:                        chapter.            (line 2573)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2236)
-* d--efcv_name:                          chapter.            (line  351)
-* d--efcv_name <1>:                      chapter.            (line  354)
-* d--efcv_name <2>:                      chapter.            (line 1032)
-* d--efcv_name <3>:                      chapter.            (line 1035)
-* d--efcv_name <4>:                      chapter.            (line 1851)
-* d--efcv_name <5>:                      chapter.            (line 1854)
-* d--efivar_name of c--lass:             chapter.            (line  396)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1077)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1896)
-* d--efopt_name:                         chapter.            (line  387)
-* d--efopt_name <1>:                     chapter.            (line 1068)
-* d--efopt_name <2>:                     chapter.            (line 1887)
-* 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 1038)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1041)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1857)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1860)
-* 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 1109)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1112)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1929)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1932)
-* d--eftypeivar_name of c--lass:         chapter.            (line  399)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1080)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1899)
-* d--eftypevar_name:                     chapter.            (line  393)
-* d--eftypevar_name <1>:                 chapter.            (line 1074)
-* d--eftypevar_name <2>:                 chapter.            (line 1893)
-* d--eftypevr_name:                      chapter.            (line  348)
-* d--eftypevr_name <1>:                  chapter.            (line 1029)
-* d--eftypevr_name <2>:                  chapter.            (line 1848)
-* d--efvar_name:                         chapter.            (line  381)
-* d--efvar_name <1>:                     chapter.            (line  384)
-* d--efvar_name <2>:                     chapter.            (line 1062)
-* d--efvar_name <3>:                     chapter.            (line 1065)
-* d--efvar_name <4>:                     chapter.            (line 1881)
-* d--efvar_name <5>:                     chapter.            (line 1884)
-* d--efvr_name:                          chapter.            (line  327)
-* d--efvr_name <1>:                      chapter.            (line 1008)
-* d--efvr_name <2>:                      chapter.            (line 1827)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2236)
-* index entry between item and itemx:    chapter.            (line  515)
-* index entry between item and itemx <1>: chapter.           (line  644)
-* index entry between item and itemx <2>: chapter.           (line 1196)
-* index entry between item and itemx <3>: chapter.           (line 1325)
-* index entry between item and itemx <4>: chapter.           (line 2015)
-* index entry between item and itemx <5>: chapter.           (line 2177)
-* index entry in footnote:               chapter.            (line 2568)
-* index entry within deffn:              chapter.            (line  302)
-* index entry within deffn <1>:          chapter.            (line  983)
-* index entry within deffn <2>:          chapter.            (line 1800)
-* index entry within itemize:            chapter.            (line  213)
-* index entry within itemize <1>:        chapter.            (line  894)
-* index entry within itemize <2>:        chapter.            (line 1711)
-* index entry within multitable:         chapter.            (line  235)
-* index entry within multitable <1>:     chapter.            (line  916)
-* index entry within multitable <2>:     chapter.            (line 1734)
-* t-ruc:                                 chapter.            (line 2236)
-* T-ruc:                                 chapter.            (line 2236)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  137)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  818)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1634)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  813)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1629)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  828)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1644)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  142)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  823)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1639)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  820)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1636)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  134)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2267)
+* aaa, bbb:                              chapter.            (line 2267)
+* a--a:                                  chapter.            (line 2267)
+* a--asis:                               chapter.            (line  521)
+* a--asis <1>:                           chapter.            (line 1213)
+* a--asis <2>:                           chapter.            (line 2041)
+* b:                                     chapter.            (line  522)
+* b <1>:                                 chapter.            (line 1214)
+* b <2>:                                 chapter.            (line 2042)
+* b--b, c--c:                            chapter.            (line 2267)
+* counting entry:                        chapter.            (line 2604)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2267)
+* d--efcv_name:                          chapter.            (line  362)
+* d--efcv_name <1>:                      chapter.            (line  365)
+* d--efcv_name <2>:                      chapter.            (line 1054)
+* d--efcv_name <3>:                      chapter.            (line 1057)
+* d--efcv_name <4>:                      chapter.            (line 1882)
+* d--efcv_name <5>:                      chapter.            (line 1885)
+* d--efivar_name of c--lass:             chapter.            (line  407)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1927)
+* d--efopt_name:                         chapter.            (line  398)
+* d--efopt_name <1>:                     chapter.            (line 1090)
+* d--efopt_name <2>:                     chapter.            (line 1918)
+* d--eftypecv_name of c--lass:           chapter.            (line  368)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  371)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1888)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  439)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  442)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1960)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1963)
+* d--eftypeivar_name of c--lass:         chapter.            (line  410)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1930)
+* d--eftypevar_name:                     chapter.            (line  404)
+* d--eftypevar_name <1>:                 chapter.            (line 1096)
+* d--eftypevar_name <2>:                 chapter.            (line 1924)
+* d--eftypevr_name:                      chapter.            (line  359)
+* d--eftypevr_name <1>:                  chapter.            (line 1051)
+* d--eftypevr_name <2>:                  chapter.            (line 1879)
+* d--efvar_name:                         chapter.            (line  392)
+* d--efvar_name <1>:                     chapter.            (line  395)
+* d--efvar_name <2>:                     chapter.            (line 1084)
+* d--efvar_name <3>:                     chapter.            (line 1087)
+* d--efvar_name <4>:                     chapter.            (line 1912)
+* d--efvar_name <5>:                     chapter.            (line 1915)
+* d--efvr_name:                          chapter.            (line  338)
+* d--efvr_name <1>:                      chapter.            (line 1030)
+* d--efvr_name <2>:                      chapter.            (line 1858)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2267)
+* index entry between item and itemx:    chapter.            (line  526)
+* index entry between item and itemx <1>: chapter.           (line  655)
+* index entry between item and itemx <2>: chapter.           (line 1218)
+* index entry between item and itemx <3>: chapter.           (line 1347)
+* index entry between item and itemx <4>: chapter.           (line 2046)
+* index entry between item and itemx <5>: chapter.           (line 2208)
+* index entry in footnote:               chapter.            (line 2599)
+* index entry within deffn:              chapter.            (line  313)
+* index entry within deffn <1>:          chapter.            (line 1005)
+* index entry within deffn <2>:          chapter.            (line 1831)
+* index entry within itemize:            chapter.            (line  224)
+* index entry within itemize <1>:        chapter.            (line  916)
+* index entry within itemize <2>:        chapter.            (line 1742)
+* index entry within multitable:         chapter.            (line  246)
+* index entry within multitable <1>:     chapter.            (line  938)
+* index entry within multitable <2>:     chapter.            (line 1765)
+* t-ruc:                                 chapter.            (line 2267)
+* T-ruc:                                 chapter.            (line 2267)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  148)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1665)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  143)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1660)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  158)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1675)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  153)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1670)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  150)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1667)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  145)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  815)
+                                                             (line  837)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1631)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  149)
+                                                             (line 1662)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  160)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  830)
+                                                             (line  852)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1646)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  144)
+                                                             (line 1677)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  155)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  825)
+                                                             (line  847)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1641)
+                                                             (line 1672)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  709)
-* --foption <2>:                         chapter.            (line 1401)
-* ?:                                     chapter.            (line 2236)
-* .:                                     chapter.            (line 2236)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2267)
+* .:                                     chapter.            (line 2267)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  709)
-* `` <2>:                                chapter.            (line 1401)
-* a:                                     chapter.            (line  315)
-* a <1>:                                 chapter.            (line  514)
-* a <2>:                                 chapter.            (line  643)
-* a <3>:                                 chapter.            (line  996)
-* a <4>:                                 chapter.            (line 1195)
-* a <5>:                                 chapter.            (line 1324)
-* a <6>:                                 chapter.            (line 1813)
-* a <7>:                                 chapter.            (line 2014)
-* a <8>:                                 chapter.            (line 2176)
-* a <9>:                                 chapter.            (line 2236)
-* after:                                 chapter.            (line  654)
-* after <1>:                             chapter.            (line 1335)
-* after <2>:                             chapter.            (line 2187)
-* arg2:                                  chapter.            (line  434)
-* arg2 <1>:                              chapter.            (line 1115)
-* arg2 <2>:                              chapter.            (line 1936)
-* b:                                     chapter.            (line  515)
-* b <1>:                                 chapter.            (line  644)
-* b <2>:                                 chapter.            (line 1196)
-* b <3>:                                 chapter.            (line 1325)
-* b <4>:                                 chapter.            (line 2015)
-* b <5>:                                 chapter.            (line 2177)
-* bidule machin:                         chapter.            (line  310)
-* bidule machin <1>:                     chapter.            (line  991)
-* bidule machin <2>:                     chapter.            (line 1808)
-* d--effn_name:                          chapter.            (line  294)
-* d--effn_name <1>:                      chapter.            (line  975)
-* d--effn_name <2>:                      chapter.            (line 1792)
-* d--efmac_name:                         chapter.            (line  375)
-* d--efmac_name <1>:                     chapter.            (line 1056)
-* d--efmac_name <2>:                     chapter.            (line 1875)
-* d--efmethod_name on c--lass:           chapter.            (line  402)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1083)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1902)
-* 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 1044)
-* d--efop_name on c--lass <3>:           chapter.            (line 1047)
-* d--efop_name on c--lass <4>:           chapter.            (line 1863)
-* d--efop_name on c--lass <5>:           chapter.            (line 1866)
-* d--efspec_name:                        chapter.            (line  378)
-* d--efspec_name <1>:                    chapter.            (line 1059)
-* d--efspec_name <2>:                    chapter.            (line 1878)
-* d--eftypefn_name:                      chapter.            (line  336)
-* d--eftypefn_name <1>:                  chapter.            (line  339)
-* d--eftypefn_name <2>:                  chapter.            (line 1017)
-* d--eftypefn_name <3>:                  chapter.            (line 1020)
-* d--eftypefn_name <4>:                  chapter.            (line 1836)
-* d--eftypefn_name <5>:                  chapter.            (line 1839)
-* d--eftypefn_name2:                     chapter.            (line  413)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1094)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1914)
-* d--eftypefun_name:                     chapter.            (line  390)
-* d--eftypefun_name <1>:                 chapter.            (line 1071)
-* d--eftypefun_name <2>:                 chapter.            (line 1890)
-* d--eftypemethod_name on c--lass:       chapter.            (line  405)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1086)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1905)
-* 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 1023)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1026)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1842)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1845)
-* 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 1099)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1104)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1919)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1924)
-* d--efun_name:                          chapter.            (line  372)
-* d--efun_name <1>:                      chapter.            (line 1053)
-* d--efun_name <2>:                      chapter.            (line 1872)
-* de--ffn_name:                          chapter.            (line  297)
-* de--ffn_name <1>:                      chapter.            (line  978)
-* de--ffn_name <2>:                      chapter.            (line 1795)
-* deffn:                                 chapter.            (line  318)
-* deffn <1>:                             chapter.            (line  320)
-* deffn <2>:                             chapter.            (line  999)
-* deffn <3>:                             chapter.            (line 1001)
-* deffn <4>:                             chapter.            (line 1817)
-* deffn <5>:                             chapter.            (line 1819)
-* deffnx:                                chapter.            (line  316)
-* deffnx <1>:                            chapter.            (line  321)
-* deffnx <2>:                            chapter.            (line  997)
-* deffnx <3>:                            chapter.            (line 1002)
-* deffnx <4>:                            chapter.            (line 1814)
-* deffnx <5>:                            chapter.            (line 1820)
-* f---aa:                                chapter.            (line 2236)
-* f---bb, f---cc:                        chapter.            (line 2236)
-* f---ddd, f---eee, ffff:                chapter.            (line 2236)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2236)
-* followed:                              chapter.            (line  313)
-* followed <1>:                          chapter.            (line  652)
-* followed <2>:                          chapter.            (line  994)
-* followed <3>:                          chapter.            (line 1333)
-* followed <4>:                          chapter.            (line 1811)
-* followed <5>:                          chapter.            (line 2185)
-* I:                                     chapter.            (line  301)
-* I <1>:                                 chapter.            (line  323)
-* I <2>:                                 chapter.            (line  982)
-* I <3>:                                 chapter.            (line 1004)
-* I <4>:                                 chapter.            (line 1799)
-* I <5>:                                 chapter.            (line 1822)
-* id i ule:                              chapter.            (line  307)
-* id i ule <1>:                          chapter.            (line  988)
-* id i ule <2>:                          chapter.            (line 1805)
-* id ule:                                chapter.            (line  306)
-* id ule <1>:                            chapter.            (line  987)
-* id ule <2>:                            chapter.            (line 1804)
-* INVALID:                               chapter.            (line  656)
-* INVALID <1>:                           chapter.            (line 1337)
-* INVALID <2>:                           chapter.            (line 2189)
-* log trap:                              chapter.            (line  303)
-* log trap <1>:                          chapter.            (line  984)
-* log trap <2>:                          chapter.            (line 1801)
-* log trap1:                             chapter.            (line  304)
-* log trap1 <1>:                         chapter.            (line  985)
-* log trap1 <2>:                         chapter.            (line 1802)
-* log trap2:                             chapter.            (line  305)
-* log trap2 <1>:                         chapter.            (line  986)
-* log trap2 <2>:                         chapter.            (line 1803)
-* machin:                                chapter.            (line  309)
-* machin <1>:                            chapter.            (line  311)
-* machin <2>:                            chapter.            (line  648)
-* machin <3>:                            chapter.            (line  649)
-* machin <4>:                            chapter.            (line  650)
-* machin <5>:                            chapter.            (line  651)
-* machin <6>:                            chapter.            (line  990)
-* machin <7>:                            chapter.            (line  992)
-* machin <8>:                            chapter.            (line 1329)
-* machin <9>:                            chapter.            (line 1330)
-* machin <10>:                           chapter.            (line 1331)
-* machin <11>:                           chapter.            (line 1332)
-* machin <12>:                           chapter.            (line 1807)
-* machin <13>:                           chapter.            (line 1809)
-* machin <14>:                           chapter.            (line 2181)
-* machin <15>:                           chapter.            (line 2182)
-* machin <16>:                           chapter.            (line 2183)
-* machin <17>:                           chapter.            (line 2184)
-* n--ame:                                chapter.            (line  330)
-* n--ame <1>:                            chapter.            (line  333)
-* n--ame <2>:                            chapter.            (line 1011)
-* n--ame <3>:                            chapter.            (line 1014)
-* n--ame <4>:                            chapter.            (line 1830)
-* n--ame <5>:                            chapter.            (line 1833)
-* name2:                                 chapter.            (line  408)
-* name2 <1>:                             chapter.            (line 1089)
-* name2 <2>:                             chapter.            (line 1909)
-* t--ruc:                                chapter.            (line 2236)
-* T--ruc:                                chapter.            (line 2236)
-* truc:                                  chapter.            (line  302)
-* truc <1>:                              chapter.            (line  324)
-* truc <2>:                              chapter.            (line  983)
-* truc <3>:                              chapter.            (line 1005)
-* truc <4>:                              chapter.            (line 1800)
-* truc <5>:                              chapter.            (line 1823)
-* xxx, zzz:                              chapter.            (line 2236)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
+* a:                                     chapter.            (line  326)
+* a <1>:                                 chapter.            (line  525)
+* a <2>:                                 chapter.            (line  654)
+* a <3>:                                 chapter.            (line 1018)
+* a <4>:                                 chapter.            (line 1217)
+* a <5>:                                 chapter.            (line 1346)
+* a <6>:                                 chapter.            (line 1844)
+* a <7>:                                 chapter.            (line 2045)
+* a <8>:                                 chapter.            (line 2207)
+* a <9>:                                 chapter.            (line 2267)
+* after:                                 chapter.            (line  665)
+* after <1>:                             chapter.            (line 1357)
+* after <2>:                             chapter.            (line 2218)
+* arg2:                                  chapter.            (line  445)
+* arg2 <1>:                              chapter.            (line 1137)
+* arg2 <2>:                              chapter.            (line 1967)
+* b:                                     chapter.            (line  526)
+* b <1>:                                 chapter.            (line  655)
+* b <2>:                                 chapter.            (line 1218)
+* b <3>:                                 chapter.            (line 1347)
+* b <4>:                                 chapter.            (line 2046)
+* b <5>:                                 chapter.            (line 2208)
+* bidule machin:                         chapter.            (line  321)
+* bidule machin <1>:                     chapter.            (line 1013)
+* bidule machin <2>:                     chapter.            (line 1839)
+* d--effn_name:                          chapter.            (line  305)
+* d--effn_name <1>:                      chapter.            (line  997)
+* d--effn_name <2>:                      chapter.            (line 1823)
+* d--efmac_name:                         chapter.            (line  386)
+* d--efmac_name <1>:                     chapter.            (line 1078)
+* d--efmac_name <2>:                     chapter.            (line 1906)
+* d--efmethod_name on c--lass:           chapter.            (line  413)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1933)
+* d--efop_name on c--lass:               chapter.            (line  374)
+* d--efop_name on c--lass <1>:           chapter.            (line  377)
+* d--efop_name on c--lass <2>:           chapter.            (line 1066)
+* d--efop_name on c--lass <3>:           chapter.            (line 1069)
+* d--efop_name on c--lass <4>:           chapter.            (line 1894)
+* d--efop_name on c--lass <5>:           chapter.            (line 1897)
+* d--efspec_name:                        chapter.            (line  389)
+* d--efspec_name <1>:                    chapter.            (line 1081)
+* d--efspec_name <2>:                    chapter.            (line 1909)
+* d--eftypefn_name:                      chapter.            (line  347)
+* d--eftypefn_name <1>:                  chapter.            (line  350)
+* d--eftypefn_name <2>:                  chapter.            (line 1039)
+* d--eftypefn_name <3>:                  chapter.            (line 1042)
+* d--eftypefn_name <4>:                  chapter.            (line 1867)
+* d--eftypefn_name <5>:                  chapter.            (line 1870)
+* d--eftypefn_name2:                     chapter.            (line  424)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1945)
+* d--eftypefun_name:                     chapter.            (line  401)
+* d--eftypefun_name <1>:                 chapter.            (line 1093)
+* d--eftypefun_name <2>:                 chapter.            (line 1921)
+* d--eftypemethod_name on c--lass:       chapter.            (line  416)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1936)
+* d--eftypeop_name on c--lass:           chapter.            (line  353)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  356)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1873)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1876)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  429)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  434)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1950)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1955)
+* d--efun_name:                          chapter.            (line  383)
+* d--efun_name <1>:                      chapter.            (line 1075)
+* d--efun_name <2>:                      chapter.            (line 1903)
+* de--ffn_name:                          chapter.            (line  308)
+* de--ffn_name <1>:                      chapter.            (line 1000)
+* de--ffn_name <2>:                      chapter.            (line 1826)
+* deffn:                                 chapter.            (line  329)
+* deffn <1>:                             chapter.            (line  331)
+* deffn <2>:                             chapter.            (line 1021)
+* deffn <3>:                             chapter.            (line 1023)
+* deffn <4>:                             chapter.            (line 1848)
+* deffn <5>:                             chapter.            (line 1850)
+* deffnx:                                chapter.            (line  327)
+* deffnx <1>:                            chapter.            (line  332)
+* deffnx <2>:                            chapter.            (line 1019)
+* deffnx <3>:                            chapter.            (line 1024)
+* deffnx <4>:                            chapter.            (line 1845)
+* deffnx <5>:                            chapter.            (line 1851)
+* f---aa:                                chapter.            (line 2267)
+* f---bb, f---cc:                        chapter.            (line 2267)
+* f---ddd, f---eee, ffff:                chapter.            (line 2267)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2267)
+* followed:                              chapter.            (line  324)
+* followed <1>:                          chapter.            (line  663)
+* followed <2>:                          chapter.            (line 1016)
+* followed <3>:                          chapter.            (line 1355)
+* followed <4>:                          chapter.            (line 1842)
+* followed <5>:                          chapter.            (line 2216)
+* I:                                     chapter.            (line  312)
+* I <1>:                                 chapter.            (line  334)
+* I <2>:                                 chapter.            (line 1004)
+* I <3>:                                 chapter.            (line 1026)
+* I <4>:                                 chapter.            (line 1830)
+* I <5>:                                 chapter.            (line 1853)
+* id i ule:                              chapter.            (line  318)
+* id i ule <1>:                          chapter.            (line 1010)
+* id i ule <2>:                          chapter.            (line 1836)
+* id ule:                                chapter.            (line  317)
+* id ule <1>:                            chapter.            (line 1009)
+* id ule <2>:                            chapter.            (line 1835)
+* INVALID:                               chapter.            (line  667)
+* INVALID <1>:                           chapter.            (line 1359)
+* INVALID <2>:                           chapter.            (line 2220)
+* log trap:                              chapter.            (line  314)
+* log trap <1>:                          chapter.            (line 1006)
+* log trap <2>:                          chapter.            (line 1832)
+* log trap1:                             chapter.            (line  315)
+* log trap1 <1>:                         chapter.            (line 1007)
+* log trap1 <2>:                         chapter.            (line 1833)
+* log trap2:                             chapter.            (line  316)
+* log trap2 <1>:                         chapter.            (line 1008)
+* log trap2 <2>:                         chapter.            (line 1834)
+* machin:                                chapter.            (line  320)
+* machin <1>:                            chapter.            (line  322)
+* machin <2>:                            chapter.            (line  659)
+* machin <3>:                            chapter.            (line  660)
+* machin <4>:                            chapter.            (line  661)
+* machin <5>:                            chapter.            (line  662)
+* machin <6>:                            chapter.            (line 1012)
+* machin <7>:                            chapter.            (line 1014)
+* machin <8>:                            chapter.            (line 1351)
+* machin <9>:                            chapter.            (line 1352)
+* machin <10>:                           chapter.            (line 1353)
+* machin <11>:                           chapter.            (line 1354)
+* machin <12>:                           chapter.            (line 1838)
+* machin <13>:                           chapter.            (line 1840)
+* machin <14>:                           chapter.            (line 2212)
+* machin <15>:                           chapter.            (line 2213)
+* machin <16>:                           chapter.            (line 2214)
+* machin <17>:                           chapter.            (line 2215)
+* n--ame:                                chapter.            (line  341)
+* n--ame <1>:                            chapter.            (line  344)
+* n--ame <2>:                            chapter.            (line 1033)
+* n--ame <3>:                            chapter.            (line 1036)
+* n--ame <4>:                            chapter.            (line 1861)
+* n--ame <5>:                            chapter.            (line 1864)
+* name2:                                 chapter.            (line  419)
+* name2 <1>:                             chapter.            (line 1111)
+* name2 <2>:                             chapter.            (line 1940)
+* t--ruc:                                chapter.            (line 2267)
+* T--ruc:                                chapter.            (line 2267)
+* truc:                                  chapter.            (line  313)
+* truc <1>:                              chapter.            (line  335)
+* truc <2>:                              chapter.            (line 1005)
+* truc <3>:                              chapter.            (line 1027)
+* truc <4>:                              chapter.            (line 1831)
+* truc <5>:                              chapter.            (line 1854)
+* xxx, zzz:                              chapter.            (line 2267)
 
 Top section
 1 chapter
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 8291287272..1533958a03 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
@@ -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>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -1016,10 +1031,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2080,22 +2098,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2107,10 +2131,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3175,21 +3202,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -3203,9 +3236,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
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 857c94f7d0..30af58f1c4 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 @@
-1743  @chapter chapter
-1702  @top Top section
+1761  @chapter chapter
+1720  @top Top section
   10  @section A section
    7  @subsection subsection
    4  @centerchap chapter 2
diff --git a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
index 1bf3d7d92d..0694c96698 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html/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
 
        ! @ } { 
@@ -934,22 +943,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -961,10 +976,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1130,6 +1147,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2027,22 +2045,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2054,10 +2078,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3177,22 +3204,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3204,10 +3237,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3373,6 +3408,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4268,22 +4304,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4295,10 +4337,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4464,6 +4508,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5363,21 +5408,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5391,9 +5442,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5568,6 +5621,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git a/tp/tests/layout/res_parser/formatting_texi2html_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/anchor.html
index 7c28287c16..59f92ebc2a 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html
index c89e5106a7..0b969bb084 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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
 
        ! @ } { 
@@ -952,22 +961,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -979,10 +994,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1148,6 +1165,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2043,22 +2061,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2070,10 +2094,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2239,6 +2265,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3138,21 +3165,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -3166,9 +3199,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -3343,6 +3378,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git 
a/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter2.html
index fc324523e4..72996d17ae 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_abt.html
index 7bcb6e9c82..7f2a58a834 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_abt.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/layout/res_parser/formatting_texi2html_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_fot.html
index 6fd99bb6b9..27b435baa1 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_fot.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/layout/res_parser/formatting_texi2html_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_ovr.html
index 97de822212..a183ad0d89 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_toc.html
index bc3cab8e0b..7a1ce172cd 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html
index caf2409668..b2752eb35a 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.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
 
        ! @ } { 
@@ -920,22 +929,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -947,10 +962,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1116,6 +1133,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2013,22 +2031,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2040,10 +2064,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2209,6 +2235,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
diff --git 
a/tp/tests/layout/res_parser/formatting_texi2html_nodes/s_002d_002dect_002cion.html
 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/s_002d_002dect_002cion.html
index 4d9a9da8ca..2201f455b1 100644
--- 
a/tp/tests/layout/res_parser/formatting_texi2html_nodes/s_002d_002dect_002cion.html
+++ 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsection.html
index 6ae73f4751..ee879df3dd 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 404f879629..5ba7df132a 100644
--- 
a/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_texi2html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index a6a2cffe94..9598dc4c9e 100644
--- 
a/tp/tests/layout/res_parser/formatting_texi2html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/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/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 2fbaaf2ed5..b64797646d 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/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
 
        ! @ } { 
@@ -938,22 +947,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -965,10 +980,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -1134,6 +1151,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -2031,22 +2049,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -2058,10 +2082,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -2227,6 +2253,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -3198,22 +3225,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -3225,10 +3258,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -3394,6 +3429,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -4289,22 +4325,28 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
-@&rsquo;e &eacute; (é)
+</p>
+<p>@&rsquo;e &eacute; (é)
 @=o &#333; (ō)
 @&lsquo;i &igrave; (ì)
 @&rsquo;{e} &eacute; (é)
-@&rsquo;{@dotless{i}} &iacute; (í)
+</p>
+<p>@&rsquo;{@dotless{i}} &iacute; (í)
 @dotless{i} &inodot; (ı)
 @dotless{j} &#567; (ȷ)
-<code class="code">@H{a}</code> a&#779;
+</p>
+<p><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;
+</p>
+<p><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; (ạ)
+</p>
+<p><code class="code">@udotaccent{a}</code> &#7841; (ạ)
 <code class="code">@v{a}</code> &#462; (ǎ)
-@,c &ccedil; (ç)
+</p>
+<p>@,c &ccedil; (ç)
 <code class="code">@,{c}</code> &ccedil; (ç)
 <code class="code">@ogonek{a}</code> &#261; (ą)
 </p>
@@ -4316,10 +4358,12 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 <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
+</p>
+<p><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;
+</p>
+<p><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;
@@ -4485,6 +4529,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 
@@ -5384,21 +5429,27 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @&quot;{U} &Uuml; (Ü) 
 @~n &ntilde; (ñ)
 @^a &acirc; (â)
+
 @'e &eacute; (é)
 @=o &#333; (ō)
 @`i &igrave; (ì)
 @'{e} &eacute; (é)
+
 @'{@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; (ą)
@@ -5412,9 +5463,11 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 <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;
@@ -5589,6 +5642,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>&inodot; &#567;
 &#322; &ccedil;
+
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
  &nbsp;&nbsp; &nbsp;  ! @ } { 



reply via email to

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