texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Line breaking fix in test suite


From: Gavin D. Smith
Subject: branch master updated: Line breaking fix in test suite
Date: Sun, 08 May 2022 07:18:11 -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 74c45028f1 Line breaking fix in test suite
74c45028f1 is described below

commit 74c45028f1c4d1ccb8d68deac11d6b566ceb1e76
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun May 8 12:17:53 2022 +0100

    Line breaking fix in test suite
    
    * tp/tests/coverage_macro.texi:
    Add blank line in attempt to get consistent line breaking
    decisions on Solaris, where wcwidth returns 2 for more characters.
---
 ChangeLog                                          |    8 +
 tp/tests/coverage_macro.texi                       |    1 +
 .../layout/res_parser/formatting/formatting.html   |   14 +-
 .../layout/res_parser/formatting_chm/anchor.html   |    1 +
 .../layout/res_parser/formatting_chm/chapter.html  |    8 +-
 .../layout/res_parser/formatting_chm/chapter2.html |    1 +
 .../res_parser/formatting_chm/formatting.html      |    7 +-
 .../res_parser/formatting_chm/formatting_abt.html  |    1 +
 .../res_parser/formatting_chm/formatting_ovr.html  |    1 +
 .../res_parser/formatting_chm/formatting_toc.html  |    1 +
 .../layout/res_parser/formatting_chm/index.html    |    1 +
 .../formatting_chm/s_002d_002dect_002cion.html     |    1 +
 .../res_parser/formatting_chm/subsection.html      |    1 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    1 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    1 +
 .../res_parser/formatting_docbook/formatting.xml   |   10 +-
 .../formatting_enable_encoding/formatting.html     |   14 +-
 .../EPUB/xhtml/formatting.xhtml                    |   14 +-
 .../EPUB/xhtml/chapter.xhtml                       |    8 +-
 .../EPUB/xhtml/chapter2.xhtml                      |    1 +
 .../EPUB/xhtml/formatting.xhtml                    |    7 +-
 .../EPUB/xhtml/formatting_abt.xhtml                |    1 +
 .../EPUB/xhtml/formatting_fot.xhtml                |    1 +
 .../EPUB/xhtml/formatting_ovr.xhtml                |    1 +
 .../EPUB/xhtml/formatting_toc.xhtml                |    1 +
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |    1 +
 .../EPUB/xhtml/subsection.xhtml                    |    1 +
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |    1 +
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |    1 +
 .../res_parser/formatting_exotic/anchor.html       |    1 +
 .../res_parser/formatting_exotic/chapter.html      |    8 +-
 .../res_parser/formatting_exotic/chapter2.html     |    1 +
 .../formatting_exotic/formatting_abt.html          |    1 +
 .../formatting_exotic/formatting_ovr.html          |    1 +
 .../formatting_exotic/formatting_toc.html          |    1 +
 .../layout/res_parser/formatting_exotic/index.html |    1 +
 .../formatting_exotic/s_002d_002dect_002cion.html  |    1 +
 .../res_parser/formatting_exotic/subsection.html   |    1 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    1 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    1 +
 .../res_parser/formatting_fr_icons/formatting.html |   14 +-
 .../res_parser/formatting_html/formatting.html     |   14 +-
 .../res_parser/formatting_html32/formatting.html   |   14 +-
 .../formatting_html_no_texi2html/formatting.html   |    8 +-
 .../res_parser/formatting_html_nodes/anchor.html   |    1 +
 .../res_parser/formatting_html_nodes/chapter.html  |    8 +-
 .../res_parser/formatting_html_nodes/chapter2.html |    1 +
 .../formatting_html_nodes/formatting_abt.html      |    1 +
 .../formatting_html_nodes/formatting_fot.html      |    1 +
 .../formatting_html_nodes/formatting_ovr.html      |    1 +
 .../formatting_html_nodes/formatting_toc.html      |    1 +
 .../res_parser/formatting_html_nodes/index.html    |    7 +-
 .../s_002d_002dect_002cion.html                    |    1 +
 .../formatting_html_nodes/subsection.html          |    1 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    1 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    1 +
 .../res_parser/formatting_info/formatting.info     |  Bin 117992 -> 118005 
bytes
 .../formatting_inline_css/formatting.html          |   14 +-
 .../res_parser/formatting_latex/formatting.tex     |    5 +
 .../formatting_macro_expand/formatting.texi        |    5 +
 .../res_parser/formatting_mathjax/formatting.html  |   14 +-
 .../layout/res_parser/formatting_nodes/anchor.html |    1 +
 .../res_parser/formatting_nodes/chapter.html       |    8 +-
 .../res_parser/formatting_nodes/chapter2.html      |    1 +
 .../formatting_nodes/formatting_abt.html           |    1 +
 .../formatting_nodes/formatting_fot.html           |    1 +
 .../formatting_nodes/formatting_ovr.html           |    1 +
 .../formatting_nodes/formatting_toc.html           |    1 +
 .../layout/res_parser/formatting_nodes/index.html  |    7 +-
 .../formatting_nodes/s_002d_002dect_002cion.html   |    1 +
 .../res_parser/formatting_nodes/subsection.html    |    1 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    1 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    1 +
 .../formatting_numerical_entities/formatting.html  |   14 +-
 .../res_parser/formatting_plaintext/formatting.txt | 1071 ++++++++++----------
 .../res_parser/formatting_rawtext/formatting.txt   |    2 +
 .../formatting_regions/formatting_regions.html     |   14 +-
 .../res_parser/formatting_textcontent/formatting   |    4 +
 .../formatting_weird_quotes/formatting.html        |   14 +-
 .../res_parser/formatting_xhtml/formatting.html    |   14 +-
 .../res_parser/formatting_xml/formatting.xml       |   11 +-
 81 files changed, 803 insertions(+), 607 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85570b3e7a..a1ffde5625 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-05-08  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Line breaking fix in test suite
+
+       * tp/tests/coverage_macro.texi:
+       Add blank line in attempt to get consistent line breaking
+       decisions on Solaris, where wcwidth returns 2 for more characters.
+
 2022-05-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/t/plaintext_tests.t (non_break_spaces):
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 28d7bc2e00..72a2e90d1f 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -114,6 +114,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 61e22113c7..4992988ec1 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 9e131b49db..cb9e1d1103 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 09be8ea66d..8d8b511751 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -982,7 +983,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &#8364;
 @arrow &rarr;
 @leq &le;
@@ -2040,7 +2042,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &#8364;
 @arrow &rarr;
 @leq &le;
@@ -3104,6 +3107,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &#8364;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 5f8f833052..d8ec2375a4 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 8b39fb1685..9e45e3c3b6 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -974,7 +975,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &#8364;
 @arrow &rarr;
 @leq &le;
@@ -2034,7 +2036,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &#8364;
 @arrow &rarr;
 @leq &le;
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index 8266c1081e..a2231ed43e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index 475cfea5ee..bc3560a488 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index a6d742a8dc..7e9c498a8a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 476704736b..11954376e7 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index d761a13d89..d83b56d48f 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index a869c71e55..3c61965e42 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 0b620539b8..168f2ff4d5 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index ffcbe24625..5858bab805 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 1cd2b1b1eb..3bc090c5a4 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -139,7 +139,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</para>
+<para>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -992,7 +993,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</para>
+<para>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -1832,7 +1834,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</para>
+<para>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -2668,6 +2671,7 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
+
 @textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
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 b070c454d5..d824063278 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
+
 @textdegree °
 @euro €
 @arrow →
@@ -981,7 +982,8 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
-@textdegree °
+</p>
+<p>@textdegree °
 @euro €
 @arrow →
 @leq ≤
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
-@textdegree °
+</p>
+<p>@textdegree °
 @euro €
 @arrow →
 @leq ≤
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
-@textdegree °
+</p>
+<p>@textdegree °
 @euro €
 @arrow →
 @leq ≤
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
-@textdegree °
+</p>
+<p>@textdegree °
 @euro €
 @arrow →
 @leq ≤
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright »
 @guilsinglleft ‹
 @guilsinglright ›
+
 @textdegree °
 @euro €
 @arrow →
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 424d2e7261..6990121d1d 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -980,7 +981,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -2040,7 +2042,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -3117,7 +3120,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -4175,7 +4179,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -5239,6 +5244,7 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
+
 @textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
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 bb38494e19..e31ac91300 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -987,7 +988,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -2045,7 +2047,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -3109,6 +3112,7 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
+
 @textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
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 1acae6f933..0697b9d4e2 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 d2c8a3e092..5569929b87 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -977,7 +978,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -2037,7 +2039,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 34bf18fd75..350c10c8ad 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 acad90811b..a8b4ca95fd 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 17af23ccef..3f6bdee7b4 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index ee7246b412..3d129527d6 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 d852ca0bf1..80fee50009 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 fd162dc2c4..5ae92beb4f 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 75f541e63f..ef456f05e4 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 4f1c3a4709..0b1b22ac12 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 4e453c1fef..d7437c37b2 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 63df8535be..006d0cc98e 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -999,7 +1000,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2057,7 +2059,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3121,6 +3124,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index f1b3f63b28..cb360adf0f 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 a573f1368e..4e35278433 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 0ddb2586d8..8c4c2ab508 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 d0dd66343c..a726eb35b6 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 1539ea4826..dad6978889 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 2057b0767b..7ca2a2b7e5 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
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 5a633b6a29..40bbc662c0 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 4275baf146..e4f9b8bc9e 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 bb5af5664a..981e2fef48 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
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 1845ce6845..85f44e1a77 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 61e22113c7..4992988ec1 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index b05e5ee140..62e7333777 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -953,7 +954,8 @@ but , ,
 @guillemotright &gt;&gt;
 @guilsinglleft &lt;
 @guilsinglright &gt;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro Euro
 @arrow -&gt;
 @leq &lt;=
@@ -1987,7 +1989,8 @@ but , ,
 @guillemotright &gt;&gt;
 @guilsinglleft &lt;
 @guilsinglright &gt;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro Euro
 @arrow -&gt;
 @leq &lt;=
@@ -3076,7 +3079,8 @@ but , ,
 @guillemotright &gt;&gt;
 @guilsinglleft &lt;
 @guilsinglright &gt;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro Euro
 @arrow -&gt;
 @leq &lt;=
@@ -4108,7 +4112,8 @@ but , ,
 @guillemotright &gt;&gt;
 @guilsinglleft &lt;
 @guilsinglright &gt;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro Euro
 @arrow -&gt;
 @leq &lt;=
@@ -5145,6 +5150,7 @@ but , ,
 @guillemotright &gt;&gt;
 @guilsinglleft &lt;
 @guilsinglright &gt;
+
 @textdegree &deg;
 @euro Euro
 @arrow -&gt;
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index bd1bbdf31d..e077251f4e 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -1039,7 +1040,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2097,7 +2099,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3161,6 +3164,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 9e131b49db..cb9e1d1103 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 81a66c38bf..bb8b8a8acb 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -1002,7 +1003,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2060,7 +2062,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3124,6 +3127,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 9076e8d219..a7513e0474 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index 178dca4ae2..a9a72b88a2 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 2379ea905f..1ff9595fd6 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index baca14aced..25550f5798 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index 39bf38025e..feb4fac5e8 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 6e332371f1..c4498a204c 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -976,7 +977,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2036,7 +2038,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 711093436b..44dd529907 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index ec5617b782..69f9b07bd5 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 2f160d793f..8668520d04 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index fa3db16382..8bf0bee896 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index ce530909a5..49818fd8de 100644
Binary files a/tp/tests/layout/res_parser/formatting_info/formatting.info and 
b/tp/tests/layout/res_parser/formatting_info/formatting.info differ
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 f2ec31314f..e9daa24d3d 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -953,7 +954,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2013,7 +2015,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3128,7 +3131,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4186,7 +4190,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5250,6 +5255,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index b1c570eb82..b3084587a0 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -220,6 +220,7 @@ but , ,\@
 @guillemotright \guillemotright{}
 @guilsinglleft \guilsinglleft{}
 @guilsinglright \guilsinglright{}
+
 @textdegree \textdegree{}
 @euro \euro{}
 @arrow $\rightarrow{}$
@@ -1455,6 +1456,7 @@ but , ,\@
 @guillemotright \guillemotright{}
 @guilsinglleft \guilsinglleft{}
 @guilsinglright \guilsinglright{}
+
 @textdegree \textdegree{}
 @euro \euro{}
 @arrow $\rightarrow{}$
@@ -2707,6 +2709,7 @@ but , ,\@
 @guillemotright \guillemotright{}
 @guilsinglleft \guilsinglleft{}
 @guilsinglright \guilsinglright{}
+
 @textdegree \textdegree{}
 @euro \euro{}
 @arrow $\rightarrow{}$
@@ -3938,6 +3941,7 @@ but , ,\@
 @guillemotright \guillemotright{}
 @guilsinglleft \guilsinglleft{}
 @guilsinglright \guilsinglright{}
+
 @textdegree \textdegree{}
 @euro \euro{}
 @arrow $\rightarrow{}$
@@ -5170,6 +5174,7 @@ but , ,\@
 @guillemotright \guillemotright{}
 @guilsinglleft \guilsinglleft{}
 @guilsinglright \guilsinglright{}
+
 @textdegree \textdegree{}
 @euro \euro{}
 @arrow $\rightarrow{}$
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi 
b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
index e863bf3248..1c6081468b 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -127,6 +127,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
@@ -1213,6 +1214,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
@@ -2291,6 +2293,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
@@ -3395,6 +3398,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
@@ -4467,6 +4471,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 7447b029bc..b04061ba10 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -991,7 +992,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2049,7 +2051,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3162,7 +3165,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4218,7 +4222,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5280,6 +5285,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 9e131b49db..cb9e1d1103 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -123,6 +123,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 81a66c38bf..bb8b8a8acb 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -1002,7 +1003,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2060,7 +2062,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3124,6 +3127,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 9076e8d219..a7513e0474 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index 178dca4ae2..a9a72b88a2 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 2379ea905f..1ff9595fd6 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index baca14aced..25550f5798 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index 39bf38025e..feb4fac5e8 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 6e332371f1..c4498a204c 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -976,7 +977,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2036,7 +2038,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index 711093436b..44dd529907 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index ec5617b782..69f9b07bd5 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 2f160d793f..8668520d04 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index fa3db16382..8bf0bee896 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 dd8bf329b3..8a01be9a5c 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
-@textdegree &#176;
+</p>
+<p>@textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
 @leq &#8804;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &#187;
 @guilsinglleft &#8249;
 @guilsinglright &#8250;
+
 @textdegree &#176;
 @euro &#8364;
 @arrow &#8594;
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index e2c940ab1e..003b67e5e0 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -49,7 +49,9 @@ Now !  !@ but , ,
 ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
 @quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
 @guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright › @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+@guilsinglright ›
+
+   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
 
    '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
 '@abbr{@'E--. @comma{}A., @'Etude Autonome }' É-. ,A. (Étude Autonome)
@@ -704,7 +706,9 @@ Now !  !@ but , ,
 ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
 @quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
 @guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright › @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+@guilsinglright ›
+
+   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
 
    '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
 '@abbr{@'E--. @comma{}A., @'Etude Autonome }' É-. ,A. (Étude Autonome)
@@ -1443,6 +1447,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @guillemotright »
      @guilsinglleft ‹
      @guilsinglright ›
+
      @textdegree °
      @euro €
      @arrow ->
@@ -2161,297 +2166,297 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2157)
+* truc:                                  chapter.            (line 2162)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2157)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2162)
 
    cp
 
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  683)
-* " <2>:                                 chapter.            (line 1349)
+* " <1>:                                 chapter.            (line  685)
+* " <2>:                                 chapter.            (line 1353)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  683)
-* -option <2>:                           chapter.            (line 1349)
-* .:                                     chapter.            (line 2157)
-* ?:                                     chapter.            (line 2157)
-* a:                                     chapter.            (line 2157)
-* aaa, bbb:                              chapter.            (line 2157)
-* a--a:                                  chapter.            (line 2157)
-* a--asis:                               chapter.            (line  520)
-* a--asis <1>:                           chapter.            (line 1175)
-* a--asis <2>:                           chapter.            (line 1972)
-* b:                                     chapter.            (line  521)
-* b <1>:                                 chapter.            (line 1176)
-* b <2>:                                 chapter.            (line 1973)
-* b--b, c--c:                            chapter.            (line 2157)
+* -option <1>:                           chapter.            (line  685)
+* -option <2>:                           chapter.            (line 1353)
+* .:                                     chapter.            (line 2162)
+* ?:                                     chapter.            (line 2162)
+* a:                                     chapter.            (line 2162)
+* aaa, bbb:                              chapter.            (line 2162)
+* a--a:                                  chapter.            (line 2162)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1179)
+* a--asis <2>:                           chapter.            (line 1977)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1180)
+* b <2>:                                 chapter.            (line 1978)
+* b--b, c--c:                            chapter.            (line 2162)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2157)
-* d--efcv_name:                          chapter.            (line  357)
-* d--efcv_name <1>:                      chapter.            (line  360)
-* d--efcv_name <2>:                      chapter.            (line 1012)
-* d--efcv_name <3>:                      chapter.            (line 1015)
-* d--efcv_name <4>:                      chapter.            (line 1810)
-* d--efcv_name <5>:                      chapter.            (line 1813)
-* d--efivar_name of c--lass:             chapter.            (line  402)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1057)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1855)
-* d--efopt_name:                         chapter.            (line  393)
-* d--efopt_name <1>:                     chapter.            (line 1048)
-* d--efopt_name <2>:                     chapter.            (line 1846)
-* d--eftypecv_name of c--lass:           chapter.            (line  363)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  366)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1018)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1816)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1819)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  434)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  439)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1094)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1888)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1893)
-* d--eftypeivar_name of c--lass:         chapter.            (line  405)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1060)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1858)
-* d--eftypevar_name:                     chapter.            (line  399)
-* d--eftypevar_name <1>:                 chapter.            (line 1054)
-* d--eftypevar_name <2>:                 chapter.            (line 1852)
-* d--eftypevr_name:                      chapter.            (line  354)
-* d--eftypevr_name <1>:                  chapter.            (line 1009)
-* d--eftypevr_name <2>:                  chapter.            (line 1807)
-* d--efvar_name:                         chapter.            (line  387)
-* d--efvar_name <1>:                     chapter.            (line  390)
-* d--efvar_name <2>:                     chapter.            (line 1042)
-* d--efvar_name <3>:                     chapter.            (line 1045)
-* d--efvar_name <4>:                     chapter.            (line 1840)
-* d--efvar_name <5>:                     chapter.            (line 1843)
-* d--efvr_name:                          chapter.            (line  333)
-* d--efvr_name <1>:                      chapter.            (line  988)
-* d--efvr_name <2>:                      chapter.            (line 1786)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2157)
-* index entry between item and itemx:    chapter.            (line  525)
-* index entry between item and itemx <1>: chapter.           (line  626)
-* index entry between item and itemx <2>: chapter.           (line 1180)
-* index entry between item and itemx <3>: chapter.           (line 1281)
-* index entry between item and itemx <4>: chapter.           (line 1977)
-* index entry between item and itemx <5>: chapter.           (line 2106)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2162)
+* d--efcv_name:                          chapter.            (line  359)
+* d--efcv_name <1>:                      chapter.            (line  362)
+* d--efcv_name <2>:                      chapter.            (line 1016)
+* d--efcv_name <3>:                      chapter.            (line 1019)
+* d--efcv_name <4>:                      chapter.            (line 1815)
+* d--efcv_name <5>:                      chapter.            (line 1818)
+* d--efivar_name of c--lass:             chapter.            (line  404)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1061)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1860)
+* d--efopt_name:                         chapter.            (line  395)
+* d--efopt_name <1>:                     chapter.            (line 1052)
+* d--efopt_name <2>:                     chapter.            (line 1851)
+* d--eftypecv_name of c--lass:           chapter.            (line  365)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  368)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1022)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1025)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1821)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1824)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  436)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  441)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1093)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1893)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1898)
+* d--eftypeivar_name of c--lass:         chapter.            (line  407)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1064)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1863)
+* d--eftypevar_name:                     chapter.            (line  401)
+* d--eftypevar_name <1>:                 chapter.            (line 1058)
+* d--eftypevar_name <2>:                 chapter.            (line 1857)
+* d--eftypevr_name:                      chapter.            (line  356)
+* d--eftypevr_name <1>:                  chapter.            (line 1013)
+* d--eftypevr_name <2>:                  chapter.            (line 1812)
+* d--efvar_name:                         chapter.            (line  389)
+* d--efvar_name <1>:                     chapter.            (line  392)
+* d--efvar_name <2>:                     chapter.            (line 1046)
+* d--efvar_name <3>:                     chapter.            (line 1049)
+* d--efvar_name <4>:                     chapter.            (line 1845)
+* d--efvar_name <5>:                     chapter.            (line 1848)
+* d--efvr_name:                          chapter.            (line  335)
+* d--efvr_name <1>:                      chapter.            (line  992)
+* d--efvr_name <2>:                      chapter.            (line 1791)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2162)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  628)
+* index entry between item and itemx <2>: chapter.           (line 1184)
+* index entry between item and itemx <3>: chapter.           (line 1285)
+* index entry between item and itemx <4>: chapter.           (line 1982)
+* index entry between item and itemx <5>: chapter.           (line 2111)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  304)
-* index entry within deffn <1>:          chapter.            (line  959)
-* index entry within deffn <2>:          chapter.            (line 1755)
-* index entry within itemize:            chapter.            (line  209)
-* index entry within itemize <1>:        chapter.            (line  864)
-* index entry within itemize <2>:        chapter.            (line 1660)
-* index entry within multitable:         chapter.            (line  234)
-* index entry within multitable <1>:     chapter.            (line  889)
-* index entry within multitable <2>:     chapter.            (line 1686)
-* t-ruc:                                 chapter.            (line 2157)
-* T-ruc:                                 chapter.            (line 2157)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  788)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1583)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  783)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1578)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  798)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1593)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  793)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1588)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  790)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1585)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
+* index entry within deffn:              chapter.            (line  306)
+* index entry within deffn <1>:          chapter.            (line  963)
+* index entry within deffn <2>:          chapter.            (line 1760)
+* index entry within itemize:            chapter.            (line  211)
+* index entry within itemize <1>:        chapter.            (line  868)
+* index entry within itemize <2>:        chapter.            (line 1665)
+* index entry within multitable:         chapter.            (line  236)
+* index entry within multitable <1>:     chapter.            (line  893)
+* index entry within multitable <2>:     chapter.            (line 1691)
+* t-ruc:                                 chapter.            (line 2162)
+* T-ruc:                                 chapter.            (line 2162)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  135)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  792)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1588)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  130)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  787)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1583)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  145)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  802)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1598)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  140)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  797)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1593)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  137)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  794)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1590)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  132)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  785)
+                                                             (line  789)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1580)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
+                                                             (line 1585)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  147)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  800)
+                                                             (line  804)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1595)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
+                                                             (line 1600)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  142)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  795)
+                                                             (line  799)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1590)
+                                                             (line 1595)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  683)
-* --foption <2>:                         chapter.            (line 1349)
-* .:                                     chapter.            (line 2157)
-* ?:                                     chapter.            (line 2157)
+* --foption <1>:                         chapter.            (line  685)
+* --foption <2>:                         chapter.            (line 1353)
+* .:                                     chapter.            (line 2162)
+* ?:                                     chapter.            (line 2162)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  683)
-* `` <2>:                                chapter.            (line 1349)
-* a:                                     chapter.            (line  321)
-* a <1>:                                 chapter.            (line  524)
-* a <2>:                                 chapter.            (line  625)
-* a <3>:                                 chapter.            (line  976)
-* a <4>:                                 chapter.            (line 1179)
-* a <5>:                                 chapter.            (line 1280)
-* a <6>:                                 chapter.            (line 1772)
-* a <7>:                                 chapter.            (line 1976)
-* a <8>:                                 chapter.            (line 2105)
-* a <9>:                                 chapter.            (line 2157)
-* after:                                 chapter.            (line  636)
-* after <1>:                             chapter.            (line 1291)
-* after <2>:                             chapter.            (line 2116)
-* arg2:                                  chapter.            (line  444)
-* arg2 <1>:                              chapter.            (line 1099)
-* arg2 <2>:                              chapter.            (line 1898)
-* b:                                     chapter.            (line  525)
-* b <1>:                                 chapter.            (line  626)
-* b <2>:                                 chapter.            (line 1180)
-* b <3>:                                 chapter.            (line 1281)
-* b <4>:                                 chapter.            (line 1977)
-* b <5>:                                 chapter.            (line 2106)
-* bidule machin:                         chapter.            (line  315)
-* bidule machin <1>:                     chapter.            (line  970)
-* bidule machin <2>:                     chapter.            (line 1766)
-* d--effn_name:                          chapter.            (line  296)
-* d--effn_name <1>:                      chapter.            (line  951)
-* d--effn_name <2>:                      chapter.            (line 1747)
-* d--efmac_name:                         chapter.            (line  381)
-* d--efmac_name <1>:                     chapter.            (line 1036)
-* d--efmac_name <2>:                     chapter.            (line 1834)
-* d--efmethod_name on c--lass:           chapter.            (line  408)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1063)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1861)
-* d--efop_name on c--lass:               chapter.            (line  369)
-* d--efop_name on c--lass <1>:           chapter.            (line  372)
-* d--efop_name on c--lass <2>:           chapter.            (line 1024)
-* d--efop_name on c--lass <3>:           chapter.            (line 1027)
-* d--efop_name on c--lass <4>:           chapter.            (line 1822)
-* d--efop_name on c--lass <5>:           chapter.            (line 1825)
-* d--efspec_name:                        chapter.            (line  384)
-* d--efspec_name <1>:                    chapter.            (line 1039)
-* d--efspec_name <2>:                    chapter.            (line 1837)
-* d--eftypefn_name:                      chapter.            (line  342)
-* d--eftypefn_name <1>:                  chapter.            (line  345)
-* d--eftypefn_name <2>:                  chapter.            (line  997)
-* d--eftypefn_name <3>:                  chapter.            (line 1000)
-* d--eftypefn_name <4>:                  chapter.            (line 1795)
-* d--eftypefn_name <5>:                  chapter.            (line 1798)
-* d--eftypefn_name2:                     chapter.            (line  419)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1074)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1873)
-* d--eftypefun_name:                     chapter.            (line  396)
-* d--eftypefun_name <1>:                 chapter.            (line 1051)
-* d--eftypefun_name <2>:                 chapter.            (line 1849)
-* d--eftypemethod_name on c--lass:       chapter.            (line  411)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1066)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1864)
-* d--eftypeop_name on c--lass:           chapter.            (line  348)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  351)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1003)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1801)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1804)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  424)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  429)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1079)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1084)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1878)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1883)
-* d--efun_name:                          chapter.            (line  378)
-* d--efun_name <1>:                      chapter.            (line 1033)
-* d--efun_name <2>:                      chapter.            (line 1831)
-* de--ffn_name:                          chapter.            (line  299)
-* de--ffn_name <1>:                      chapter.            (line  954)
-* de--ffn_name <2>:                      chapter.            (line 1750)
-* deffn:                                 chapter.            (line  324)
-* deffn <1>:                             chapter.            (line  326)
-* deffn <2>:                             chapter.            (line  979)
-* deffn <3>:                             chapter.            (line  981)
-* deffn <4>:                             chapter.            (line 1776)
-* deffn <5>:                             chapter.            (line 1778)
-* deffnx:                                chapter.            (line  322)
-* deffnx <1>:                            chapter.            (line  327)
-* deffnx <2>:                            chapter.            (line  977)
-* deffnx <3>:                            chapter.            (line  982)
-* deffnx <4>:                            chapter.            (line 1773)
-* deffnx <5>:                            chapter.            (line 1779)
-* f---aa:                                chapter.            (line 2157)
-* f---bb, f---cc:                        chapter.            (line 2157)
-* f---ddd, f---eee, ffff:                chapter.            (line 2157)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2157)
-* followed:                              chapter.            (line  318)
-* followed <1>:                          chapter.            (line  634)
-* followed <2>:                          chapter.            (line  973)
-* followed <3>:                          chapter.            (line 1289)
-* followed <4>:                          chapter.            (line 1769)
-* followed <5>:                          chapter.            (line 2114)
-* I:                                     chapter.            (line  303)
-* I <1>:                                 chapter.            (line  329)
-* I <2>:                                 chapter.            (line  958)
-* I <3>:                                 chapter.            (line  984)
-* I <4>:                                 chapter.            (line 1754)
-* I <5>:                                 chapter.            (line 1781)
-* id i ule:                              chapter.            (line  309)
-* id i ule <1>:                          chapter.            (line  964)
-* id i ule <2>:                          chapter.            (line 1760)
-* id ule:                                chapter.            (line  308)
-* id ule <1>:                            chapter.            (line  963)
-* id ule <2>:                            chapter.            (line 1759)
-* log trap:                              chapter.            (line  305)
-* log trap <1>:                          chapter.            (line  960)
-* log trap <2>:                          chapter.            (line 1756)
-* log trap1:                             chapter.            (line  306)
-* log trap1 <1>:                         chapter.            (line  961)
-* log trap1 <2>:                         chapter.            (line 1757)
-* log trap2:                             chapter.            (line  307)
-* log trap2 <1>:                         chapter.            (line  962)
-* log trap2 <2>:                         chapter.            (line 1758)
-* machin:                                chapter.            (line  314)
-* machin <1>:                            chapter.            (line  316)
-* machin <2>:                            chapter.            (line  630)
-* machin <3>:                            chapter.            (line  631)
-* machin <4>:                            chapter.            (line  632)
-* machin <5>:                            chapter.            (line  633)
-* machin <6>:                            chapter.            (line  969)
-* machin <7>:                            chapter.            (line  971)
-* machin <8>:                            chapter.            (line 1285)
-* machin <9>:                            chapter.            (line 1286)
-* machin <10>:                           chapter.            (line 1287)
-* machin <11>:                           chapter.            (line 1288)
-* machin <12>:                           chapter.            (line 1765)
-* machin <13>:                           chapter.            (line 1767)
-* machin <14>:                           chapter.            (line 2110)
-* machin <15>:                           chapter.            (line 2111)
-* machin <16>:                           chapter.            (line 2112)
-* machin <17>:                           chapter.            (line 2113)
-* n--ame:                                chapter.            (line  336)
-* n--ame <1>:                            chapter.            (line  339)
-* n--ame <2>:                            chapter.            (line  991)
-* n--ame <3>:                            chapter.            (line  994)
-* n--ame <4>:                            chapter.            (line 1789)
-* n--ame <5>:                            chapter.            (line 1792)
-* name2:                                 chapter.            (line  414)
-* name2 <1>:                             chapter.            (line 1069)
-* name2 <2>:                             chapter.            (line 1868)
-* t--ruc:                                chapter.            (line 2157)
-* T--ruc:                                chapter.            (line 2157)
-* truc:                                  chapter.            (line  304)
-* truc <1>:                              chapter.            (line  330)
-* truc <2>:                              chapter.            (line  959)
-* truc <3>:                              chapter.            (line  985)
-* truc <4>:                              chapter.            (line 1755)
-* truc <5>:                              chapter.            (line 1782)
-* xxx, zzz:                              chapter.            (line 2157)
+* `` <1>:                                chapter.            (line  685)
+* `` <2>:                                chapter.            (line 1353)
+* a:                                     chapter.            (line  323)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  627)
+* a <3>:                                 chapter.            (line  980)
+* a <4>:                                 chapter.            (line 1183)
+* a <5>:                                 chapter.            (line 1284)
+* a <6>:                                 chapter.            (line 1777)
+* a <7>:                                 chapter.            (line 1981)
+* a <8>:                                 chapter.            (line 2110)
+* a <9>:                                 chapter.            (line 2162)
+* after:                                 chapter.            (line  638)
+* after <1>:                             chapter.            (line 1295)
+* after <2>:                             chapter.            (line 2121)
+* arg2:                                  chapter.            (line  446)
+* arg2 <1>:                              chapter.            (line 1103)
+* arg2 <2>:                              chapter.            (line 1903)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  628)
+* b <2>:                                 chapter.            (line 1184)
+* b <3>:                                 chapter.            (line 1285)
+* b <4>:                                 chapter.            (line 1982)
+* b <5>:                                 chapter.            (line 2111)
+* bidule machin:                         chapter.            (line  317)
+* bidule machin <1>:                     chapter.            (line  974)
+* bidule machin <2>:                     chapter.            (line 1771)
+* d--effn_name:                          chapter.            (line  298)
+* d--effn_name <1>:                      chapter.            (line  955)
+* d--effn_name <2>:                      chapter.            (line 1752)
+* d--efmac_name:                         chapter.            (line  383)
+* d--efmac_name <1>:                     chapter.            (line 1040)
+* d--efmac_name <2>:                     chapter.            (line 1839)
+* d--efmethod_name on c--lass:           chapter.            (line  410)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1067)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1866)
+* d--efop_name on c--lass:               chapter.            (line  371)
+* d--efop_name on c--lass <1>:           chapter.            (line  374)
+* d--efop_name on c--lass <2>:           chapter.            (line 1028)
+* d--efop_name on c--lass <3>:           chapter.            (line 1031)
+* d--efop_name on c--lass <4>:           chapter.            (line 1827)
+* d--efop_name on c--lass <5>:           chapter.            (line 1830)
+* d--efspec_name:                        chapter.            (line  386)
+* d--efspec_name <1>:                    chapter.            (line 1043)
+* d--efspec_name <2>:                    chapter.            (line 1842)
+* d--eftypefn_name:                      chapter.            (line  344)
+* d--eftypefn_name <1>:                  chapter.            (line  347)
+* d--eftypefn_name <2>:                  chapter.            (line 1001)
+* d--eftypefn_name <3>:                  chapter.            (line 1004)
+* d--eftypefn_name <4>:                  chapter.            (line 1800)
+* d--eftypefn_name <5>:                  chapter.            (line 1803)
+* d--eftypefn_name2:                     chapter.            (line  421)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1078)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1878)
+* d--eftypefun_name:                     chapter.            (line  398)
+* d--eftypefun_name <1>:                 chapter.            (line 1055)
+* d--eftypefun_name <2>:                 chapter.            (line 1854)
+* d--eftypemethod_name on c--lass:       chapter.            (line  413)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1070)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1869)
+* d--eftypeop_name on c--lass:           chapter.            (line  350)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  353)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1007)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1010)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1806)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1809)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  426)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  431)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1083)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1883)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1888)
+* d--efun_name:                          chapter.            (line  380)
+* d--efun_name <1>:                      chapter.            (line 1037)
+* d--efun_name <2>:                      chapter.            (line 1836)
+* de--ffn_name:                          chapter.            (line  301)
+* de--ffn_name <1>:                      chapter.            (line  958)
+* de--ffn_name <2>:                      chapter.            (line 1755)
+* deffn:                                 chapter.            (line  326)
+* deffn <1>:                             chapter.            (line  328)
+* deffn <2>:                             chapter.            (line  983)
+* deffn <3>:                             chapter.            (line  985)
+* deffn <4>:                             chapter.            (line 1781)
+* deffn <5>:                             chapter.            (line 1783)
+* deffnx:                                chapter.            (line  324)
+* deffnx <1>:                            chapter.            (line  329)
+* deffnx <2>:                            chapter.            (line  981)
+* deffnx <3>:                            chapter.            (line  986)
+* deffnx <4>:                            chapter.            (line 1778)
+* deffnx <5>:                            chapter.            (line 1784)
+* f---aa:                                chapter.            (line 2162)
+* f---bb, f---cc:                        chapter.            (line 2162)
+* f---ddd, f---eee, ffff:                chapter.            (line 2162)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2162)
+* followed:                              chapter.            (line  320)
+* followed <1>:                          chapter.            (line  636)
+* followed <2>:                          chapter.            (line  977)
+* followed <3>:                          chapter.            (line 1293)
+* followed <4>:                          chapter.            (line 1774)
+* followed <5>:                          chapter.            (line 2119)
+* I:                                     chapter.            (line  305)
+* I <1>:                                 chapter.            (line  331)
+* I <2>:                                 chapter.            (line  962)
+* I <3>:                                 chapter.            (line  988)
+* I <4>:                                 chapter.            (line 1759)
+* I <5>:                                 chapter.            (line 1786)
+* id i ule:                              chapter.            (line  311)
+* id i ule <1>:                          chapter.            (line  968)
+* id i ule <2>:                          chapter.            (line 1765)
+* id ule:                                chapter.            (line  310)
+* id ule <1>:                            chapter.            (line  967)
+* id ule <2>:                            chapter.            (line 1764)
+* log trap:                              chapter.            (line  307)
+* log trap <1>:                          chapter.            (line  964)
+* log trap <2>:                          chapter.            (line 1761)
+* log trap1:                             chapter.            (line  308)
+* log trap1 <1>:                         chapter.            (line  965)
+* log trap1 <2>:                         chapter.            (line 1762)
+* log trap2:                             chapter.            (line  309)
+* log trap2 <1>:                         chapter.            (line  966)
+* log trap2 <2>:                         chapter.            (line 1763)
+* machin:                                chapter.            (line  316)
+* machin <1>:                            chapter.            (line  318)
+* machin <2>:                            chapter.            (line  632)
+* machin <3>:                            chapter.            (line  633)
+* machin <4>:                            chapter.            (line  634)
+* machin <5>:                            chapter.            (line  635)
+* machin <6>:                            chapter.            (line  973)
+* machin <7>:                            chapter.            (line  975)
+* machin <8>:                            chapter.            (line 1289)
+* machin <9>:                            chapter.            (line 1290)
+* machin <10>:                           chapter.            (line 1291)
+* machin <11>:                           chapter.            (line 1292)
+* machin <12>:                           chapter.            (line 1770)
+* machin <13>:                           chapter.            (line 1772)
+* machin <14>:                           chapter.            (line 2115)
+* machin <15>:                           chapter.            (line 2116)
+* machin <16>:                           chapter.            (line 2117)
+* machin <17>:                           chapter.            (line 2118)
+* n--ame:                                chapter.            (line  338)
+* n--ame <1>:                            chapter.            (line  341)
+* n--ame <2>:                            chapter.            (line  995)
+* n--ame <3>:                            chapter.            (line  998)
+* n--ame <4>:                            chapter.            (line 1794)
+* n--ame <5>:                            chapter.            (line 1797)
+* name2:                                 chapter.            (line  416)
+* name2 <1>:                             chapter.            (line 1073)
+* name2 <2>:                             chapter.            (line 1873)
+* t--ruc:                                chapter.            (line 2162)
+* T--ruc:                                chapter.            (line 2162)
+* truc:                                  chapter.            (line  306)
+* truc <1>:                              chapter.            (line  332)
+* truc <2>:                              chapter.            (line  963)
+* truc <3>:                              chapter.            (line  989)
+* truc <4>:                              chapter.            (line 1760)
+* truc <5>:                              chapter.            (line 1787)
+* xxx, zzz:                              chapter.            (line 2162)
 
    vr
 
@@ -2463,9 +2468,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  375)
-* d--eftp_name <1>:                      chapter.            (line 1030)
-* d--eftp_name <2>:                      chapter.            (line 1828)
+* d--eftp_name:                          chapter.            (line  377)
+* d--eftp_name <1>:                      chapter.            (line 1034)
+* d--eftp_name <2>:                      chapter.            (line 1833)
 
    (8)
 
@@ -2510,282 +2515,282 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  683)
-* " <2>:                                 chapter.            (line 1349)
+* " <1>:                                 chapter.            (line  685)
+* " <2>:                                 chapter.            (line 1353)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  683)
-* -option <2>:                           chapter.            (line 1349)
-* .:                                     chapter.            (line 2157)
-* ?:                                     chapter.            (line 2157)
-* a:                                     chapter.            (line 2157)
-* aaa, bbb:                              chapter.            (line 2157)
-* a--a:                                  chapter.            (line 2157)
-* a--asis:                               chapter.            (line  520)
-* a--asis <1>:                           chapter.            (line 1175)
-* a--asis <2>:                           chapter.            (line 1972)
-* b:                                     chapter.            (line  521)
-* b <1>:                                 chapter.            (line 1176)
-* b <2>:                                 chapter.            (line 1973)
-* b--b, c--c:                            chapter.            (line 2157)
-* counting entry:                        chapter.            (line 2491)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2157)
-* d--efcv_name:                          chapter.            (line  357)
-* d--efcv_name <1>:                      chapter.            (line  360)
-* d--efcv_name <2>:                      chapter.            (line 1012)
-* d--efcv_name <3>:                      chapter.            (line 1015)
-* d--efcv_name <4>:                      chapter.            (line 1810)
-* d--efcv_name <5>:                      chapter.            (line 1813)
-* d--efivar_name of c--lass:             chapter.            (line  402)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1057)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1855)
-* d--efopt_name:                         chapter.            (line  393)
-* d--efopt_name <1>:                     chapter.            (line 1048)
-* d--efopt_name <2>:                     chapter.            (line 1846)
-* d--eftypecv_name of c--lass:           chapter.            (line  363)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  366)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1018)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1816)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1819)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  434)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  439)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1094)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1888)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1893)
-* d--eftypeivar_name of c--lass:         chapter.            (line  405)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1060)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1858)
-* d--eftypevar_name:                     chapter.            (line  399)
-* d--eftypevar_name <1>:                 chapter.            (line 1054)
-* d--eftypevar_name <2>:                 chapter.            (line 1852)
-* d--eftypevr_name:                      chapter.            (line  354)
-* d--eftypevr_name <1>:                  chapter.            (line 1009)
-* d--eftypevr_name <2>:                  chapter.            (line 1807)
-* d--efvar_name:                         chapter.            (line  387)
-* d--efvar_name <1>:                     chapter.            (line  390)
-* d--efvar_name <2>:                     chapter.            (line 1042)
-* d--efvar_name <3>:                     chapter.            (line 1045)
-* d--efvar_name <4>:                     chapter.            (line 1840)
-* d--efvar_name <5>:                     chapter.            (line 1843)
-* d--efvr_name:                          chapter.            (line  333)
-* d--efvr_name <1>:                      chapter.            (line  988)
-* d--efvr_name <2>:                      chapter.            (line 1786)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2157)
-* index entry between item and itemx:    chapter.            (line  525)
-* index entry between item and itemx <1>: chapter.           (line  626)
-* index entry between item and itemx <2>: chapter.           (line 1180)
-* index entry between item and itemx <3>: chapter.           (line 1281)
-* index entry between item and itemx <4>: chapter.           (line 1977)
-* index entry between item and itemx <5>: chapter.           (line 2106)
-* index entry in footnote:               chapter.            (line 2486)
-* index entry within deffn:              chapter.            (line  304)
-* index entry within deffn <1>:          chapter.            (line  959)
-* index entry within deffn <2>:          chapter.            (line 1755)
-* index entry within itemize:            chapter.            (line  209)
-* index entry within itemize <1>:        chapter.            (line  864)
-* index entry within itemize <2>:        chapter.            (line 1660)
-* index entry within multitable:         chapter.            (line  234)
-* index entry within multitable <1>:     chapter.            (line  889)
-* index entry within multitable <2>:     chapter.            (line 1686)
-* t-ruc:                                 chapter.            (line 2157)
-* T-ruc:                                 chapter.            (line 2157)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  788)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1583)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  783)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1578)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  798)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1593)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  793)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1588)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  790)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1585)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
+* -option <1>:                           chapter.            (line  685)
+* -option <2>:                           chapter.            (line 1353)
+* .:                                     chapter.            (line 2162)
+* ?:                                     chapter.            (line 2162)
+* a:                                     chapter.            (line 2162)
+* aaa, bbb:                              chapter.            (line 2162)
+* a--a:                                  chapter.            (line 2162)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1179)
+* a--asis <2>:                           chapter.            (line 1977)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1180)
+* b <2>:                                 chapter.            (line 1978)
+* b--b, c--c:                            chapter.            (line 2162)
+* counting entry:                        chapter.            (line 2496)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2162)
+* d--efcv_name:                          chapter.            (line  359)
+* d--efcv_name <1>:                      chapter.            (line  362)
+* d--efcv_name <2>:                      chapter.            (line 1016)
+* d--efcv_name <3>:                      chapter.            (line 1019)
+* d--efcv_name <4>:                      chapter.            (line 1815)
+* d--efcv_name <5>:                      chapter.            (line 1818)
+* d--efivar_name of c--lass:             chapter.            (line  404)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1061)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1860)
+* d--efopt_name:                         chapter.            (line  395)
+* d--efopt_name <1>:                     chapter.            (line 1052)
+* d--efopt_name <2>:                     chapter.            (line 1851)
+* d--eftypecv_name of c--lass:           chapter.            (line  365)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  368)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1022)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1025)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1821)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1824)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  436)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  441)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1093)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1893)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1898)
+* d--eftypeivar_name of c--lass:         chapter.            (line  407)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1064)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1863)
+* d--eftypevar_name:                     chapter.            (line  401)
+* d--eftypevar_name <1>:                 chapter.            (line 1058)
+* d--eftypevar_name <2>:                 chapter.            (line 1857)
+* d--eftypevr_name:                      chapter.            (line  356)
+* d--eftypevr_name <1>:                  chapter.            (line 1013)
+* d--eftypevr_name <2>:                  chapter.            (line 1812)
+* d--efvar_name:                         chapter.            (line  389)
+* d--efvar_name <1>:                     chapter.            (line  392)
+* d--efvar_name <2>:                     chapter.            (line 1046)
+* d--efvar_name <3>:                     chapter.            (line 1049)
+* d--efvar_name <4>:                     chapter.            (line 1845)
+* d--efvar_name <5>:                     chapter.            (line 1848)
+* d--efvr_name:                          chapter.            (line  335)
+* d--efvr_name <1>:                      chapter.            (line  992)
+* d--efvr_name <2>:                      chapter.            (line 1791)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2162)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  628)
+* index entry between item and itemx <2>: chapter.           (line 1184)
+* index entry between item and itemx <3>: chapter.           (line 1285)
+* index entry between item and itemx <4>: chapter.           (line 1982)
+* index entry between item and itemx <5>: chapter.           (line 2111)
+* index entry in footnote:               chapter.            (line 2491)
+* index entry within deffn:              chapter.            (line  306)
+* index entry within deffn <1>:          chapter.            (line  963)
+* index entry within deffn <2>:          chapter.            (line 1760)
+* index entry within itemize:            chapter.            (line  211)
+* index entry within itemize <1>:        chapter.            (line  868)
+* index entry within itemize <2>:        chapter.            (line 1665)
+* index entry within multitable:         chapter.            (line  236)
+* index entry within multitable <1>:     chapter.            (line  893)
+* index entry within multitable <2>:     chapter.            (line 1691)
+* t-ruc:                                 chapter.            (line 2162)
+* T-ruc:                                 chapter.            (line 2162)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  135)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  792)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1588)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  130)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  787)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1583)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  145)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  802)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1598)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  140)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  797)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1593)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  137)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  794)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1590)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  132)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  785)
+                                                             (line  789)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1580)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
+                                                             (line 1585)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  147)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  800)
+                                                             (line  804)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1595)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
+                                                             (line 1600)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  142)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  795)
+                                                             (line  799)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1590)
+                                                             (line 1595)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  683)
-* --foption <2>:                         chapter.            (line 1349)
-* .:                                     chapter.            (line 2157)
-* ?:                                     chapter.            (line 2157)
+* --foption <1>:                         chapter.            (line  685)
+* --foption <2>:                         chapter.            (line 1353)
+* .:                                     chapter.            (line 2162)
+* ?:                                     chapter.            (line 2162)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  683)
-* `` <2>:                                chapter.            (line 1349)
-* a:                                     chapter.            (line  321)
-* a <1>:                                 chapter.            (line  524)
-* a <2>:                                 chapter.            (line  625)
-* a <3>:                                 chapter.            (line  976)
-* a <4>:                                 chapter.            (line 1179)
-* a <5>:                                 chapter.            (line 1280)
-* a <6>:                                 chapter.            (line 1772)
-* a <7>:                                 chapter.            (line 1976)
-* a <8>:                                 chapter.            (line 2105)
-* a <9>:                                 chapter.            (line 2157)
-* after:                                 chapter.            (line  636)
-* after <1>:                             chapter.            (line 1291)
-* after <2>:                             chapter.            (line 2116)
-* arg2:                                  chapter.            (line  444)
-* arg2 <1>:                              chapter.            (line 1099)
-* arg2 <2>:                              chapter.            (line 1898)
-* b:                                     chapter.            (line  525)
-* b <1>:                                 chapter.            (line  626)
-* b <2>:                                 chapter.            (line 1180)
-* b <3>:                                 chapter.            (line 1281)
-* b <4>:                                 chapter.            (line 1977)
-* b <5>:                                 chapter.            (line 2106)
-* bidule machin:                         chapter.            (line  315)
-* bidule machin <1>:                     chapter.            (line  970)
-* bidule machin <2>:                     chapter.            (line 1766)
-* d--effn_name:                          chapter.            (line  296)
-* d--effn_name <1>:                      chapter.            (line  951)
-* d--effn_name <2>:                      chapter.            (line 1747)
-* d--efmac_name:                         chapter.            (line  381)
-* d--efmac_name <1>:                     chapter.            (line 1036)
-* d--efmac_name <2>:                     chapter.            (line 1834)
-* d--efmethod_name on c--lass:           chapter.            (line  408)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1063)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1861)
-* d--efop_name on c--lass:               chapter.            (line  369)
-* d--efop_name on c--lass <1>:           chapter.            (line  372)
-* d--efop_name on c--lass <2>:           chapter.            (line 1024)
-* d--efop_name on c--lass <3>:           chapter.            (line 1027)
-* d--efop_name on c--lass <4>:           chapter.            (line 1822)
-* d--efop_name on c--lass <5>:           chapter.            (line 1825)
-* d--efspec_name:                        chapter.            (line  384)
-* d--efspec_name <1>:                    chapter.            (line 1039)
-* d--efspec_name <2>:                    chapter.            (line 1837)
-* d--eftypefn_name:                      chapter.            (line  342)
-* d--eftypefn_name <1>:                  chapter.            (line  345)
-* d--eftypefn_name <2>:                  chapter.            (line  997)
-* d--eftypefn_name <3>:                  chapter.            (line 1000)
-* d--eftypefn_name <4>:                  chapter.            (line 1795)
-* d--eftypefn_name <5>:                  chapter.            (line 1798)
-* d--eftypefn_name2:                     chapter.            (line  419)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1074)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1873)
-* d--eftypefun_name:                     chapter.            (line  396)
-* d--eftypefun_name <1>:                 chapter.            (line 1051)
-* d--eftypefun_name <2>:                 chapter.            (line 1849)
-* d--eftypemethod_name on c--lass:       chapter.            (line  411)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1066)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1864)
-* d--eftypeop_name on c--lass:           chapter.            (line  348)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  351)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1003)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1801)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1804)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  424)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  429)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1079)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1084)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1878)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1883)
-* d--efun_name:                          chapter.            (line  378)
-* d--efun_name <1>:                      chapter.            (line 1033)
-* d--efun_name <2>:                      chapter.            (line 1831)
-* de--ffn_name:                          chapter.            (line  299)
-* de--ffn_name <1>:                      chapter.            (line  954)
-* de--ffn_name <2>:                      chapter.            (line 1750)
-* deffn:                                 chapter.            (line  324)
-* deffn <1>:                             chapter.            (line  326)
-* deffn <2>:                             chapter.            (line  979)
-* deffn <3>:                             chapter.            (line  981)
-* deffn <4>:                             chapter.            (line 1776)
-* deffn <5>:                             chapter.            (line 1778)
-* deffnx:                                chapter.            (line  322)
-* deffnx <1>:                            chapter.            (line  327)
-* deffnx <2>:                            chapter.            (line  977)
-* deffnx <3>:                            chapter.            (line  982)
-* deffnx <4>:                            chapter.            (line 1773)
-* deffnx <5>:                            chapter.            (line 1779)
-* f---aa:                                chapter.            (line 2157)
-* f---bb, f---cc:                        chapter.            (line 2157)
-* f---ddd, f---eee, ffff:                chapter.            (line 2157)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2157)
-* followed:                              chapter.            (line  318)
-* followed <1>:                          chapter.            (line  634)
-* followed <2>:                          chapter.            (line  973)
-* followed <3>:                          chapter.            (line 1289)
-* followed <4>:                          chapter.            (line 1769)
-* followed <5>:                          chapter.            (line 2114)
-* I:                                     chapter.            (line  303)
-* I <1>:                                 chapter.            (line  329)
-* I <2>:                                 chapter.            (line  958)
-* I <3>:                                 chapter.            (line  984)
-* I <4>:                                 chapter.            (line 1754)
-* I <5>:                                 chapter.            (line 1781)
-* id i ule:                              chapter.            (line  309)
-* id i ule <1>:                          chapter.            (line  964)
-* id i ule <2>:                          chapter.            (line 1760)
-* id ule:                                chapter.            (line  308)
-* id ule <1>:                            chapter.            (line  963)
-* id ule <2>:                            chapter.            (line 1759)
-* log trap:                              chapter.            (line  305)
-* log trap <1>:                          chapter.            (line  960)
-* log trap <2>:                          chapter.            (line 1756)
-* log trap1:                             chapter.            (line  306)
-* log trap1 <1>:                         chapter.            (line  961)
-* log trap1 <2>:                         chapter.            (line 1757)
-* log trap2:                             chapter.            (line  307)
-* log trap2 <1>:                         chapter.            (line  962)
-* log trap2 <2>:                         chapter.            (line 1758)
-* machin:                                chapter.            (line  314)
-* machin <1>:                            chapter.            (line  316)
-* machin <2>:                            chapter.            (line  630)
-* machin <3>:                            chapter.            (line  631)
-* machin <4>:                            chapter.            (line  632)
-* machin <5>:                            chapter.            (line  633)
-* machin <6>:                            chapter.            (line  969)
-* machin <7>:                            chapter.            (line  971)
-* machin <8>:                            chapter.            (line 1285)
-* machin <9>:                            chapter.            (line 1286)
-* machin <10>:                           chapter.            (line 1287)
-* machin <11>:                           chapter.            (line 1288)
-* machin <12>:                           chapter.            (line 1765)
-* machin <13>:                           chapter.            (line 1767)
-* machin <14>:                           chapter.            (line 2110)
-* machin <15>:                           chapter.            (line 2111)
-* machin <16>:                           chapter.            (line 2112)
-* machin <17>:                           chapter.            (line 2113)
-* n--ame:                                chapter.            (line  336)
-* n--ame <1>:                            chapter.            (line  339)
-* n--ame <2>:                            chapter.            (line  991)
-* n--ame <3>:                            chapter.            (line  994)
-* n--ame <4>:                            chapter.            (line 1789)
-* n--ame <5>:                            chapter.            (line 1792)
-* name2:                                 chapter.            (line  414)
-* name2 <1>:                             chapter.            (line 1069)
-* name2 <2>:                             chapter.            (line 1868)
-* t--ruc:                                chapter.            (line 2157)
-* T--ruc:                                chapter.            (line 2157)
-* truc:                                  chapter.            (line  304)
-* truc <1>:                              chapter.            (line  330)
-* truc <2>:                              chapter.            (line  959)
-* truc <3>:                              chapter.            (line  985)
-* truc <4>:                              chapter.            (line 1755)
-* truc <5>:                              chapter.            (line 1782)
-* xxx, zzz:                              chapter.            (line 2157)
+* `` <1>:                                chapter.            (line  685)
+* `` <2>:                                chapter.            (line 1353)
+* a:                                     chapter.            (line  323)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  627)
+* a <3>:                                 chapter.            (line  980)
+* a <4>:                                 chapter.            (line 1183)
+* a <5>:                                 chapter.            (line 1284)
+* a <6>:                                 chapter.            (line 1777)
+* a <7>:                                 chapter.            (line 1981)
+* a <8>:                                 chapter.            (line 2110)
+* a <9>:                                 chapter.            (line 2162)
+* after:                                 chapter.            (line  638)
+* after <1>:                             chapter.            (line 1295)
+* after <2>:                             chapter.            (line 2121)
+* arg2:                                  chapter.            (line  446)
+* arg2 <1>:                              chapter.            (line 1103)
+* arg2 <2>:                              chapter.            (line 1903)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  628)
+* b <2>:                                 chapter.            (line 1184)
+* b <3>:                                 chapter.            (line 1285)
+* b <4>:                                 chapter.            (line 1982)
+* b <5>:                                 chapter.            (line 2111)
+* bidule machin:                         chapter.            (line  317)
+* bidule machin <1>:                     chapter.            (line  974)
+* bidule machin <2>:                     chapter.            (line 1771)
+* d--effn_name:                          chapter.            (line  298)
+* d--effn_name <1>:                      chapter.            (line  955)
+* d--effn_name <2>:                      chapter.            (line 1752)
+* d--efmac_name:                         chapter.            (line  383)
+* d--efmac_name <1>:                     chapter.            (line 1040)
+* d--efmac_name <2>:                     chapter.            (line 1839)
+* d--efmethod_name on c--lass:           chapter.            (line  410)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1067)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1866)
+* d--efop_name on c--lass:               chapter.            (line  371)
+* d--efop_name on c--lass <1>:           chapter.            (line  374)
+* d--efop_name on c--lass <2>:           chapter.            (line 1028)
+* d--efop_name on c--lass <3>:           chapter.            (line 1031)
+* d--efop_name on c--lass <4>:           chapter.            (line 1827)
+* d--efop_name on c--lass <5>:           chapter.            (line 1830)
+* d--efspec_name:                        chapter.            (line  386)
+* d--efspec_name <1>:                    chapter.            (line 1043)
+* d--efspec_name <2>:                    chapter.            (line 1842)
+* d--eftypefn_name:                      chapter.            (line  344)
+* d--eftypefn_name <1>:                  chapter.            (line  347)
+* d--eftypefn_name <2>:                  chapter.            (line 1001)
+* d--eftypefn_name <3>:                  chapter.            (line 1004)
+* d--eftypefn_name <4>:                  chapter.            (line 1800)
+* d--eftypefn_name <5>:                  chapter.            (line 1803)
+* d--eftypefn_name2:                     chapter.            (line  421)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1078)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1878)
+* d--eftypefun_name:                     chapter.            (line  398)
+* d--eftypefun_name <1>:                 chapter.            (line 1055)
+* d--eftypefun_name <2>:                 chapter.            (line 1854)
+* d--eftypemethod_name on c--lass:       chapter.            (line  413)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1070)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1869)
+* d--eftypeop_name on c--lass:           chapter.            (line  350)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  353)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1007)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1010)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1806)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1809)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  426)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  431)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1083)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1883)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1888)
+* d--efun_name:                          chapter.            (line  380)
+* d--efun_name <1>:                      chapter.            (line 1037)
+* d--efun_name <2>:                      chapter.            (line 1836)
+* de--ffn_name:                          chapter.            (line  301)
+* de--ffn_name <1>:                      chapter.            (line  958)
+* de--ffn_name <2>:                      chapter.            (line 1755)
+* deffn:                                 chapter.            (line  326)
+* deffn <1>:                             chapter.            (line  328)
+* deffn <2>:                             chapter.            (line  983)
+* deffn <3>:                             chapter.            (line  985)
+* deffn <4>:                             chapter.            (line 1781)
+* deffn <5>:                             chapter.            (line 1783)
+* deffnx:                                chapter.            (line  324)
+* deffnx <1>:                            chapter.            (line  329)
+* deffnx <2>:                            chapter.            (line  981)
+* deffnx <3>:                            chapter.            (line  986)
+* deffnx <4>:                            chapter.            (line 1778)
+* deffnx <5>:                            chapter.            (line 1784)
+* f---aa:                                chapter.            (line 2162)
+* f---bb, f---cc:                        chapter.            (line 2162)
+* f---ddd, f---eee, ffff:                chapter.            (line 2162)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2162)
+* followed:                              chapter.            (line  320)
+* followed <1>:                          chapter.            (line  636)
+* followed <2>:                          chapter.            (line  977)
+* followed <3>:                          chapter.            (line 1293)
+* followed <4>:                          chapter.            (line 1774)
+* followed <5>:                          chapter.            (line 2119)
+* I:                                     chapter.            (line  305)
+* I <1>:                                 chapter.            (line  331)
+* I <2>:                                 chapter.            (line  962)
+* I <3>:                                 chapter.            (line  988)
+* I <4>:                                 chapter.            (line 1759)
+* I <5>:                                 chapter.            (line 1786)
+* id i ule:                              chapter.            (line  311)
+* id i ule <1>:                          chapter.            (line  968)
+* id i ule <2>:                          chapter.            (line 1765)
+* id ule:                                chapter.            (line  310)
+* id ule <1>:                            chapter.            (line  967)
+* id ule <2>:                            chapter.            (line 1764)
+* log trap:                              chapter.            (line  307)
+* log trap <1>:                          chapter.            (line  964)
+* log trap <2>:                          chapter.            (line 1761)
+* log trap1:                             chapter.            (line  308)
+* log trap1 <1>:                         chapter.            (line  965)
+* log trap1 <2>:                         chapter.            (line 1762)
+* log trap2:                             chapter.            (line  309)
+* log trap2 <1>:                         chapter.            (line  966)
+* log trap2 <2>:                         chapter.            (line 1763)
+* machin:                                chapter.            (line  316)
+* machin <1>:                            chapter.            (line  318)
+* machin <2>:                            chapter.            (line  632)
+* machin <3>:                            chapter.            (line  633)
+* machin <4>:                            chapter.            (line  634)
+* machin <5>:                            chapter.            (line  635)
+* machin <6>:                            chapter.            (line  973)
+* machin <7>:                            chapter.            (line  975)
+* machin <8>:                            chapter.            (line 1289)
+* machin <9>:                            chapter.            (line 1290)
+* machin <10>:                           chapter.            (line 1291)
+* machin <11>:                           chapter.            (line 1292)
+* machin <12>:                           chapter.            (line 1770)
+* machin <13>:                           chapter.            (line 1772)
+* machin <14>:                           chapter.            (line 2115)
+* machin <15>:                           chapter.            (line 2116)
+* machin <16>:                           chapter.            (line 2117)
+* machin <17>:                           chapter.            (line 2118)
+* n--ame:                                chapter.            (line  338)
+* n--ame <1>:                            chapter.            (line  341)
+* n--ame <2>:                            chapter.            (line  995)
+* n--ame <3>:                            chapter.            (line  998)
+* n--ame <4>:                            chapter.            (line 1794)
+* n--ame <5>:                            chapter.            (line 1797)
+* name2:                                 chapter.            (line  416)
+* name2 <1>:                             chapter.            (line 1073)
+* name2 <2>:                             chapter.            (line 1873)
+* t--ruc:                                chapter.            (line 2162)
+* T--ruc:                                chapter.            (line 2162)
+* truc:                                  chapter.            (line  306)
+* truc <1>:                              chapter.            (line  332)
+* truc <2>:                              chapter.            (line  963)
+* truc <3>:                              chapter.            (line  989)
+* truc <4>:                              chapter.            (line 1760)
+* truc <5>:                              chapter.            (line 1787)
+* xxx, zzz:                              chapter.            (line 2162)
 
 Top section
 1 chapter
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
index 33e68c415e..84fefce2b6 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -150,6 +150,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -966,6 +967,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index ed1b6fb79c..bf1ba7f365 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -121,6 +121,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2040,7 +2042,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3132,7 +3135,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4195,6 +4199,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
@@ -5406,7 +5411,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting 
b/tp/tests/layout/res_parser/formatting_textcontent/formatting
index 22be47a391..50c7ac90d7 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -124,6 +124,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -917,6 +918,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -1731,6 +1733,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -2519,6 +2522,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
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 140e84beb6..00c9664ac5 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 28e7d846b8..1523cecd6d 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -122,6 +122,7 @@ but , ,
 @guillemotright >>
 @guilsinglleft <
 @guilsinglright >
+
 @textdegree o
 @euro Euro
 @arrow ->
@@ -981,7 +982,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -2041,7 +2043,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -3156,7 +3159,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -4214,7 +4218,8 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
-@textdegree &deg;
+</p>
+<p>@textdegree &deg;
 @euro &euro;
 @arrow &rarr;
 @leq &le;
@@ -5278,6 +5283,7 @@ but , ,
 @guillemotright &raquo;
 @guilsinglleft &lsaquo;
 @guilsinglright &rsaquo;
+
 @textdegree &deg;
 @euro &euro;
 @arrow &rarr;
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 9b2b76bb86..e0d737fce1 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -130,6 +130,7 @@ but , ,@:
 @@guillemotright @guillemotright{}
 @@guilsinglleft @guilsinglleft{}
 @@guilsinglright @guilsinglright{}
+
 @@textdegree @textdegree{}
 @@euro @euro{}
 @@arrow @arrow{}
@@ -1215,7 +1216,8 @@ but , ,&noeos;
 &arobase;guillemotright &guillemotright;
 &arobase;guilsinglleft &lsaquo;
 &arobase;guilsinglright &rsaquo;
-&arobase;textdegree &deg;
+</para>
+<para>&arobase;textdegree &deg;
 &arobase;euro &euro;
 &arobase;arrow &rarr;
 &arobase;leq &le;
@@ -2285,7 +2287,8 @@ but , ,&noeos;
 &arobase;guillemotright &guillemotright;
 &arobase;guilsinglleft &lsaquo;
 &arobase;guilsinglright &rsaquo;
-&arobase;textdegree &deg;
+</para>
+<para>&arobase;textdegree &deg;
 &arobase;euro &euro;
 &arobase;arrow &rarr;
 &arobase;leq &le;
@@ -3382,7 +3385,8 @@ but , ,&noeos;
 &arobase;guillemotright &guillemotright;
 &arobase;guilsinglleft &lsaquo;
 &arobase;guilsinglright &rsaquo;
-&arobase;textdegree &deg;
+</para>
+<para>&arobase;textdegree &deg;
 &arobase;euro &euro;
 &arobase;arrow &rarr;
 &arobase;leq &le;
@@ -4446,6 +4450,7 @@ but , ,&noeos;
 &arobase;guillemotright &guillemotright;
 &arobase;guilsinglleft &lsaquo;
 &arobase;guilsinglright &rsaquo;
+
 &arobase;textdegree &deg;
 &arobase;euro &euro;
 &arobase;arrow &rarr;



reply via email to

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