texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/tests/coverage_macro.texi: add UTF-8 encoded


From: Patrice Dumas
Subject: branch master updated: * tp/tests/coverage_macro.texi: add UTF-8 encoded characters near to @-commands to be able to check visually the difference in formatting.
Date: Fri, 11 Nov 2022 10:05:16 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 67fb0e0777 * tp/tests/coverage_macro.texi: add UTF-8 encoded 
characters near to @-commands to be able to check visually the difference in 
formatting.
67fb0e0777 is described below

commit 67fb0e0777833b76cdff3c8f0d172fde27fb9f2b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 11 16:05:01 2022 +0100

    * tp/tests/coverage_macro.texi: add UTF-8 encoded characters near to
    @-commands to be able to check visually the difference in formatting.
---
 ChangeLog                                          |    7 +-
 tp/tests/coverage_macro.texi                       |  107 +-
 .../layout/res_parser/formatting/formatting.html   |  642 +++++-----
 .../layout/res_parser/formatting_chm/anchor.html   |  107 +-
 .../layout/res_parser/formatting_chm/chapter.html  |  420 ++++---
 .../layout/res_parser/formatting_chm/chapter2.html |  107 +-
 .../res_parser/formatting_chm/formatting.html      |  321 ++---
 .../res_parser/formatting_chm/formatting_abt.html  |  107 +-
 .../res_parser/formatting_chm/formatting_ovr.html  |  107 +-
 .../res_parser/formatting_chm/formatting_toc.html  |  107 +-
 .../layout/res_parser/formatting_chm/index.html    |  107 +-
 .../formatting_chm/s_002d_002dect_002cion.html     |  107 +-
 .../res_parser/formatting_chm/subsection.html      |  107 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  107 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  107 +-
 .../res_parser/formatting_docbook/formatting.xml   |  428 ++++---
 .../formatting_enable_encoding/formatting.html     |  642 +++++-----
 .../EPUB/xhtml/chapter.xhtml                       |  420 ++++---
 .../EPUB/xhtml/chapter2.xhtml                      |  107 +-
 .../EPUB/xhtml/formatting.xhtml                    |  321 ++---
 .../EPUB/xhtml/formatting_abt.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |  107 +-
 .../EPUB/xhtml/chapter.xhtml                       |  420 ++++---
 .../EPUB/xhtml/chapter2.xhtml                      |  107 +-
 .../EPUB/xhtml/formatting.xhtml                    |  321 ++---
 .../EPUB/xhtml/formatting_abt.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |  107 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |  107 +-
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |  107 +-
 .../EPUB/xhtml/subsection.xhtml                    |  107 +-
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |  107 +-
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |  107 +-
 .../res_parser/formatting_exotic/anchor.html       |  107 +-
 .../res_parser/formatting_exotic/chapter.html      |  420 ++++---
 .../res_parser/formatting_exotic/chapter2.html     |  107 +-
 .../formatting_exotic/formatting_abt.html          |  107 +-
 .../formatting_exotic/formatting_ovr.html          |  107 +-
 .../formatting_exotic/formatting_toc.html          |  107 +-
 .../layout/res_parser/formatting_exotic/index.html |  107 +-
 .../formatting_exotic/s_002d_002dect_002cion.html  |  107 +-
 .../res_parser/formatting_exotic/subsection.html   |  107 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  107 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  107 +-
 .../res_parser/formatting_fr_icons/formatting.html |  642 +++++-----
 .../res_parser/formatting_html/formatting.html     |  642 +++++-----
 .../res_parser/formatting_html32/formatting.html   |  642 +++++-----
 .../formatting_html_no_texi2html/formatting.html   |  420 ++++---
 .../res_parser/formatting_html_nodes/anchor.html   |  107 +-
 .../res_parser/formatting_html_nodes/chapter.html  |  420 ++++---
 .../res_parser/formatting_html_nodes/chapter2.html |  107 +-
 .../formatting_html_nodes/formatting_abt.html      |  107 +-
 .../formatting_html_nodes/formatting_fot.html      |  107 +-
 .../formatting_html_nodes/formatting_ovr.html      |  107 +-
 .../formatting_html_nodes/formatting_toc.html      |  107 +-
 .../res_parser/formatting_html_nodes/index.html    |  321 ++---
 .../s_002d_002dect_002cion.html                    |  107 +-
 .../formatting_html_nodes/subsection.html          |  107 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  107 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  107 +-
 .../res_parser/formatting_info/formatting.info     | 1297 ++++++++++----------
 .../formatting_inline_css/formatting.html          |  642 +++++-----
 .../res_parser/formatting_latex/formatting.tex     |  535 ++++----
 .../formatting_macro_expand/formatting.texi        |  535 ++++----
 .../res_parser/formatting_mathjax/formatting.html  |  642 +++++-----
 .../layout/res_parser/formatting_nodes/anchor.html |  107 +-
 .../res_parser/formatting_nodes/chapter.html       |  420 ++++---
 .../res_parser/formatting_nodes/chapter2.html      |  107 +-
 .../formatting_nodes/formatting_abt.html           |  107 +-
 .../formatting_nodes/formatting_fot.html           |  107 +-
 .../formatting_nodes/formatting_ovr.html           |  107 +-
 .../formatting_nodes/formatting_toc.html           |  107 +-
 .../layout/res_parser/formatting_nodes/index.html  |  321 ++---
 .../formatting_nodes/s_002d_002dect_002cion.html   |  107 +-
 .../res_parser/formatting_nodes/subsection.html    |  107 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  107 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  107 +-
 .../formatting_numerical_entities/formatting.html  |  642 +++++-----
 .../res_parser/formatting_plaintext/formatting.txt | 1237 ++++++++++---------
 .../res_parser/formatting_rawtext/formatting.txt   |  214 ++--
 .../formatting_regions/formatting_regions.html     |  642 +++++-----
 .../formatting_sort_element_counts/formatting.html |  642 +++++-----
 .../formatting_elt_counts.txt                      |    4 +-
 .../res_parser/formatting_textcontent/formatting   |  428 ++++---
 .../formatting_weird_quotes/formatting.html        |  642 +++++-----
 .../res_parser/formatting_xhtml/formatting.html    |  642 +++++-----
 .../res_parser/formatting_xml/formatting.xml       |  535 ++++----
 .../res_parser/formatting_singular/anchor.html     |  107 +-
 .../res_parser/formatting_singular/chapter.html    |  420 ++++---
 .../res_parser/formatting_singular/chapter2.html   |  107 +-
 .../res_parser/formatting_singular/index.htm       |  107 +-
 .../res_parser/formatting_singular/index.html      |  107 +-
 .../s_002d_002dect_002cion.html                    |  107 +-
 .../res_parser/formatting_singular/sing_abt.htm    |  107 +-
 .../res_parser/formatting_singular/sing_fot.htm    |  107 +-
 .../res_parser/formatting_singular/sing_ovr.htm    |  107 +-
 .../res_parser/formatting_singular/sing_toc.htm    |  107 +-
 .../res_parser/formatting_singular/subsection.html |  107 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  107 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  107 +-
 102 files changed, 13292 insertions(+), 11766 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de9aad5840..4aabb5280a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2022-11-09  Gavin Smith  <gavinsmith0123@gmail.com>
+2022-11-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/tests/coverage_macro.texi: add UTF-8 encoded characters near to
+       @-commands to be able to check visually the difference in formatting.
+
+2022-11-10  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/Common.pm, tp/Texinfo/Convert/HTML.pm,
        tp/Texinfo/Convert/Utils.pm, tp/Texinfo/Translations.pm: edits
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 3e74954790..962fa9c162 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -63,62 +63,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 29d34bc31c..936495427b 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index d8732d61a9..e9e1c3b0a1 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 74f995f644..8821145dbd 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -954,62 +961,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#339;
-@AE &AElig;
-@OE &#338;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#339; (œ)
+@AE &AElig; (Æ)
+@OE &#338; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &#8364;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &#8364; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2030,62 +2044,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#339;
-@AE &AElig;
-@OE &#338;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#339; (œ)
+@AE &AElig; (Æ)
+@OE &#338; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &#8364;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &#8364; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3112,62 +3133,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#339;
-@AE &AElig;
-@OE &#338;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &#8364;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#339; (œ)
+@AE &AElig; (Æ)
+@OE &#338; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &#8364; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 05827fd01c..efff195eba 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 92d64bfda5..ed141f6bd3 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -940,62 +947,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#339;
-@AE &AElig;
-@OE &#338;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &#8364;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#339; (œ)
+@AE &AElig; (Æ)
+@OE &#338; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &#8364; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2018,62 +2032,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#339;
-@AE &AElig;
-@OE &#338;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &#8364;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#339; (œ)
+@AE &AElig; (Æ)
+@OE &#338; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &#8364; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
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 c1bb29c032..e989dee798 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 6eaa989b50..9930510cf0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 592f774290..904de8cda9 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 6222e5063a..ac4706b5c1 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 de94b0f213..df0b59c9b9 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 23f995693b..92b4f92ee9 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 7e3f160fb0..fcab032ac2 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 acf4f74b8c..2780aba24b 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index e3885efb68..a9c74a11b6 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -88,62 +88,69 @@ And ? ?.
 Now ! !@
 but , ,
 </para>
+<para>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</para>
 <para>@TeX &tex;
 @LaTeX &latex;
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </para>
-<para>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</para>
-<para>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</para>
-<para>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<para>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</para>
+<para>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</para>
+<para>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </para>
 <para><literal>@acronym{--a,an accronym}</literal> <acronym>&#8211;a</acronym> 
(an accronym)
@@ -1005,62 +1012,69 @@ And ? ?.
 Now ! !@
 but , ,
 </para>
+<para>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</para>
 <para>@TeX &tex;
 @LaTeX &latex;
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </para>
-<para>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</para>
-<para>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</para>
-<para>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<para>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</para>
+<para>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</para>
+<para>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </para>
 <para><literal>@acronym{--a,an accronym}</literal> <acronym>&#8211;a</acronym> 
(an accronym)
@@ -1909,62 +1923,69 @@ And ? ?.
 Now ! !@
 but , ,
 </para>
+<para>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</para>
 <para>@TeX &tex;
 @LaTeX &latex;
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </para>
-<para>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</para>
-<para>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</para>
-<para>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<para>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</para>
+<para>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</para>
+<para>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </para>
 <para><literal>@acronym{--a,an accronym}</literal> <acronym>&#8211;a</acronym> 
(an accronym)
@@ -2809,62 +2830,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+
 @TeX &tex;
 @LaTeX &latex;
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 
-@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-
-@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-
-@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+
+@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+
+@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 
 <literal>@acronym{--a,an accronym}</literal> <acronym>--a</acronym> (an 
accronym)
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 69950eb697..1b29f1e69b 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar & (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots <small class="enddots">...</small>
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 </p>
-<p>@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-</p>
-<p>@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-</p>
-<p>@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+<p>@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+</p>
+<p>@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+</p>
+<p>@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">–a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar & (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots <small class="enddots">...</small>
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 </p>
-<p>@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-</p>
-<p>@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-</p>
-<p>@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+<p>@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+</p>
+<p>@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+</p>
+<p>@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">–a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar & (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots <small class="enddots">...</small>
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 </p>
-<p>@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-</p>
-<p>@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-</p>
-<p>@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+<p>@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+</p>
+<p>@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+</p>
+<p>@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">–a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar & (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots <small class="enddots">...</small>
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 </p>
-<p>@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-</p>
-<p>@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-</p>
-<p>@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+<p>@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+</p>
+<p>@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+</p>
+<p>@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">–a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index b4892016a5..500a738148 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -954,62 +961,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
 </p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
 </p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -2030,62 +2044,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
 </p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
 </p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -3112,62 +3133,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 
-@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-
-@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-
-@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+
+@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+
+@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 655a1fa900..446f00d1a3 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 94fbf701b7..1b141b1bbd 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -939,62 +946,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -2017,62 +2031,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 823b95993a..7a7d8c5ff5 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 10b8366e04..e5f5b5427e 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index c9c2be2b35..6f1436189c 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 96df16bf61..b31a7fec44 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 5a7db53811..8815755b62 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -955,62 +962,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
 </p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
 </p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -2031,62 +2045,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
 </p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
 </p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -3113,62 +3134,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 
-@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-
-@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-
-@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+
+@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+
+@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
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 774cb4556c..f8ee43c022 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 8af4b5d722..026a43f87a 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -941,62 +948,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -2019,62 +2033,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
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 a48b59e231..63a6e8e20f 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 055f5a7576..1276baeb39 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 666cabe9b1..55fff1cb76 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 6284272b7c..6f3308fb1b 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 812e907f47..8f9330f3a6 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 08efc54868..24e83bc4e1 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 e99a64defd..b1c9159780 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 c6968d2247..96e197b8f2 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 2eac27e922..d732e8d5f2 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 3a840a03b4..81c29ec7ae 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -973,62 +980,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2049,62 +2063,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3131,62 +3152,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 8e2df03acb..bf7485b7cb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 1d43ba4665..f56c906344 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 4f19e2fb88..251553ed11 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 a00bcb40cf..a8bcb577ce 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index bac8d2bced..c9d3412b3d 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 aded9374ff..9afd995a7b 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 5f3e077660..58a0e6ef12 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 fb465ab541..2743079342 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 b50df0a305..1c1bdd7bb7 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
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 b9ba0aab43..e26327ac3d 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error erreur→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error erreur&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error erreur&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error erreur&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error erreur&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error erreur&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 29d34bc31c..936495427b 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index e31b502927..72301bcda3 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -918,62 +925,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright &copy;
-@dots <small>...</small>
+@bullet * (•)
+@copyright &copy; (©)
+@dots <small>...</small> (…)
 @enddots <small>...</small>
-@equiv ==
+@equiv == (≡)
 @error error-&gt;
-@expansion ==&gt;
-@minus -
-@point -!-
-@print -|
-@result =&gt;
+@expansion ==&gt; (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result =&gt; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#156;
-@AE &AElig;
-@OE &#140;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &#34;
-@quotedblright &#34;
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft &lt;&lt;
-@guillemetright &gt;&gt;
-@guillemotleft &lt;&lt;
-@guillemotright &gt;&gt;
-@guilsinglleft &lt;
-@guilsinglright &gt;
-</p>
-<p>@textdegree &deg;
-@euro Euro
-@arrow -&gt;
-@leq &lt;=
-@geq &gt;=
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#156; (œ)
+@AE &AElig; (Æ)
+@OE &#140; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &#34; (“)
+@quotedblright &#34; (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft &lt;&lt; («)
+@guillemetright &gt;&gt; (»)
+@guillemotleft &lt;&lt; («)
+@guillemotright &gt;&gt; (»)
+@guilsinglleft &lt; (‹)
+@guilsinglright &gt; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro Euro (€)
+@arrow -&gt; (→)
+@leq &lt;= (≤)
+@geq &gt;= (≥)
 @tie a&nbsp;b
 </p>
 <p><code>@acronym{--a,an accronym}</code> -a (an accronym)
@@ -1970,62 +1984,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright &copy;
-@dots <small>...</small>
+@bullet * (•)
+@copyright &copy; (©)
+@dots <small>...</small> (…)
 @enddots <small>...</small>
-@equiv ==
+@equiv == (≡)
 @error error-&gt;
-@expansion ==&gt;
-@minus -
-@point -!-
-@print -|
-@result =&gt;
+@expansion ==&gt; (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result =&gt; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#156;
-@AE &AElig;
-@OE &#140;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &#34;
-@quotedblright &#34;
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft &lt;&lt;
-@guillemetright &gt;&gt;
-@guillemotleft &lt;&lt;
-@guillemotright &gt;&gt;
-@guilsinglleft &lt;
-@guilsinglright &gt;
-</p>
-<p>@textdegree &deg;
-@euro Euro
-@arrow -&gt;
-@leq &lt;=
-@geq &gt;=
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#156; (œ)
+@AE &AElig; (Æ)
+@OE &#140; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &#34; (“)
+@quotedblright &#34; (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft &lt;&lt; («)
+@guillemetright &gt;&gt; (»)
+@guillemotleft &lt;&lt; («)
+@guillemotright &gt;&gt; (»)
+@guilsinglleft &lt; (‹)
+@guilsinglright &gt; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro Euro (€)
+@arrow -&gt; (→)
+@leq &lt;= (≤)
+@geq &gt;= (≥)
 @tie a&nbsp;b
 </p>
 <p><code>@acronym{--a,an accronym}</code> -a (an accronym)
@@ -3078,62 +3099,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright &copy;
-@dots <small>...</small>
+@bullet * (•)
+@copyright &copy; (©)
+@dots <small>...</small> (…)
 @enddots <small>...</small>
-@equiv ==
+@equiv == (≡)
 @error error-&gt;
-@expansion ==&gt;
-@minus -
-@point -!-
-@print -|
-@result =&gt;
+@expansion ==&gt; (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result =&gt; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#156;
-@AE &AElig;
-@OE &#140;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &#34;
-@quotedblright &#34;
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft &lt;&lt;
-@guillemetright &gt;&gt;
-@guillemotleft &lt;&lt;
-@guillemotright &gt;&gt;
-@guilsinglleft &lt;
-@guilsinglright &gt;
-</p>
-<p>@textdegree &deg;
-@euro Euro
-@arrow -&gt;
-@leq &lt;=
-@geq &gt;=
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#156; (œ)
+@AE &AElig; (Æ)
+@OE &#140; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &#34; (“)
+@quotedblright &#34; (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft &lt;&lt; («)
+@guillemetright &gt;&gt; (»)
+@guillemotleft &lt;&lt; («)
+@guillemotright &gt;&gt; (»)
+@guilsinglleft &lt; (‹)
+@guilsinglright &gt; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro Euro (€)
+@arrow -&gt; (→)
+@leq &lt;= (≤)
+@geq &gt;= (≥)
 @tie a&nbsp;b
 </p>
 <p><code>@acronym{--a,an accronym}</code> -a (an accronym)
@@ -4128,62 +4156,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright &copy;
-@dots <small>...</small>
+@bullet * (•)
+@copyright &copy; (©)
+@dots <small>...</small> (…)
 @enddots <small>...</small>
-@equiv ==
+@equiv == (≡)
 @error error-&gt;
-@expansion ==&gt;
-@minus -
-@point -!-
-@print -|
-@result =&gt;
+@expansion ==&gt; (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result =&gt; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#156;
-@AE &AElig;
-@OE &#140;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &#34;
-@quotedblright &#34;
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft &lt;&lt;
-@guillemetright &gt;&gt;
-@guillemotleft &lt;&lt;
-@guillemotright &gt;&gt;
-@guilsinglleft &lt;
-@guilsinglright &gt;
-</p>
-<p>@textdegree &deg;
-@euro Euro
-@arrow -&gt;
-@leq &lt;=
-@geq &gt;=
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#156; (œ)
+@AE &AElig; (Æ)
+@OE &#140; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &#34; (“)
+@quotedblright &#34; (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft &lt;&lt; («)
+@guillemetright &gt;&gt; (»)
+@guillemotleft &lt;&lt; («)
+@guillemotright &gt;&gt; (»)
+@guilsinglleft &lt; (‹)
+@guilsinglright &gt; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro Euro (€)
+@arrow -&gt; (→)
+@leq &lt;= (≤)
+@geq &gt;= (≥)
 @tie a&nbsp;b
 </p>
 <p><code>@acronym{--a,an accronym}</code> -a (an accronym)
@@ -5183,62 +5218,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright &copy;
-@dots ...
+@bullet * (•)
+@copyright &copy; (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-&gt;
-@expansion ==&gt;
-@minus -
-@point -!-
-@print -|
-@result =&gt;
+@expansion ==&gt; (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result =&gt; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &#156;
-@AE &AElig;
-@OE &#140;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &#34;
-@quotedblright &#34;
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft &lt;&lt;
-@guillemetright &gt;&gt;
-@guillemotleft &lt;&lt;
-@guillemotright &gt;&gt;
-@guilsinglleft &lt;
-@guilsinglright &gt;
-
-@textdegree &deg;
-@euro Euro
-@arrow -&gt;
-@leq &lt;=
-@geq &gt;=
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &#156; (œ)
+@AE &AElig; (Æ)
+@OE &#140; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &#34; (“)
+@quotedblright &#34; (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft &lt;&lt; («)
+@guillemetright &gt;&gt; (»)
+@guillemotleft &lt;&lt; («)
+@guillemotright &gt;&gt; (»)
+@guilsinglleft &lt; (‹)
+@guilsinglright &gt; (›)
+
+@textdegree &deg; (°)
+@euro Euro (€)
+@arrow -&gt; (→)
+@leq &lt;= (≤)
+@geq &gt;= (≥)
 @tie a&nbsp;b
 
 <code>@acronym{--a,an accronym}</code> --a (an accronym)
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 9edb2b22b8..9945ff770d 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -1012,62 +1019,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2088,62 +2102,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
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 d8732d61a9..e9e1c3b0a1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 c8d4762618..7de58faa40 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -974,62 +981,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2050,62 +2064,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3132,62 +3153,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
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 3ff26dea74..6b60cf78c1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 f8d8908f2c..8abcf4a6c5 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 545aa91a8e..67a3a89e6c 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 c785c63044..80515668d1 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 40d0599933..e125a7667e 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 187dd71529..3e4094fe89 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -945,62 +952,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2023,62 +2037,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
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 f80e25130b..36635db855 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 0e43bd3a8c..1512edceec 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 e413d27a15..1cd70c9f72 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 b804676cfb..b2caa92c4c 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 85613a77bf..5d1b1312d9 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -25,20 +25,26 @@ kbd: '``simple-double--three---four----'''
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
 
-   @TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
-@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day
+   @ampchar & (&) @atchar @ (@) @backslashchar \ (\) @hashchar # (#)
+@lbracechar { ({) @rbracechar } (})
 
-   @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø @O Ø @ss ß @l ł @L Ł @DH Ð
-@TH Þ @dh ð @th þ
+   @TeX TeX @LaTeX LaTeX @bullet * (•) @copyright (C) (©) @dots ... (…)
+@enddots ...  @equiv == (≡) @error error-> @expansion ==> (↦) @minus -
+(−) @point -!- (★) @print -| (⊣) @result => (⇒) @today a sunny day
 
-   @exclamdown ¡  @questiondown ¿  @pounds £ @registeredsymbol (R) @ordf
-ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
-@quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
-@guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright ›
+   @aa å (å) @AA Å (Å) @ae æ (æ) @oe œ (œ) @AE Æ (Æ) @OE Œ (Œ) @o ø (ø)
+@O Ø (Ø) @ss ß (ß) @l ł (ł) @L Ł (Ł) @DH Ð (Ð) @TH Þ (Þ) @dh ð (ð) @th þ
+(þ)
 
-   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+   @exclamdown ¡  (¡) @questiondown ¿  (¿) @pounds £ (£)
+@registeredsymbol (R) (®) @ordf ª (ª) @ordm º (º) @comma , (,)
+@quotedblleft " (“) @quotedblright " (”) @quoteleft ` (‘) @quoteright '
+(’) @quotedblbase „ („) @quotesinglbase ‚ (‚) @guillemetleft « («)
+@guillemetright » (») @guillemotleft « («) @guillemotright » (»)
+@guilsinglleft ‹ (‹) @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)
@@ -736,20 +742,26 @@ kbd: '``simple-double--three---four----'''
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
 
-   @TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
-@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day
+   @ampchar & (&) @atchar @ (@) @backslashchar \ (\) @hashchar # (#)
+@lbracechar { ({) @rbracechar } (})
+
+   @TeX TeX @LaTeX LaTeX @bullet * (•) @copyright (C) (©) @dots ... (…)
+@enddots ...  @equiv == (≡) @error error-> @expansion ==> (↦) @minus -
+(−) @point -!- (★) @print -| (⊣) @result => (⇒) @today a sunny day
 
-   @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø @O Ø @ss ß @l ł @L Ł @DH Ð
-@TH Þ @dh ð @th þ
+   @aa å (å) @AA Å (Å) @ae æ (æ) @oe œ (œ) @AE Æ (Æ) @OE Œ (Œ) @o ø (ø)
+@O Ø (Ø) @ss ß (ß) @l ł (ł) @L Ł (Ł) @DH Ð (Ð) @TH Þ (Þ) @dh ð (ð) @th þ
+(þ)
 
-   @exclamdown ¡  @questiondown ¿  @pounds £ @registeredsymbol (R) @ordf
-ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
-@quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
-@guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright ›
+   @exclamdown ¡  (¡) @questiondown ¿  (¿) @pounds £ (£)
+@registeredsymbol (R) (®) @ordf ª (ª) @ordm º (º) @comma , (,)
+@quotedblleft " (“) @quotedblright " (”) @quoteleft ` (‘) @quoteright '
+(’) @quotedblbase „ („) @quotesinglbase ‚ (‚) @guillemetleft « («)
+@guillemetright » (») @guillemotleft « («) @guillemotright » (»)
+@guilsinglleft ‹ (‹) @guilsinglright › (›)
 
-   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+   @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)
@@ -1404,20 +1416,26 @@ kbd: '``simple-double--three---four----'''
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
 
-   @TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
-@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day
+   @ampchar & (&) @atchar @ (@) @backslashchar \ (\) @hashchar # (#)
+@lbracechar { ({) @rbracechar } (})
 
-   @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø @O Ø @ss ß @l ł @L Ł @DH Ð
-@TH Þ @dh ð @th þ
+   @TeX TeX @LaTeX LaTeX @bullet * (•) @copyright (C) (©) @dots ... (…)
+@enddots ...  @equiv == (≡) @error error-> @expansion ==> (↦) @minus -
+(−) @point -!- (★) @print -| (⊣) @result => (⇒) @today a sunny day
 
-   @exclamdown ¡  @questiondown ¿  @pounds £ @registeredsymbol (R) @ordf
-ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
-@quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
-@guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright ›
+   @aa å (å) @AA Å (Å) @ae æ (æ) @oe œ (œ) @AE Æ (Æ) @OE Œ (Œ) @o ø (ø)
+@O Ø (Ø) @ss ß (ß) @l ł (ł) @L Ł (Ł) @DH Ð (Ð) @TH Þ (Þ) @dh ð (ð) @th þ
+(þ)
 
-   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+   @exclamdown ¡  (¡) @questiondown ¿  (¿) @pounds £ (£)
+@registeredsymbol (R) (®) @ordf ª (ª) @ordm º (º) @comma , (,)
+@quotedblleft " (“) @quotedblright " (”) @quoteleft ` (‘) @quoteright '
+(’) @quotedblbase „ („) @quotesinglbase ‚ (‚) @guillemetleft « («)
+@guillemetright » (») @guillemotleft « («) @guillemotright » (»)
+@guilsinglleft ‹ (‹) @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)
@@ -2116,62 +2134,69 @@ cross ref name: (file name). '@inforef{}' *note ::
      Now ! !@
      but , ,
 
+     @ampchar & (&)
+     @atchar @ (@)
+     @backslashchar \ (\)
+     @hashchar # (#)
+     @lbracechar { ({)
+     @rbracechar } (})
+
      @TeX TeX
      @LaTeX LaTeX
-     @bullet *
-     @copyright (C)
-     @dots ...
+     @bullet * (•)
+     @copyright (C) (©)
+     @dots ... (…)
      @enddots ...
-     @equiv ==
+     @equiv == (≡)
      @error error->
-     @expansion ==>
-     @minus -
-     @point -!-
-     @print -|
-     @result =>
+     @expansion ==> (↦)
+     @minus - (−)
+     @point -!- (★)
+     @print -| (⊣)
+     @result => (⇒)
      @today a sunny day
 
-     @aa å
-     @AA Å
-     @ae æ
-     @oe œ
-     @AE Æ
-     @OE Œ
-     @o ø
-     @O Ø
-     @ss ß
-     @l ł
-     @L Ł
-     @DH Ð
-     @TH Þ
-     @dh ð
-     @th þ
-
-     @exclamdown ¡
-     @questiondown ¿
-     @pounds £
-     @registeredsymbol (R)
-     @ordf ª
-     @ordm º
-     @comma ,
-     @quotedblleft "
-     @quotedblright "
-     @quoteleft `
-     @quoteright '
-     @quotedblbase „
-     @quotesinglbase ‚
-     @guillemetleft «
-     @guillemetright »
-     @guillemotleft «
-     @guillemotright »
-     @guilsinglleft ‹
-     @guilsinglright ›
-
-     @textdegree °
-     @euro €
-     @arrow ->
-     @leq ≤
-     @geq ≥
+     @aa å (å)
+     @AA Å (Å)
+     @ae æ (æ)
+     @oe œ (œ)
+     @AE Æ (Æ)
+     @OE Œ (Œ)
+     @o ø (ø)
+     @O Ø (Ø)
+     @ss ß (ß)
+     @l ł (ł)
+     @L Ł (Ł)
+     @DH Ð (Ð)
+     @TH Þ (Þ)
+     @dh ð (ð)
+     @th þ (þ)
+
+     @exclamdown ¡ (¡)
+     @questiondown ¿ (¿)
+     @pounds £ (£)
+     @registeredsymbol (R) (®)
+     @ordf ª (ª)
+     @ordm º (º)
+     @comma , (,)
+     @quotedblleft " (“)
+     @quotedblright " (”)
+     @quoteleft ` (‘)
+     @quoteright ' (’)
+     @quotedblbase „ („)
+     @quotesinglbase ‚ (‚)
+     @guillemetleft « («)
+     @guillemetright » (»)
+     @guillemotleft « («)
+     @guillemotright » (»)
+     @guilsinglleft ‹ (‹)
+     @guilsinglright › (›)
+
+     @textdegree ° (°)
+     @euro € (€)
+     @arrow -> (→)
+     @leq ≤ (≤)
+     @geq ≥ (≥)
      @tie a b
 
      @acronym{--a,an accronym} --a (an accronym)
@@ -2900,14 +2925,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2173)
+* truc:                                  chapter.            (line 2192)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2173)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2192)
 
    cp
 
@@ -2915,116 +2940,116 @@ aaa"]
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  688)
-* " <2>:                                 chapter.            (line 1359)
+* " <1>:                                 chapter.            (line  694)
+* " <2>:                                 chapter.            (line 1371)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  688)
-* -option <2>:                           chapter.            (line 1359)
-* .:                                     chapter.            (line 2173)
-* ?:                                     chapter.            (line 2173)
-* a:                                     chapter.            (line 2173)
-* aaa, bbb:                              chapter.            (line 2173)
-* a--a:                                  chapter.            (line 2173)
-* a--asis:                               chapter.            (line  500)
-* a--asis <1>:                           chapter.            (line 1160)
-* a--asis <2>:                           chapter.            (line 1958)
-* b:                                     chapter.            (line  501)
-* b <1>:                                 chapter.            (line 1161)
-* b <2>:                                 chapter.            (line 1959)
-* b--b, c--c:                            chapter.            (line 2173)
+* -option <1>:                           chapter.            (line  694)
+* -option <2>:                           chapter.            (line 1371)
+* .:                                     chapter.            (line 2192)
+* ?:                                     chapter.            (line 2192)
+* a:                                     chapter.            (line 2192)
+* aaa, bbb:                              chapter.            (line 2192)
+* a--a:                                  chapter.            (line 2192)
+* a--asis:                               chapter.            (line  506)
+* a--asis <1>:                           chapter.            (line 1172)
+* a--asis <2>:                           chapter.            (line 1977)
+* b:                                     chapter.            (line  507)
+* b <1>:                                 chapter.            (line 1173)
+* b <2>:                                 chapter.            (line 1978)
+* b--b, c--c:                            chapter.            (line 2192)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2173)
-* d--efcv_name:                          chapter.            (line  341)
-* d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1001)
-* d--efcv_name <3>:                      chapter.            (line 1004)
-* d--efcv_name <4>:                      chapter.            (line 1799)
-* d--efcv_name <5>:                      chapter.            (line 1802)
-* d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1046)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1844)
-* d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1037)
-* d--efopt_name <2>:                     chapter.            (line 1835)
-* d--eftypecv_name of c--lass:           chapter.            (line  347)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1007)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1010)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1805)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1808)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1078)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1081)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1877)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1880)
-* d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1049)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1847)
-* d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1043)
-* d--eftypevar_name <2>:                 chapter.            (line 1841)
-* d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line  998)
-* d--eftypevr_name <2>:                  chapter.            (line 1796)
-* d--efvar_name:                         chapter.            (line  371)
-* d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1031)
-* d--efvar_name <3>:                     chapter.            (line 1034)
-* d--efvar_name <4>:                     chapter.            (line 1829)
-* d--efvar_name <5>:                     chapter.            (line 1832)
-* d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  977)
-* d--efvr_name <2>:                      chapter.            (line 1775)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2173)
-* index entry between item and itemx:    chapter.            (line  505)
-* index entry between item and itemx <1>: chapter.           (line  623)
-* index entry between item and itemx <2>: chapter.           (line 1165)
-* index entry between item and itemx <3>: chapter.           (line 1283)
-* index entry between item and itemx <4>: chapter.           (line 1963)
-* index entry between item and itemx <5>: chapter.           (line 2114)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2192)
+* d--efcv_name:                          chapter.            (line  347)
+* d--efcv_name <1>:                      chapter.            (line  350)
+* d--efcv_name <2>:                      chapter.            (line 1013)
+* d--efcv_name <3>:                      chapter.            (line 1016)
+* d--efcv_name <4>:                      chapter.            (line 1818)
+* d--efcv_name <5>:                      chapter.            (line 1821)
+* d--efivar_name of c--lass:             chapter.            (line  392)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1058)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1863)
+* d--efopt_name:                         chapter.            (line  383)
+* d--efopt_name <1>:                     chapter.            (line 1049)
+* d--efopt_name <2>:                     chapter.            (line 1854)
+* d--eftypecv_name of c--lass:           chapter.            (line  353)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  356)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1019)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1022)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1824)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1827)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  424)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  427)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1090)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1896)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1899)
+* d--eftypeivar_name of c--lass:         chapter.            (line  395)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1061)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1866)
+* d--eftypevar_name:                     chapter.            (line  389)
+* d--eftypevar_name <1>:                 chapter.            (line 1055)
+* d--eftypevar_name <2>:                 chapter.            (line 1860)
+* d--eftypevr_name:                      chapter.            (line  344)
+* d--eftypevr_name <1>:                  chapter.            (line 1010)
+* d--eftypevr_name <2>:                  chapter.            (line 1815)
+* d--efvar_name:                         chapter.            (line  377)
+* d--efvar_name <1>:                     chapter.            (line  380)
+* d--efvar_name <2>:                     chapter.            (line 1043)
+* d--efvar_name <3>:                     chapter.            (line 1046)
+* d--efvar_name <4>:                     chapter.            (line 1848)
+* d--efvar_name <5>:                     chapter.            (line 1851)
+* d--efvr_name:                          chapter.            (line  323)
+* d--efvr_name <1>:                      chapter.            (line  989)
+* d--efvr_name <2>:                      chapter.            (line 1794)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2192)
+* index entry between item and itemx:    chapter.            (line  511)
+* index entry between item and itemx <1>: chapter.           (line  629)
+* index entry between item and itemx <2>: chapter.           (line 1177)
+* index entry between item and itemx <3>: chapter.           (line 1295)
+* index entry between item and itemx <4>: chapter.           (line 1982)
+* index entry between item and itemx <5>: chapter.           (line 2133)
 * index entry in footnote:               chapter.            (line    4)
-* index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  952)
-* index entry within deffn <2>:          chapter.            (line 1748)
-* index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  863)
-* index entry within itemize <2>:        chapter.            (line 1659)
-* index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  885)
-* index entry within multitable <2>:     chapter.            (line 1682)
-* t-ruc:                                 chapter.            (line 2173)
-* T-ruc:                                 chapter.            (line 2173)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  787)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1582)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  782)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1577)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  797)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1592)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  792)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1587)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  789)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1584)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
+* index entry within deffn:              chapter.            (line  298)
+* index entry within deffn <1>:          chapter.            (line  964)
+* index entry within deffn <2>:          chapter.            (line 1767)
+* index entry within itemize:            chapter.            (line  209)
+* index entry within itemize <1>:        chapter.            (line  875)
+* index entry within itemize <2>:        chapter.            (line 1678)
+* index entry within multitable:         chapter.            (line  231)
+* index entry within multitable <1>:     chapter.            (line  897)
+* index entry within multitable <2>:     chapter.            (line 1701)
+* t-ruc:                                 chapter.            (line 2192)
+* T-ruc:                                 chapter.            (line 2192)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  799)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1601)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  794)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1596)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  809)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1611)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  804)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1606)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  801)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1603)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  784)
+                                                             (line  796)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1579)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
+                                                             (line 1598)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  799)
+                                                             (line  811)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1594)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
+                                                             (line 1613)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  794)
+                                                             (line  806)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1589)
+                                                             (line 1608)
 
    fn
 
@@ -3032,171 +3057,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  688)
-* --foption <2>:                         chapter.            (line 1359)
-* .:                                     chapter.            (line 2173)
-* ?:                                     chapter.            (line 2173)
+* --foption <1>:                         chapter.            (line  694)
+* --foption <2>:                         chapter.            (line 1371)
+* .:                                     chapter.            (line 2192)
+* ?:                                     chapter.            (line 2192)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  688)
-* `` <2>:                                chapter.            (line 1359)
-* a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  504)
-* a <2>:                                 chapter.            (line  622)
-* a <3>:                                 chapter.            (line  965)
-* a <4>:                                 chapter.            (line 1164)
-* a <5>:                                 chapter.            (line 1282)
-* a <6>:                                 chapter.            (line 1761)
-* a <7>:                                 chapter.            (line 1962)
-* a <8>:                                 chapter.            (line 2113)
-* a <9>:                                 chapter.            (line 2173)
-* after:                                 chapter.            (line  633)
-* after <1>:                             chapter.            (line 1293)
-* after <2>:                             chapter.            (line 2124)
-* arg2:                                  chapter.            (line  424)
-* arg2 <1>:                              chapter.            (line 1084)
-* arg2 <2>:                              chapter.            (line 1884)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line  623)
-* b <2>:                                 chapter.            (line 1165)
-* b <3>:                                 chapter.            (line 1283)
-* b <4>:                                 chapter.            (line 1963)
-* b <5>:                                 chapter.            (line 2114)
-* bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  960)
-* bidule machin <2>:                     chapter.            (line 1756)
-* d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  944)
-* d--effn_name <2>:                      chapter.            (line 1740)
-* d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1025)
-* d--efmac_name <2>:                     chapter.            (line 1823)
-* d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1052)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1850)
-* d--efop_name on c--lass:               chapter.            (line  353)
-* d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1013)
-* d--efop_name on c--lass <3>:           chapter.            (line 1016)
-* d--efop_name on c--lass <4>:           chapter.            (line 1811)
-* d--efop_name on c--lass <5>:           chapter.            (line 1814)
-* d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1028)
-* d--efspec_name <2>:                    chapter.            (line 1826)
-* d--eftypefn_name:                      chapter.            (line  326)
-* d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  986)
-* d--eftypefn_name <3>:                  chapter.            (line  989)
-* d--eftypefn_name <4>:                  chapter.            (line 1784)
-* d--eftypefn_name <5>:                  chapter.            (line 1787)
-* d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1063)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1862)
-* d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1040)
-* d--eftypefun_name <2>:                 chapter.            (line 1838)
-* d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1055)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1853)
-* d--eftypeop_name on c--lass:           chapter.            (line  332)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  992)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  995)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1790)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1793)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1068)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1073)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1867)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1872)
-* d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1022)
-* d--efun_name <2>:                      chapter.            (line 1820)
-* de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  947)
-* de--ffn_name <2>:                      chapter.            (line 1743)
-* deffn:                                 chapter.            (line  308)
-* deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  968)
-* deffn <3>:                             chapter.            (line  970)
-* deffn <4>:                             chapter.            (line 1765)
-* deffn <5>:                             chapter.            (line 1767)
-* deffnx:                                chapter.            (line  306)
-* deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  966)
-* deffnx <3>:                            chapter.            (line  971)
-* deffnx <4>:                            chapter.            (line 1762)
-* deffnx <5>:                            chapter.            (line 1768)
-* f---aa:                                chapter.            (line 2173)
-* f---bb, f---cc:                        chapter.            (line 2173)
-* f---ddd, f---eee, ffff:                chapter.            (line 2173)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2173)
-* followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  631)
-* followed <2>:                          chapter.            (line  963)
-* followed <3>:                          chapter.            (line 1291)
-* followed <4>:                          chapter.            (line 1759)
-* followed <5>:                          chapter.            (line 2122)
-* I:                                     chapter.            (line  291)
-* I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  951)
-* I <3>:                                 chapter.            (line  973)
-* I <4>:                                 chapter.            (line 1747)
-* I <5>:                                 chapter.            (line 1770)
-* id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  957)
-* id i ule <2>:                          chapter.            (line 1753)
-* id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  956)
-* id ule <2>:                            chapter.            (line 1752)
-* INVALID:                               chapter.            (line  635)
-* INVALID <1>:                           chapter.            (line 1295)
-* INVALID <2>:                           chapter.            (line 2126)
-* log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  953)
-* log trap <2>:                          chapter.            (line 1749)
-* log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  954)
-* log trap1 <2>:                         chapter.            (line 1750)
-* log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  955)
-* log trap2 <2>:                         chapter.            (line 1751)
-* machin:                                chapter.            (line  299)
-* machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  627)
-* machin <3>:                            chapter.            (line  628)
-* machin <4>:                            chapter.            (line  629)
-* machin <5>:                            chapter.            (line  630)
-* machin <6>:                            chapter.            (line  959)
-* machin <7>:                            chapter.            (line  961)
-* machin <8>:                            chapter.            (line 1287)
-* machin <9>:                            chapter.            (line 1288)
-* machin <10>:                           chapter.            (line 1289)
-* machin <11>:                           chapter.            (line 1290)
-* machin <12>:                           chapter.            (line 1755)
-* machin <13>:                           chapter.            (line 1757)
-* machin <14>:                           chapter.            (line 2118)
-* machin <15>:                           chapter.            (line 2119)
-* machin <16>:                           chapter.            (line 2120)
-* machin <17>:                           chapter.            (line 2121)
-* n--ame:                                chapter.            (line  320)
-* n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  980)
-* n--ame <3>:                            chapter.            (line  983)
-* n--ame <4>:                            chapter.            (line 1778)
-* n--ame <5>:                            chapter.            (line 1781)
-* name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1058)
-* name2 <2>:                             chapter.            (line 1857)
-* t--ruc:                                chapter.            (line 2173)
-* T--ruc:                                chapter.            (line 2173)
-* truc:                                  chapter.            (line  292)
-* truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  952)
-* truc <3>:                              chapter.            (line  974)
-* truc <4>:                              chapter.            (line 1748)
-* truc <5>:                              chapter.            (line 1771)
-* xxx, zzz:                              chapter.            (line 2173)
+* `` <1>:                                chapter.            (line  694)
+* `` <2>:                                chapter.            (line 1371)
+* a:                                     chapter.            (line  311)
+* a <1>:                                 chapter.            (line  510)
+* a <2>:                                 chapter.            (line  628)
+* a <3>:                                 chapter.            (line  977)
+* a <4>:                                 chapter.            (line 1176)
+* a <5>:                                 chapter.            (line 1294)
+* a <6>:                                 chapter.            (line 1780)
+* a <7>:                                 chapter.            (line 1981)
+* a <8>:                                 chapter.            (line 2132)
+* a <9>:                                 chapter.            (line 2192)
+* after:                                 chapter.            (line  639)
+* after <1>:                             chapter.            (line 1305)
+* after <2>:                             chapter.            (line 2143)
+* arg2:                                  chapter.            (line  430)
+* arg2 <1>:                              chapter.            (line 1096)
+* arg2 <2>:                              chapter.            (line 1903)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line  629)
+* b <2>:                                 chapter.            (line 1177)
+* b <3>:                                 chapter.            (line 1295)
+* b <4>:                                 chapter.            (line 1982)
+* b <5>:                                 chapter.            (line 2133)
+* bidule machin:                         chapter.            (line  306)
+* bidule machin <1>:                     chapter.            (line  972)
+* bidule machin <2>:                     chapter.            (line 1775)
+* d--effn_name:                          chapter.            (line  290)
+* d--effn_name <1>:                      chapter.            (line  956)
+* d--effn_name <2>:                      chapter.            (line 1759)
+* d--efmac_name:                         chapter.            (line  371)
+* d--efmac_name <1>:                     chapter.            (line 1037)
+* d--efmac_name <2>:                     chapter.            (line 1842)
+* d--efmethod_name on c--lass:           chapter.            (line  398)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1064)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1869)
+* d--efop_name on c--lass:               chapter.            (line  359)
+* d--efop_name on c--lass <1>:           chapter.            (line  362)
+* d--efop_name on c--lass <2>:           chapter.            (line 1025)
+* d--efop_name on c--lass <3>:           chapter.            (line 1028)
+* d--efop_name on c--lass <4>:           chapter.            (line 1830)
+* d--efop_name on c--lass <5>:           chapter.            (line 1833)
+* d--efspec_name:                        chapter.            (line  374)
+* d--efspec_name <1>:                    chapter.            (line 1040)
+* d--efspec_name <2>:                    chapter.            (line 1845)
+* d--eftypefn_name:                      chapter.            (line  332)
+* d--eftypefn_name <1>:                  chapter.            (line  335)
+* d--eftypefn_name <2>:                  chapter.            (line  998)
+* d--eftypefn_name <3>:                  chapter.            (line 1001)
+* d--eftypefn_name <4>:                  chapter.            (line 1803)
+* d--eftypefn_name <5>:                  chapter.            (line 1806)
+* d--eftypefn_name2:                     chapter.            (line  409)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1075)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1881)
+* d--eftypefun_name:                     chapter.            (line  386)
+* d--eftypefun_name <1>:                 chapter.            (line 1052)
+* d--eftypefun_name <2>:                 chapter.            (line 1857)
+* d--eftypemethod_name on c--lass:       chapter.            (line  401)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1067)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1872)
+* d--eftypeop_name on c--lass:           chapter.            (line  338)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  341)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1004)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1007)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1809)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1812)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  414)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  419)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1080)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1085)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1886)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1891)
+* d--efun_name:                          chapter.            (line  368)
+* d--efun_name <1>:                      chapter.            (line 1034)
+* d--efun_name <2>:                      chapter.            (line 1839)
+* de--ffn_name:                          chapter.            (line  293)
+* de--ffn_name <1>:                      chapter.            (line  959)
+* de--ffn_name <2>:                      chapter.            (line 1762)
+* deffn:                                 chapter.            (line  314)
+* deffn <1>:                             chapter.            (line  316)
+* deffn <2>:                             chapter.            (line  980)
+* deffn <3>:                             chapter.            (line  982)
+* deffn <4>:                             chapter.            (line 1784)
+* deffn <5>:                             chapter.            (line 1786)
+* deffnx:                                chapter.            (line  312)
+* deffnx <1>:                            chapter.            (line  317)
+* deffnx <2>:                            chapter.            (line  978)
+* deffnx <3>:                            chapter.            (line  983)
+* deffnx <4>:                            chapter.            (line 1781)
+* deffnx <5>:                            chapter.            (line 1787)
+* f---aa:                                chapter.            (line 2192)
+* f---bb, f---cc:                        chapter.            (line 2192)
+* f---ddd, f---eee, ffff:                chapter.            (line 2192)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2192)
+* followed:                              chapter.            (line  309)
+* followed <1>:                          chapter.            (line  637)
+* followed <2>:                          chapter.            (line  975)
+* followed <3>:                          chapter.            (line 1303)
+* followed <4>:                          chapter.            (line 1778)
+* followed <5>:                          chapter.            (line 2141)
+* I:                                     chapter.            (line  297)
+* I <1>:                                 chapter.            (line  319)
+* I <2>:                                 chapter.            (line  963)
+* I <3>:                                 chapter.            (line  985)
+* I <4>:                                 chapter.            (line 1766)
+* I <5>:                                 chapter.            (line 1789)
+* id i ule:                              chapter.            (line  303)
+* id i ule <1>:                          chapter.            (line  969)
+* id i ule <2>:                          chapter.            (line 1772)
+* id ule:                                chapter.            (line  302)
+* id ule <1>:                            chapter.            (line  968)
+* id ule <2>:                            chapter.            (line 1771)
+* INVALID:                               chapter.            (line  641)
+* INVALID <1>:                           chapter.            (line 1307)
+* INVALID <2>:                           chapter.            (line 2145)
+* log trap:                              chapter.            (line  299)
+* log trap <1>:                          chapter.            (line  965)
+* log trap <2>:                          chapter.            (line 1768)
+* log trap1:                             chapter.            (line  300)
+* log trap1 <1>:                         chapter.            (line  966)
+* log trap1 <2>:                         chapter.            (line 1769)
+* log trap2:                             chapter.            (line  301)
+* log trap2 <1>:                         chapter.            (line  967)
+* log trap2 <2>:                         chapter.            (line 1770)
+* machin:                                chapter.            (line  305)
+* machin <1>:                            chapter.            (line  307)
+* machin <2>:                            chapter.            (line  633)
+* machin <3>:                            chapter.            (line  634)
+* machin <4>:                            chapter.            (line  635)
+* machin <5>:                            chapter.            (line  636)
+* machin <6>:                            chapter.            (line  971)
+* machin <7>:                            chapter.            (line  973)
+* machin <8>:                            chapter.            (line 1299)
+* machin <9>:                            chapter.            (line 1300)
+* machin <10>:                           chapter.            (line 1301)
+* machin <11>:                           chapter.            (line 1302)
+* machin <12>:                           chapter.            (line 1774)
+* machin <13>:                           chapter.            (line 1776)
+* machin <14>:                           chapter.            (line 2137)
+* machin <15>:                           chapter.            (line 2138)
+* machin <16>:                           chapter.            (line 2139)
+* machin <17>:                           chapter.            (line 2140)
+* n--ame:                                chapter.            (line  326)
+* n--ame <1>:                            chapter.            (line  329)
+* n--ame <2>:                            chapter.            (line  992)
+* n--ame <3>:                            chapter.            (line  995)
+* n--ame <4>:                            chapter.            (line 1797)
+* n--ame <5>:                            chapter.            (line 1800)
+* name2:                                 chapter.            (line  404)
+* name2 <1>:                             chapter.            (line 1070)
+* name2 <2>:                             chapter.            (line 1876)
+* t--ruc:                                chapter.            (line 2192)
+* T--ruc:                                chapter.            (line 2192)
+* truc:                                  chapter.            (line  298)
+* truc <1>:                              chapter.            (line  320)
+* truc <2>:                              chapter.            (line  964)
+* truc <3>:                              chapter.            (line  986)
+* truc <4>:                              chapter.            (line 1767)
+* truc <5>:                              chapter.            (line 1790)
+* xxx, zzz:                              chapter.            (line 2192)
 
    vr
 
@@ -3209,9 +3234,9 @@ aaa"]
 [index]
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  359)
-* d--eftp_name <1>:                      chapter.            (line 1019)
-* d--eftp_name <2>:                      chapter.            (line 1817)
+* d--eftp_name:                          chapter.            (line  365)
+* d--eftp_name <1>:                      chapter.            (line 1031)
+* d--eftp_name <2>:                      chapter.            (line 1836)
 
    (8)
 
@@ -3294,306 +3319,306 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  688)
-* " <2>:                                 chapter.            (line 1359)
+* " <1>:                                 chapter.            (line  694)
+* " <2>:                                 chapter.            (line 1371)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  688)
-* -option <2>:                           chapter.            (line 1359)
-* .:                                     chapter.            (line 2173)
-* ?:                                     chapter.            (line 2173)
-* a:                                     chapter.            (line 2173)
-* aaa, bbb:                              chapter.            (line 2173)
-* a--a:                                  chapter.            (line 2173)
-* a--asis:                               chapter.            (line  500)
-* a--asis <1>:                           chapter.            (line 1160)
-* a--asis <2>:                           chapter.            (line 1958)
-* b:                                     chapter.            (line  501)
-* b <1>:                                 chapter.            (line 1161)
-* b <2>:                                 chapter.            (line 1959)
-* b--b, c--c:                            chapter.            (line 2173)
-* counting entry:                        chapter.            (line 2523)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2173)
-* d--efcv_name:                          chapter.            (line  341)
-* d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1001)
-* d--efcv_name <3>:                      chapter.            (line 1004)
-* d--efcv_name <4>:                      chapter.            (line 1799)
-* d--efcv_name <5>:                      chapter.            (line 1802)
-* d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1046)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1844)
-* d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1037)
-* d--efopt_name <2>:                     chapter.            (line 1835)
-* d--eftypecv_name of c--lass:           chapter.            (line  347)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1007)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1010)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1805)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1808)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1078)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1081)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1877)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1880)
-* d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1049)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1847)
-* d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1043)
-* d--eftypevar_name <2>:                 chapter.            (line 1841)
-* d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line  998)
-* d--eftypevr_name <2>:                  chapter.            (line 1796)
-* d--efvar_name:                         chapter.            (line  371)
-* d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1031)
-* d--efvar_name <3>:                     chapter.            (line 1034)
-* d--efvar_name <4>:                     chapter.            (line 1829)
-* d--efvar_name <5>:                     chapter.            (line 1832)
-* d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  977)
-* d--efvr_name <2>:                      chapter.            (line 1775)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2173)
-* index entry between item and itemx:    chapter.            (line  505)
-* index entry between item and itemx <1>: chapter.           (line  623)
-* index entry between item and itemx <2>: chapter.           (line 1165)
-* index entry between item and itemx <3>: chapter.           (line 1283)
-* index entry between item and itemx <4>: chapter.           (line 1963)
-* index entry between item and itemx <5>: chapter.           (line 2114)
-* index entry in footnote:               chapter.            (line 2518)
-* index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  952)
-* index entry within deffn <2>:          chapter.            (line 1748)
-* index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  863)
-* index entry within itemize <2>:        chapter.            (line 1659)
-* index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  885)
-* index entry within multitable <2>:     chapter.            (line 1682)
-* t-ruc:                                 chapter.            (line 2173)
-* T-ruc:                                 chapter.            (line 2173)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  787)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1582)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  782)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1577)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  797)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1592)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  792)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1587)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  789)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1584)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
+* -option <1>:                           chapter.            (line  694)
+* -option <2>:                           chapter.            (line 1371)
+* .:                                     chapter.            (line 2192)
+* ?:                                     chapter.            (line 2192)
+* a:                                     chapter.            (line 2192)
+* aaa, bbb:                              chapter.            (line 2192)
+* a--a:                                  chapter.            (line 2192)
+* a--asis:                               chapter.            (line  506)
+* a--asis <1>:                           chapter.            (line 1172)
+* a--asis <2>:                           chapter.            (line 1977)
+* b:                                     chapter.            (line  507)
+* b <1>:                                 chapter.            (line 1173)
+* b <2>:                                 chapter.            (line 1978)
+* b--b, c--c:                            chapter.            (line 2192)
+* counting entry:                        chapter.            (line 2542)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2192)
+* d--efcv_name:                          chapter.            (line  347)
+* d--efcv_name <1>:                      chapter.            (line  350)
+* d--efcv_name <2>:                      chapter.            (line 1013)
+* d--efcv_name <3>:                      chapter.            (line 1016)
+* d--efcv_name <4>:                      chapter.            (line 1818)
+* d--efcv_name <5>:                      chapter.            (line 1821)
+* d--efivar_name of c--lass:             chapter.            (line  392)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1058)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1863)
+* d--efopt_name:                         chapter.            (line  383)
+* d--efopt_name <1>:                     chapter.            (line 1049)
+* d--efopt_name <2>:                     chapter.            (line 1854)
+* d--eftypecv_name of c--lass:           chapter.            (line  353)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  356)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1019)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1022)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1824)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1827)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  424)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  427)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1090)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1896)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1899)
+* d--eftypeivar_name of c--lass:         chapter.            (line  395)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1061)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1866)
+* d--eftypevar_name:                     chapter.            (line  389)
+* d--eftypevar_name <1>:                 chapter.            (line 1055)
+* d--eftypevar_name <2>:                 chapter.            (line 1860)
+* d--eftypevr_name:                      chapter.            (line  344)
+* d--eftypevr_name <1>:                  chapter.            (line 1010)
+* d--eftypevr_name <2>:                  chapter.            (line 1815)
+* d--efvar_name:                         chapter.            (line  377)
+* d--efvar_name <1>:                     chapter.            (line  380)
+* d--efvar_name <2>:                     chapter.            (line 1043)
+* d--efvar_name <3>:                     chapter.            (line 1046)
+* d--efvar_name <4>:                     chapter.            (line 1848)
+* d--efvar_name <5>:                     chapter.            (line 1851)
+* d--efvr_name:                          chapter.            (line  323)
+* d--efvr_name <1>:                      chapter.            (line  989)
+* d--efvr_name <2>:                      chapter.            (line 1794)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2192)
+* index entry between item and itemx:    chapter.            (line  511)
+* index entry between item and itemx <1>: chapter.           (line  629)
+* index entry between item and itemx <2>: chapter.           (line 1177)
+* index entry between item and itemx <3>: chapter.           (line 1295)
+* index entry between item and itemx <4>: chapter.           (line 1982)
+* index entry between item and itemx <5>: chapter.           (line 2133)
+* index entry in footnote:               chapter.            (line 2537)
+* index entry within deffn:              chapter.            (line  298)
+* index entry within deffn <1>:          chapter.            (line  964)
+* index entry within deffn <2>:          chapter.            (line 1767)
+* index entry within itemize:            chapter.            (line  209)
+* index entry within itemize <1>:        chapter.            (line  875)
+* index entry within itemize <2>:        chapter.            (line 1678)
+* index entry within multitable:         chapter.            (line  231)
+* index entry within multitable <1>:     chapter.            (line  897)
+* index entry within multitable <2>:     chapter.            (line 1701)
+* t-ruc:                                 chapter.            (line 2192)
+* T-ruc:                                 chapter.            (line 2192)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  799)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1601)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  794)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1596)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  809)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1611)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  804)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1606)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  801)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1603)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  784)
+                                                             (line  796)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1579)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
+                                                             (line 1598)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  799)
+                                                             (line  811)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1594)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
+                                                             (line 1613)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  794)
+                                                             (line  806)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1589)
+                                                             (line 1608)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  688)
-* --foption <2>:                         chapter.            (line 1359)
-* .:                                     chapter.            (line 2173)
-* ?:                                     chapter.            (line 2173)
+* --foption <1>:                         chapter.            (line  694)
+* --foption <2>:                         chapter.            (line 1371)
+* .:                                     chapter.            (line 2192)
+* ?:                                     chapter.            (line 2192)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  688)
-* `` <2>:                                chapter.            (line 1359)
-* a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  504)
-* a <2>:                                 chapter.            (line  622)
-* a <3>:                                 chapter.            (line  965)
-* a <4>:                                 chapter.            (line 1164)
-* a <5>:                                 chapter.            (line 1282)
-* a <6>:                                 chapter.            (line 1761)
-* a <7>:                                 chapter.            (line 1962)
-* a <8>:                                 chapter.            (line 2113)
-* a <9>:                                 chapter.            (line 2173)
-* after:                                 chapter.            (line  633)
-* after <1>:                             chapter.            (line 1293)
-* after <2>:                             chapter.            (line 2124)
-* arg2:                                  chapter.            (line  424)
-* arg2 <1>:                              chapter.            (line 1084)
-* arg2 <2>:                              chapter.            (line 1884)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line  623)
-* b <2>:                                 chapter.            (line 1165)
-* b <3>:                                 chapter.            (line 1283)
-* b <4>:                                 chapter.            (line 1963)
-* b <5>:                                 chapter.            (line 2114)
-* bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  960)
-* bidule machin <2>:                     chapter.            (line 1756)
-* d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  944)
-* d--effn_name <2>:                      chapter.            (line 1740)
-* d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1025)
-* d--efmac_name <2>:                     chapter.            (line 1823)
-* d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1052)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1850)
-* d--efop_name on c--lass:               chapter.            (line  353)
-* d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1013)
-* d--efop_name on c--lass <3>:           chapter.            (line 1016)
-* d--efop_name on c--lass <4>:           chapter.            (line 1811)
-* d--efop_name on c--lass <5>:           chapter.            (line 1814)
-* d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1028)
-* d--efspec_name <2>:                    chapter.            (line 1826)
-* d--eftypefn_name:                      chapter.            (line  326)
-* d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  986)
-* d--eftypefn_name <3>:                  chapter.            (line  989)
-* d--eftypefn_name <4>:                  chapter.            (line 1784)
-* d--eftypefn_name <5>:                  chapter.            (line 1787)
-* d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1063)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1862)
-* d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1040)
-* d--eftypefun_name <2>:                 chapter.            (line 1838)
-* d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1055)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1853)
-* d--eftypeop_name on c--lass:           chapter.            (line  332)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  992)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  995)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1790)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1793)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1068)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1073)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1867)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1872)
-* d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1022)
-* d--efun_name <2>:                      chapter.            (line 1820)
-* de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  947)
-* de--ffn_name <2>:                      chapter.            (line 1743)
-* deffn:                                 chapter.            (line  308)
-* deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  968)
-* deffn <3>:                             chapter.            (line  970)
-* deffn <4>:                             chapter.            (line 1765)
-* deffn <5>:                             chapter.            (line 1767)
-* deffnx:                                chapter.            (line  306)
-* deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  966)
-* deffnx <3>:                            chapter.            (line  971)
-* deffnx <4>:                            chapter.            (line 1762)
-* deffnx <5>:                            chapter.            (line 1768)
-* f---aa:                                chapter.            (line 2173)
-* f---bb, f---cc:                        chapter.            (line 2173)
-* f---ddd, f---eee, ffff:                chapter.            (line 2173)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2173)
-* followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  631)
-* followed <2>:                          chapter.            (line  963)
-* followed <3>:                          chapter.            (line 1291)
-* followed <4>:                          chapter.            (line 1759)
-* followed <5>:                          chapter.            (line 2122)
-* I:                                     chapter.            (line  291)
-* I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  951)
-* I <3>:                                 chapter.            (line  973)
-* I <4>:                                 chapter.            (line 1747)
-* I <5>:                                 chapter.            (line 1770)
-* id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  957)
-* id i ule <2>:                          chapter.            (line 1753)
-* id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  956)
-* id ule <2>:                            chapter.            (line 1752)
-* INVALID:                               chapter.            (line  635)
-* INVALID <1>:                           chapter.            (line 1295)
-* INVALID <2>:                           chapter.            (line 2126)
-* log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  953)
-* log trap <2>:                          chapter.            (line 1749)
-* log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  954)
-* log trap1 <2>:                         chapter.            (line 1750)
-* log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  955)
-* log trap2 <2>:                         chapter.            (line 1751)
-* machin:                                chapter.            (line  299)
-* machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  627)
-* machin <3>:                            chapter.            (line  628)
-* machin <4>:                            chapter.            (line  629)
-* machin <5>:                            chapter.            (line  630)
-* machin <6>:                            chapter.            (line  959)
-* machin <7>:                            chapter.            (line  961)
-* machin <8>:                            chapter.            (line 1287)
-* machin <9>:                            chapter.            (line 1288)
-* machin <10>:                           chapter.            (line 1289)
-* machin <11>:                           chapter.            (line 1290)
-* machin <12>:                           chapter.            (line 1755)
-* machin <13>:                           chapter.            (line 1757)
-* machin <14>:                           chapter.            (line 2118)
-* machin <15>:                           chapter.            (line 2119)
-* machin <16>:                           chapter.            (line 2120)
-* machin <17>:                           chapter.            (line 2121)
-* n--ame:                                chapter.            (line  320)
-* n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  980)
-* n--ame <3>:                            chapter.            (line  983)
-* n--ame <4>:                            chapter.            (line 1778)
-* n--ame <5>:                            chapter.            (line 1781)
-* name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1058)
-* name2 <2>:                             chapter.            (line 1857)
-* t--ruc:                                chapter.            (line 2173)
-* T--ruc:                                chapter.            (line 2173)
-* truc:                                  chapter.            (line  292)
-* truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  952)
-* truc <3>:                              chapter.            (line  974)
-* truc <4>:                              chapter.            (line 1748)
-* truc <5>:                              chapter.            (line 1771)
-* xxx, zzz:                              chapter.            (line 2173)
+* `` <1>:                                chapter.            (line  694)
+* `` <2>:                                chapter.            (line 1371)
+* a:                                     chapter.            (line  311)
+* a <1>:                                 chapter.            (line  510)
+* a <2>:                                 chapter.            (line  628)
+* a <3>:                                 chapter.            (line  977)
+* a <4>:                                 chapter.            (line 1176)
+* a <5>:                                 chapter.            (line 1294)
+* a <6>:                                 chapter.            (line 1780)
+* a <7>:                                 chapter.            (line 1981)
+* a <8>:                                 chapter.            (line 2132)
+* a <9>:                                 chapter.            (line 2192)
+* after:                                 chapter.            (line  639)
+* after <1>:                             chapter.            (line 1305)
+* after <2>:                             chapter.            (line 2143)
+* arg2:                                  chapter.            (line  430)
+* arg2 <1>:                              chapter.            (line 1096)
+* arg2 <2>:                              chapter.            (line 1903)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line  629)
+* b <2>:                                 chapter.            (line 1177)
+* b <3>:                                 chapter.            (line 1295)
+* b <4>:                                 chapter.            (line 1982)
+* b <5>:                                 chapter.            (line 2133)
+* bidule machin:                         chapter.            (line  306)
+* bidule machin <1>:                     chapter.            (line  972)
+* bidule machin <2>:                     chapter.            (line 1775)
+* d--effn_name:                          chapter.            (line  290)
+* d--effn_name <1>:                      chapter.            (line  956)
+* d--effn_name <2>:                      chapter.            (line 1759)
+* d--efmac_name:                         chapter.            (line  371)
+* d--efmac_name <1>:                     chapter.            (line 1037)
+* d--efmac_name <2>:                     chapter.            (line 1842)
+* d--efmethod_name on c--lass:           chapter.            (line  398)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1064)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1869)
+* d--efop_name on c--lass:               chapter.            (line  359)
+* d--efop_name on c--lass <1>:           chapter.            (line  362)
+* d--efop_name on c--lass <2>:           chapter.            (line 1025)
+* d--efop_name on c--lass <3>:           chapter.            (line 1028)
+* d--efop_name on c--lass <4>:           chapter.            (line 1830)
+* d--efop_name on c--lass <5>:           chapter.            (line 1833)
+* d--efspec_name:                        chapter.            (line  374)
+* d--efspec_name <1>:                    chapter.            (line 1040)
+* d--efspec_name <2>:                    chapter.            (line 1845)
+* d--eftypefn_name:                      chapter.            (line  332)
+* d--eftypefn_name <1>:                  chapter.            (line  335)
+* d--eftypefn_name <2>:                  chapter.            (line  998)
+* d--eftypefn_name <3>:                  chapter.            (line 1001)
+* d--eftypefn_name <4>:                  chapter.            (line 1803)
+* d--eftypefn_name <5>:                  chapter.            (line 1806)
+* d--eftypefn_name2:                     chapter.            (line  409)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1075)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1881)
+* d--eftypefun_name:                     chapter.            (line  386)
+* d--eftypefun_name <1>:                 chapter.            (line 1052)
+* d--eftypefun_name <2>:                 chapter.            (line 1857)
+* d--eftypemethod_name on c--lass:       chapter.            (line  401)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1067)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1872)
+* d--eftypeop_name on c--lass:           chapter.            (line  338)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  341)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1004)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1007)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1809)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1812)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  414)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  419)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1080)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1085)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1886)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1891)
+* d--efun_name:                          chapter.            (line  368)
+* d--efun_name <1>:                      chapter.            (line 1034)
+* d--efun_name <2>:                      chapter.            (line 1839)
+* de--ffn_name:                          chapter.            (line  293)
+* de--ffn_name <1>:                      chapter.            (line  959)
+* de--ffn_name <2>:                      chapter.            (line 1762)
+* deffn:                                 chapter.            (line  314)
+* deffn <1>:                             chapter.            (line  316)
+* deffn <2>:                             chapter.            (line  980)
+* deffn <3>:                             chapter.            (line  982)
+* deffn <4>:                             chapter.            (line 1784)
+* deffn <5>:                             chapter.            (line 1786)
+* deffnx:                                chapter.            (line  312)
+* deffnx <1>:                            chapter.            (line  317)
+* deffnx <2>:                            chapter.            (line  978)
+* deffnx <3>:                            chapter.            (line  983)
+* deffnx <4>:                            chapter.            (line 1781)
+* deffnx <5>:                            chapter.            (line 1787)
+* f---aa:                                chapter.            (line 2192)
+* f---bb, f---cc:                        chapter.            (line 2192)
+* f---ddd, f---eee, ffff:                chapter.            (line 2192)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2192)
+* followed:                              chapter.            (line  309)
+* followed <1>:                          chapter.            (line  637)
+* followed <2>:                          chapter.            (line  975)
+* followed <3>:                          chapter.            (line 1303)
+* followed <4>:                          chapter.            (line 1778)
+* followed <5>:                          chapter.            (line 2141)
+* I:                                     chapter.            (line  297)
+* I <1>:                                 chapter.            (line  319)
+* I <2>:                                 chapter.            (line  963)
+* I <3>:                                 chapter.            (line  985)
+* I <4>:                                 chapter.            (line 1766)
+* I <5>:                                 chapter.            (line 1789)
+* id i ule:                              chapter.            (line  303)
+* id i ule <1>:                          chapter.            (line  969)
+* id i ule <2>:                          chapter.            (line 1772)
+* id ule:                                chapter.            (line  302)
+* id ule <1>:                            chapter.            (line  968)
+* id ule <2>:                            chapter.            (line 1771)
+* INVALID:                               chapter.            (line  641)
+* INVALID <1>:                           chapter.            (line 1307)
+* INVALID <2>:                           chapter.            (line 2145)
+* log trap:                              chapter.            (line  299)
+* log trap <1>:                          chapter.            (line  965)
+* log trap <2>:                          chapter.            (line 1768)
+* log trap1:                             chapter.            (line  300)
+* log trap1 <1>:                         chapter.            (line  966)
+* log trap1 <2>:                         chapter.            (line 1769)
+* log trap2:                             chapter.            (line  301)
+* log trap2 <1>:                         chapter.            (line  967)
+* log trap2 <2>:                         chapter.            (line 1770)
+* machin:                                chapter.            (line  305)
+* machin <1>:                            chapter.            (line  307)
+* machin <2>:                            chapter.            (line  633)
+* machin <3>:                            chapter.            (line  634)
+* machin <4>:                            chapter.            (line  635)
+* machin <5>:                            chapter.            (line  636)
+* machin <6>:                            chapter.            (line  971)
+* machin <7>:                            chapter.            (line  973)
+* machin <8>:                            chapter.            (line 1299)
+* machin <9>:                            chapter.            (line 1300)
+* machin <10>:                           chapter.            (line 1301)
+* machin <11>:                           chapter.            (line 1302)
+* machin <12>:                           chapter.            (line 1774)
+* machin <13>:                           chapter.            (line 1776)
+* machin <14>:                           chapter.            (line 2137)
+* machin <15>:                           chapter.            (line 2138)
+* machin <16>:                           chapter.            (line 2139)
+* machin <17>:                           chapter.            (line 2140)
+* n--ame:                                chapter.            (line  326)
+* n--ame <1>:                            chapter.            (line  329)
+* n--ame <2>:                            chapter.            (line  992)
+* n--ame <3>:                            chapter.            (line  995)
+* n--ame <4>:                            chapter.            (line 1797)
+* n--ame <5>:                            chapter.            (line 1800)
+* name2:                                 chapter.            (line  404)
+* name2 <1>:                             chapter.            (line 1070)
+* name2 <2>:                             chapter.            (line 1876)
+* t--ruc:                                chapter.            (line 2192)
+* T--ruc:                                chapter.            (line 2192)
+* truc:                                  chapter.            (line  298)
+* truc <1>:                              chapter.            (line  320)
+* truc <2>:                              chapter.            (line  964)
+* truc <3>:                              chapter.            (line  986)
+* truc <4>:                              chapter.            (line 1767)
+* truc <5>:                              chapter.            (line 1790)
+* xxx, zzz:                              chapter.            (line 2192)
 
 
 
 Tag Table:
-Node: Top18548
-Node: chapter18733
-Ref: chapter-Footnote-197091
-Ref: chapter-Footnote-297111
-Ref: chapter-Footnote-397132
-Ref: chapter-Footnote-497152
-Ref: chapter-Footnote-597173
-Ref: chapter-Footnote-697193
-Ref: chapter-Footnote-797214
-Ref: chapter-Footnote-897252
-Node: s--ect,ion97272
-Node: subsection97475
-Ref: anchor97656
-Node: subsubsection ``simple-double--97656
-Node: subsubsection three---four----''97856
-Node: chapter298028
+Node: Top18914
+Node: chapter19099
+Ref: chapter-Footnote-198581
+Ref: chapter-Footnote-298601
+Ref: chapter-Footnote-398622
+Ref: chapter-Footnote-498642
+Ref: chapter-Footnote-598663
+Ref: chapter-Footnote-698683
+Ref: chapter-Footnote-798704
+Ref: chapter-Footnote-898742
+Node: s--ect,ion98762
+Node: subsection98965
+Ref: anchor99146
+Node: subsubsection ``simple-double--99146
+Node: subsubsection three---four----''99346
+Node: chapter299518
 
 End Tag Table
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 3f390e8dc0..f4658c21da 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -918,62 +925,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -1996,62 +2010,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3130,62 +3151,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4206,62 +4234,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5288,62 +5323,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 0daf119965..cb555b13b0 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -172,62 +172,69 @@ And ? ?\@.
 Now ! !\@@
 but , ,\@
 
+@ampchar \& (\&)
+@atchar @ (@)
+@backslashchar \textbackslash{} (\textbackslash{})
+@hashchar \# (\#)
+@lbracechar \{ (\{)
+@rbracechar \} (\})
+
 @TeX \TeX{}
 @LaTeX \LaTeX{}
-@bullet \textbullet{}
-@copyright \copyright{}
-@dots \dots{}\@
+@bullet \textbullet{} (•)
+@copyright \copyright{} (©)
+@dots \dots{}\@ (…)
 @enddots \dots{}
-@equiv $\equiv{}$
+@equiv $\equiv{}$ (≡)
 @error \fbox{error}
-@expansion $\mapsto{}$
-@minus -
-@point $\star{}$
-@print $\dashv{}$
-@result $\Rightarrow{}$
+@expansion $\mapsto{}$ (↦)
+@minus - (−)
+@point $\star{}$ (★)
+@print $\dashv{}$ (⊣)
+@result $\Rightarrow{}$ (⇒)
 @today \today{}
 
-@aa \aa{}
-@AA \AA{}
-@ae \ae{}
-@oe \oe{}
-@AE \AE{}
-@OE \OE{}
-@o \o{}
-@O \O{}
-@ss \ss{}
-@l \l{}
-@L \L{}
-@DH \DH{}
-@TH \TH{}
-@dh \dh{}
-@th \th{}
-
-@exclamdown \textexclamdown{}
-@questiondown \textquestiondown{}
-@pounds \textsterling{}
-@registeredsymbol \circledR{}
-@ordf \textordfeminine{}
-@ordm \textordmasculine{}
-@comma ,
-@quotedblleft \textquotedblleft{}
-@quotedblright \textquotedblright{}
-@quoteleft \textquoteleft{}
-@quoteright \textquoteright{}
-@quotedblbase \quotedblbase{}
-@quotesinglbase \quotesinglbase{}
-@guillemetleft \guillemotleft{}
-@guillemetright \guillemotright{}
-@guillemotleft \guillemotleft{}
-@guillemotright \guillemotright{}
-@guilsinglleft \guilsinglleft{}
-@guilsinglright \guilsinglright{}
-
-@textdegree \textdegree{}
-@euro \euro{}
-@arrow $\rightarrow{}$
-@leq $\leq{}$
-@geq $\geq{}$
+@aa \aa{} (å)
+@AA \AA{} (Å)
+@ae \ae{} (æ)
+@oe \oe{} (œ)
+@AE \AE{} (Æ)
+@OE \OE{} (Œ)
+@o \o{} (ø)
+@O \O{} (Ø)
+@ss \ss{} (ß)
+@l \l{} (ł)
+@L \L{} (Ł)
+@DH \DH{} (Ð)
+@TH \TH{} (Þ)
+@dh \dh{} (ð)
+@th \th{} (þ)
+
+@exclamdown \textexclamdown{} (¡)
+@questiondown \textquestiondown{} (¿)
+@pounds \textsterling{} (£)
+@registeredsymbol \circledR{} (®)
+@ordf \textordfeminine{} (ª)
+@ordm \textordmasculine{} (º)
+@comma , (,)
+@quotedblleft \textquotedblleft{} (“)
+@quotedblright \textquotedblright{} (”)
+@quoteleft \textquoteleft{} (‘)
+@quoteright \textquoteright{} (’)
+@quotedblbase \quotedblbase{} („)
+@quotesinglbase \quotesinglbase{} (‚)
+@guillemetleft \guillemotleft{} («)
+@guillemetright \guillemotright{} (»)
+@guillemotleft \guillemotleft{} («)
+@guillemotright \guillemotright{} (»)
+@guilsinglleft \guilsinglleft{} (‹)
+@guilsinglright \guilsinglright{} (›)
+
+@textdegree \textdegree{} (°)
+@euro \euro{} (€)
+@arrow $\rightarrow{}$ (→)
+@leq $\leq{}$ (≤)
+@geq $\geq{}$ (≥)
 @tie a~b
 
 \texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
@@ -1825,62 +1832,69 @@ And ? ?\@.
 Now ! !\@@
 but , ,\@
 
+@ampchar \& (\&)
+@atchar @ (@)
+@backslashchar \textbackslash{} (\textbackslash{})
+@hashchar \# (\#)
+@lbracechar \{ (\{)
+@rbracechar \} (\})
+
 @TeX \TeX{}
 @LaTeX \LaTeX{}
-@bullet \textbullet{}
-@copyright \copyright{}
-@dots \dots{}\@
+@bullet \textbullet{} (•)
+@copyright \copyright{} (©)
+@dots \dots{}\@ (…)
 @enddots \dots{}
-@equiv $\equiv{}$
+@equiv $\equiv{}$ (≡)
 @error \fbox{error}
-@expansion $\mapsto{}$
-@minus -
-@point $\star{}$
-@print $\dashv{}$
-@result $\Rightarrow{}$
+@expansion $\mapsto{}$ (↦)
+@minus - (−)
+@point $\star{}$ (★)
+@print $\dashv{}$ (⊣)
+@result $\Rightarrow{}$ (⇒)
 @today \today{}
 
-@aa \aa{}
-@AA \AA{}
-@ae \ae{}
-@oe \oe{}
-@AE \AE{}
-@OE \OE{}
-@o \o{}
-@O \O{}
-@ss \ss{}
-@l \l{}
-@L \L{}
-@DH \DH{}
-@TH \TH{}
-@dh \dh{}
-@th \th{}
-
-@exclamdown \textexclamdown{}
-@questiondown \textquestiondown{}
-@pounds \textsterling{}
-@registeredsymbol \circledR{}
-@ordf \textordfeminine{}
-@ordm \textordmasculine{}
-@comma ,
-@quotedblleft \textquotedblleft{}
-@quotedblright \textquotedblright{}
-@quoteleft \textquoteleft{}
-@quoteright \textquoteright{}
-@quotedblbase \quotedblbase{}
-@quotesinglbase \quotesinglbase{}
-@guillemetleft \guillemotleft{}
-@guillemetright \guillemotright{}
-@guillemotleft \guillemotleft{}
-@guillemotright \guillemotright{}
-@guilsinglleft \guilsinglleft{}
-@guilsinglright \guilsinglright{}
-
-@textdegree \textdegree{}
-@euro \euro{}
-@arrow $\rightarrow{}$
-@leq $\leq{}$
-@geq $\geq{}$
+@aa \aa{} (å)
+@AA \AA{} (Å)
+@ae \ae{} (æ)
+@oe \oe{} (œ)
+@AE \AE{} (Æ)
+@OE \OE{} (Œ)
+@o \o{} (ø)
+@O \O{} (Ø)
+@ss \ss{} (ß)
+@l \l{} (ł)
+@L \L{} (Ł)
+@DH \DH{} (Ð)
+@TH \TH{} (Þ)
+@dh \dh{} (ð)
+@th \th{} (þ)
+
+@exclamdown \textexclamdown{} (¡)
+@questiondown \textquestiondown{} (¿)
+@pounds \textsterling{} (£)
+@registeredsymbol \circledR{} (®)
+@ordf \textordfeminine{} (ª)
+@ordm \textordmasculine{} (º)
+@comma , (,)
+@quotedblleft \textquotedblleft{} (“)
+@quotedblright \textquotedblright{} (”)
+@quoteleft \textquoteleft{} (‘)
+@quoteright \textquoteright{} (’)
+@quotedblbase \quotedblbase{} („)
+@quotesinglbase \quotesinglbase{} (‚)
+@guillemetleft \guillemotleft{} («)
+@guillemetright \guillemotright{} (»)
+@guillemotleft \guillemotleft{} («)
+@guillemotright \guillemotright{} (»)
+@guilsinglleft \guilsinglleft{} (‹)
+@guilsinglright \guilsinglright{} (›)
+
+@textdegree \textdegree{} (°)
+@euro \euro{} (€)
+@arrow $\rightarrow{}$ (→)
+@leq $\leq{}$ (≤)
+@geq $\geq{}$ (≥)
 @tie a~b
 
 \texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
@@ -3496,62 +3510,69 @@ And ? ?\@.
 Now ! !\@@
 but , ,\@
 
+@ampchar \& (\&)
+@atchar @ (@)
+@backslashchar \textbackslash{} (\textbackslash{})
+@hashchar \# (\#)
+@lbracechar \{ (\{)
+@rbracechar \} (\})
+
 @TeX \TeX{}
 @LaTeX \LaTeX{}
-@bullet \textbullet{}
-@copyright \copyright{}
-@dots \dots{}\@
+@bullet \textbullet{} (•)
+@copyright \copyright{} (©)
+@dots \dots{}\@ (…)
 @enddots \dots{}
-@equiv $\equiv{}$
+@equiv $\equiv{}$ (≡)
 @error \fbox{error}
-@expansion $\mapsto{}$
-@minus -
-@point $\star{}$
-@print $\dashv{}$
-@result $\Rightarrow{}$
+@expansion $\mapsto{}$ (↦)
+@minus - (−)
+@point $\star{}$ (★)
+@print $\dashv{}$ (⊣)
+@result $\Rightarrow{}$ (⇒)
 @today \today{}
 
-@aa \aa{}
-@AA \AA{}
-@ae \ae{}
-@oe \oe{}
-@AE \AE{}
-@OE \OE{}
-@o \o{}
-@O \O{}
-@ss \ss{}
-@l \l{}
-@L \L{}
-@DH \DH{}
-@TH \TH{}
-@dh \dh{}
-@th \th{}
-
-@exclamdown \textexclamdown{}
-@questiondown \textquestiondown{}
-@pounds \textsterling{}
-@registeredsymbol \circledR{}
-@ordf \textordfeminine{}
-@ordm \textordmasculine{}
-@comma ,
-@quotedblleft \textquotedblleft{}
-@quotedblright \textquotedblright{}
-@quoteleft \textquoteleft{}
-@quoteright \textquoteright{}
-@quotedblbase \quotedblbase{}
-@quotesinglbase \quotesinglbase{}
-@guillemetleft \guillemotleft{}
-@guillemetright \guillemotright{}
-@guillemotleft \guillemotleft{}
-@guillemotright \guillemotright{}
-@guilsinglleft \guilsinglleft{}
-@guilsinglright \guilsinglright{}
-
-@textdegree \textdegree{}
-@euro \euro{}
-@arrow $\rightarrow{}$
-@leq $\leq{}$
-@geq $\geq{}$
+@aa \aa{} (å)
+@AA \AA{} (Å)
+@ae \ae{} (æ)
+@oe \oe{} (œ)
+@AE \AE{} (Æ)
+@OE \OE{} (Œ)
+@o \o{} (ø)
+@O \O{} (Ø)
+@ss \ss{} (ß)
+@l \l{} (ł)
+@L \L{} (Ł)
+@DH \DH{} (Ð)
+@TH \TH{} (Þ)
+@dh \dh{} (ð)
+@th \th{} (þ)
+
+@exclamdown \textexclamdown{} (¡)
+@questiondown \textquestiondown{} (¿)
+@pounds \textsterling{} (£)
+@registeredsymbol \circledR{} (®)
+@ordf \textordfeminine{} (ª)
+@ordm \textordmasculine{} (º)
+@comma , (,)
+@quotedblleft \textquotedblleft{} (“)
+@quotedblright \textquotedblright{} (”)
+@quoteleft \textquoteleft{} (‘)
+@quoteright \textquoteright{} (’)
+@quotedblbase \quotedblbase{} („)
+@quotesinglbase \quotesinglbase{} (‚)
+@guillemetleft \guillemotleft{} («)
+@guillemetright \guillemotright{} (»)
+@guillemotleft \guillemotleft{} («)
+@guillemotright \guillemotright{} (»)
+@guilsinglleft \guilsinglleft{} (‹)
+@guilsinglright \guilsinglright{} (›)
+
+@textdegree \textdegree{} (°)
+@euro \euro{} (€)
+@arrow $\rightarrow{}$ (→)
+@leq $\leq{}$ (≤)
+@geq $\geq{}$ (≥)
 @tie a~b
 
 \texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
@@ -5145,62 +5166,69 @@ And ? ?\@.
 Now ! !\@@
 but , ,\@
 
+@ampchar \& (\&)
+@atchar @ (@)
+@backslashchar \textbackslash{} (\textbackslash{})
+@hashchar \# (\#)
+@lbracechar \{ (\{)
+@rbracechar \} (\})
+
 @TeX \TeX{}
 @LaTeX \LaTeX{}
-@bullet \textbullet{}
-@copyright \copyright{}
-@dots \dots{}\@
+@bullet \textbullet{} (•)
+@copyright \copyright{} (©)
+@dots \dots{}\@ (…)
 @enddots \dots{}
-@equiv $\equiv{}$
+@equiv $\equiv{}$ (≡)
 @error \fbox{error}
-@expansion $\mapsto{}$
-@minus -
-@point $\star{}$
-@print $\dashv{}$
-@result $\Rightarrow{}$
+@expansion $\mapsto{}$ (↦)
+@minus - (−)
+@point $\star{}$ (★)
+@print $\dashv{}$ (⊣)
+@result $\Rightarrow{}$ (⇒)
 @today \today{}
 
-@aa \aa{}
-@AA \AA{}
-@ae \ae{}
-@oe \oe{}
-@AE \AE{}
-@OE \OE{}
-@o \o{}
-@O \O{}
-@ss \ss{}
-@l \l{}
-@L \L{}
-@DH \DH{}
-@TH \TH{}
-@dh \dh{}
-@th \th{}
-
-@exclamdown \textexclamdown{}
-@questiondown \textquestiondown{}
-@pounds \textsterling{}
-@registeredsymbol \circledR{}
-@ordf \textordfeminine{}
-@ordm \textordmasculine{}
-@comma ,
-@quotedblleft \textquotedblleft{}
-@quotedblright \textquotedblright{}
-@quoteleft \textquoteleft{}
-@quoteright \textquoteright{}
-@quotedblbase \quotedblbase{}
-@quotesinglbase \quotesinglbase{}
-@guillemetleft \guillemotleft{}
-@guillemetright \guillemotright{}
-@guillemotleft \guillemotleft{}
-@guillemotright \guillemotright{}
-@guilsinglleft \guilsinglleft{}
-@guilsinglright \guilsinglright{}
-
-@textdegree \textdegree{}
-@euro \euro{}
-@arrow $\rightarrow{}$
-@leq $\leq{}$
-@geq $\geq{}$
+@aa \aa{} (å)
+@AA \AA{} (Å)
+@ae \ae{} (æ)
+@oe \oe{} (œ)
+@AE \AE{} (Æ)
+@OE \OE{} (Œ)
+@o \o{} (ø)
+@O \O{} (Ø)
+@ss \ss{} (ß)
+@l \l{} (ł)
+@L \L{} (Ł)
+@DH \DH{} (Ð)
+@TH \TH{} (Þ)
+@dh \dh{} (ð)
+@th \th{} (þ)
+
+@exclamdown \textexclamdown{} (¡)
+@questiondown \textquestiondown{} (¿)
+@pounds \textsterling{} (£)
+@registeredsymbol \circledR{} (®)
+@ordf \textordfeminine{} (ª)
+@ordm \textordmasculine{} (º)
+@comma , (,)
+@quotedblleft \textquotedblleft{} (“)
+@quotedblright \textquotedblright{} (”)
+@quoteleft \textquoteleft{} (‘)
+@quoteright \textquoteright{} (’)
+@quotedblbase \quotedblbase{} („)
+@quotesinglbase \quotesinglbase{} (‚)
+@guillemetleft \guillemotleft{} («)
+@guillemetright \guillemotright{} (»)
+@guillemotleft \guillemotleft{} («)
+@guillemotright \guillemotright{} (»)
+@guilsinglleft \guilsinglleft{} (‹)
+@guilsinglright \guilsinglright{} (›)
+
+@textdegree \textdegree{} (°)
+@euro \euro{} (€)
+@arrow $\rightarrow{}$ (→)
+@leq $\leq{}$ (≤)
+@geq $\geq{}$ (≥)
 @tie a~b
 
 \texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
@@ -6796,62 +6824,69 @@ And ?\ ?\@.
 Now !\ !\@@
 but ,\ ,\@
 
+@ampchar \&\ (\&)
+@atchar @\ (@)
+@backslashchar \textbackslash{}\ (\textbackslash{})
+@hashchar \#\ (\#)
+@lbracechar \{\ (\{)
+@rbracechar \}\ (\})
+
 @TeX \TeX{}
 @LaTeX \LaTeX{}
-@bullet \textbullet{}
-@copyright \copyright{}
-@dots \dots{}\@
+@bullet \textbullet{}\ (•)
+@copyright \copyright{}\ (©)
+@dots \dots{}\@\ (…)
 @enddots \dots{}
-@equiv $\equiv{}$
+@equiv $\equiv{}$\ (≡)
 @error \fbox{error}
-@expansion $\mapsto{}$
-@minus -
-@point $\star{}$
-@print $\dashv{}$
-@result $\Rightarrow{}$
+@expansion $\mapsto{}$\ (↦)
+@minus -\ (−)
+@point $\star{}$\ (★)
+@print $\dashv{}$\ (⊣)
+@result $\Rightarrow{}$\ (⇒)
 @today \today{}
 
-@aa \aa{}
-@AA \AA{}
-@ae \ae{}
-@oe \oe{}
-@AE \AE{}
-@OE \OE{}
-@o \o{}
-@O \O{}
-@ss \ss{}
-@l \l{}
-@L \L{}
-@DH \DH{}
-@TH \TH{}
-@dh \dh{}
-@th \th{}
-
-@exclamdown \textexclamdown{}
-@questiondown \textquestiondown{}
-@pounds \textsterling{}
-@registeredsymbol \circledR{}
-@ordf \textordfeminine{}
-@ordm \textordmasculine{}
-@comma ,
-@quotedblleft \textquotedblleft{}
-@quotedblright \textquotedblright{}
-@quoteleft \textquoteleft{}
-@quoteright \textquoteright{}
-@quotedblbase \quotedblbase{}
-@quotesinglbase \quotesinglbase{}
-@guillemetleft \guillemotleft{}
-@guillemetright \guillemotright{}
-@guillemotleft \guillemotleft{}
-@guillemotright \guillemotright{}
-@guilsinglleft \guilsinglleft{}
-@guilsinglright \guilsinglright{}
-
-@textdegree \textdegree{}
-@euro \euro{}
-@arrow $\rightarrow{}$
-@leq $\leq{}$
-@geq $\geq{}$
+@aa \aa{}\ (å)
+@AA \AA{}\ (Å)
+@ae \ae{}\ (æ)
+@oe \oe{}\ (œ)
+@AE \AE{}\ (Æ)
+@OE \OE{}\ (Œ)
+@o \o{}\ (ø)
+@O \O{}\ (Ø)
+@ss \ss{}\ (ß)
+@l \l{}\ (ł)
+@L \L{}\ (Ł)
+@DH \DH{}\ (Ð)
+@TH \TH{}\ (Þ)
+@dh \dh{}\ (ð)
+@th \th{}\ (þ)
+
+@exclamdown \textexclamdown{}\ (¡)
+@questiondown \textquestiondown{}\ (¿)
+@pounds \textsterling{}\ (£)
+@registeredsymbol \circledR{}\ (®)
+@ordf \textordfeminine{}\ (ª)
+@ordm \textordmasculine{}\ (º)
+@comma ,\ (,)
+@quotedblleft \textquotedblleft{}\ (“)
+@quotedblright \textquotedblright{}\ (”)
+@quoteleft \textquoteleft{}\ (‘)
+@quoteright \textquoteright{}\ (’)
+@quotedblbase \quotedblbase{}\ („)
+@quotesinglbase \quotesinglbase{}\ (‚)
+@guillemetleft \guillemotleft{}\ («)
+@guillemetright \guillemotright{}\ (»)
+@guillemotleft \guillemotleft{}\ («)
+@guillemotright \guillemotright{}\ (»)
+@guilsinglleft \guilsinglleft{}\ (‹)
+@guilsinglright \guilsinglright{}\ (›)
+
+@textdegree \textdegree{}\ (°)
+@euro \euro{}\ (€)
+@arrow $\rightarrow{}$\ (→)
+@leq $\leq{}$\ (≤)
+@geq $\geq{}$\ (≥)
 @tie a~b
 
 \texttt{@acronym\{{-}{-}a,an accronym\}}\ {-}{-}a\ (an accronym)
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 629c3d19e8..cbd6621038 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -80,62 +80,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
@@ -1279,62 +1286,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
@@ -2429,62 +2443,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
@@ -3605,62 +3626,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
@@ -4750,62 +4778,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 7a678a0122..cd6cad5a92 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -968,62 +975,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2044,62 +2058,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3176,62 +3197,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4250,62 +4278,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5330,62 +5365,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index d8732d61a9..e9e1c3b0a1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index c8d4762618..7de58faa40 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -974,62 +981,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2050,62 +2064,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3132,62 +3153,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 3ff26dea74..6b60cf78c1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 f8d8908f2c..8abcf4a6c5 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 545aa91a8e..67a3a89e6c 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 c785c63044..80515668d1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 40d0599933..e125a7667e 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 187dd71529..3e4094fe89 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -945,62 +952,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2023,62 +2037,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
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 f80e25130b..36635db855 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 0e43bd3a8c..1512edceec 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 e413d27a15..1cd70c9f72 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 b804676cfb..b2caa92c4c 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
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
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 510ef2b957..9c957bb2b0 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots <small class="enddots">...</small>
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 </p>
-<p>@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-</p>
-<p>@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-</p>
-<p>@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+<p>@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+</p>
+<p>@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+</p>
+<p>@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&#8211;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &#38; (&amp;)
+@atchar &#64; (@)
+@backslashchar &#92; (\)
+@hashchar &#35; (#)
+@lbracechar &#123; ({)
+@rbracechar &#125; (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &#8226;
-@copyright &#169;
-@dots &#8230;
+@bullet &#8226; (•)
+@copyright &#169; (©)
+@dots &#8230; (…)
 @enddots ...
-@equiv &#8801;
+@equiv &#8801; (≡)
 @error error&#8594;
-@expansion &#8614;
-@minus &#8722;
-@point &#9733;
-@print &#8867;
-@result &#8658;
+@expansion &#8614; (↦)
+@minus &#8722; (−)
+@point &#9733; (★)
+@print &#8867; (⊣)
+@result &#8658; (⇒)
 @today a sunny day
 
-@aa &#229;
-@AA &#197;
-@ae &#230;
-@oe &#339;
-@AE &#198;
-@OE &#338;
-@o &#248;
-@O &#216;
-@ss &#223;
-@l &#322;
-@L &#321;
-@DH &#208;
-@TH &#222;
-@dh &#240;
-@th &#254;
-
-@exclamdown &#161;
-@questiondown &#191;
-@pounds &#163;
-@registeredsymbol &#174;
-@ordf &#170;
-@ordm &#186;
-@comma &#44;
-@quotedblleft &#8220;
-@quotedblright &#8221;
-@quoteleft &#8216;
-@quoteright &#8217;
-@quotedblbase &#8222;
-@quotesinglbase &#8218;
-@guillemetleft &#171;
-@guillemetright &#187;
-@guillemotleft &#171;
-@guillemotright &#187;
-@guilsinglleft &#8249;
-@guilsinglright &#8250;
-
-@textdegree &#176;
-@euro &#8364;
-@arrow &#8594;
-@leq &#8804;
-@geq &#8805;
+@aa &#229; (å)
+@AA &#197; (Å)
+@ae &#230; (æ)
+@oe &#339; (œ)
+@AE &#198; (Æ)
+@OE &#338; (Œ)
+@o &#248; (ø)
+@O &#216; (Ø)
+@ss &#223; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &#208; (Ð)
+@TH &#222; (Þ)
+@dh &#240; (ð)
+@th &#254; (þ)
+
+@exclamdown &#161; (¡)
+@questiondown &#191; (¿)
+@pounds &#163; (£)
+@registeredsymbol &#174; (®)
+@ordf &#170; (ª)
+@ordm &#186; (º)
+@comma &#44; (,)
+@quotedblleft &#8220; (“)
+@quotedblright &#8221; (”)
+@quoteleft &#8216; (‘)
+@quoteright &#8217; (’)
+@quotedblbase &#8222; („)
+@quotesinglbase &#8218; (‚)
+@guillemetleft &#171; («)
+@guillemetright &#187; (»)
+@guillemotleft &#171; («)
+@guillemotright &#187; (»)
+@guilsinglleft &#8249; (‹)
+@guilsinglright &#8250; (›)
+
+@textdegree &#176; (°)
+@euro &#8364; (€)
+@arrow &#8594; (→)
+@leq &#8804; (≤)
+@geq &#8805; (≥)
 @tie a&#160;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index aa5e4696fd..ae05184268 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -38,20 +38,26 @@ kbd: '``simple-double--three---four----'''
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
 
-   @TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
-@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day
+   @ampchar & (&) @atchar @ (@) @backslashchar \ (\) @hashchar # (#)
+@lbracechar { ({) @rbracechar } (})
 
-   @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø @O Ø @ss ß @l ł @L Ł @DH Ð
-@TH Þ @dh ð @th þ
+   @TeX TeX @LaTeX LaTeX @bullet * (•) @copyright (C) (©) @dots ... (…)
+@enddots ...  @equiv == (≡) @error error-> @expansion ==> (↦) @minus -
+(−) @point -!- (★) @print -| (⊣) @result => (⇒) @today a sunny day
 
-   @exclamdown ¡  @questiondown ¿  @pounds £ @registeredsymbol (R) @ordf
-ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
-@quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
-@guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright ›
+   @aa å (å) @AA Å (Å) @ae æ (æ) @oe œ (œ) @AE Æ (Æ) @OE Œ (Œ) @o ø (ø)
+@O Ø (Ø) @ss ß (ß) @l ł (ł) @L Ł (Ł) @DH Ð (Ð) @TH Þ (Þ) @dh ð (ð) @th þ
+(þ)
 
-   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+   @exclamdown ¡  (¡) @questiondown ¿  (¿) @pounds £ (£)
+@registeredsymbol (R) (®) @ordf ª (ª) @ordm º (º) @comma , (,)
+@quotedblleft " (“) @quotedblright " (”) @quoteleft ` (‘) @quoteright '
+(’) @quotedblbase „ („) @quotesinglbase ‚ (‚) @guillemetleft « («)
+@guillemetright » (») @guillemotleft « («) @guillemotright » (»)
+@guilsinglleft ‹ (‹) @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)
@@ -706,20 +712,26 @@ kbd: '``simple-double--three---four----'''
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
 
-   @TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
-@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day
+   @ampchar & (&) @atchar @ (@) @backslashchar \ (\) @hashchar # (#)
+@lbracechar { ({) @rbracechar } (})
+
+   @TeX TeX @LaTeX LaTeX @bullet * (•) @copyright (C) (©) @dots ... (…)
+@enddots ...  @equiv == (≡) @error error-> @expansion ==> (↦) @minus -
+(−) @point -!- (★) @print -| (⊣) @result => (⇒) @today a sunny day
 
-   @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø @O Ø @ss ß @l ł @L Ł @DH Ð
-@TH Þ @dh ð @th þ
+   @aa å (å) @AA Å (Å) @ae æ (æ) @oe œ (œ) @AE Æ (Æ) @OE Œ (Œ) @o ø (ø)
+@O Ø (Ø) @ss ß (ß) @l ł (ł) @L Ł (Ł) @DH Ð (Ð) @TH Þ (Þ) @dh ð (ð) @th þ
+(þ)
 
-   @exclamdown ¡  @questiondown ¿  @pounds £ @registeredsymbol (R) @ordf
-ª @ordm º @comma , @quotedblleft " @quotedblright " @quoteleft `
-@quoteright ' @quotedblbase „ @quotesinglbase ‚ @guillemetleft «
-@guillemetright » @guillemotleft « @guillemotright » @guilsinglleft ‹
-@guilsinglright ›
+   @exclamdown ¡  (¡) @questiondown ¿  (¿) @pounds £ (£)
+@registeredsymbol (R) (®) @ordf ª (ª) @ordm º (º) @comma , (,)
+@quotedblleft " (“) @quotedblright " (”) @quoteleft ` (‘) @quoteright '
+(’) @quotedblbase „ („) @quotesinglbase ‚ (‚) @guillemetleft « («)
+@guillemetright » (») @guillemotleft « («) @guillemotright » (»)
+@guilsinglleft ‹ (‹) @guilsinglright › (›)
 
-   @textdegree ° @euro € @arrow -> @leq ≤ @geq ≥ @tie a b
+   @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)
@@ -1418,62 +1430,69 @@ cross ref name: (file name). '@inforef{}' *note ::
      Now ! !@
      but , ,
 
+     @ampchar & (&)
+     @atchar @ (@)
+     @backslashchar \ (\)
+     @hashchar # (#)
+     @lbracechar { ({)
+     @rbracechar } (})
+
      @TeX TeX
      @LaTeX LaTeX
-     @bullet *
-     @copyright (C)
-     @dots ...
+     @bullet * (•)
+     @copyright (C) (©)
+     @dots ... (…)
      @enddots ...
-     @equiv ==
+     @equiv == (≡)
      @error error->
-     @expansion ==>
-     @minus -
-     @point -!-
-     @print -|
-     @result =>
+     @expansion ==> (↦)
+     @minus - (−)
+     @point -!- (★)
+     @print -| (⊣)
+     @result => (⇒)
      @today a sunny day
 
-     @aa å
-     @AA Å
-     @ae æ
-     @oe œ
-     @AE Æ
-     @OE Œ
-     @o ø
-     @O Ø
-     @ss ß
-     @l ł
-     @L Ł
-     @DH Ð
-     @TH Þ
-     @dh ð
-     @th þ
-
-     @exclamdown ¡
-     @questiondown ¿
-     @pounds £
-     @registeredsymbol (R)
-     @ordf ª
-     @ordm º
-     @comma ,
-     @quotedblleft "
-     @quotedblright "
-     @quoteleft `
-     @quoteright '
-     @quotedblbase „
-     @quotesinglbase ‚
-     @guillemetleft «
-     @guillemetright »
-     @guillemotleft «
-     @guillemotright »
-     @guilsinglleft ‹
-     @guilsinglright ›
-
-     @textdegree °
-     @euro €
-     @arrow ->
-     @leq ≤
-     @geq ≥
+     @aa å (å)
+     @AA Å (Å)
+     @ae æ (æ)
+     @oe œ (œ)
+     @AE Æ (Æ)
+     @OE Œ (Œ)
+     @o ø (ø)
+     @O Ø (Ø)
+     @ss ß (ß)
+     @l ł (ł)
+     @L Ł (Ł)
+     @DH Ð (Ð)
+     @TH Þ (Þ)
+     @dh ð (ð)
+     @th þ (þ)
+
+     @exclamdown ¡ (¡)
+     @questiondown ¿ (¿)
+     @pounds £ (£)
+     @registeredsymbol (R) (®)
+     @ordf ª (ª)
+     @ordm º (º)
+     @comma , (,)
+     @quotedblleft " (“)
+     @quotedblright " (”)
+     @quoteleft ` (‘)
+     @quoteright ' (’)
+     @quotedblbase „ („)
+     @quotesinglbase ‚ (‚)
+     @guillemetleft « («)
+     @guillemetright » (»)
+     @guillemotleft « («)
+     @guillemotright » (»)
+     @guilsinglleft ‹ (‹)
+     @guilsinglright › (›)
+
+     @textdegree ° (°)
+     @euro € (€)
+     @arrow -> (→)
+     @leq ≤ (≤)
+     @geq ≥ (≥)
      @tie a b
 
      @acronym{--a,an accronym} --a (an accronym)
@@ -2201,300 +2220,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2197)
+* truc:                                  chapter.            (line 2216)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2197)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2216)
 
    cp
 
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  696)
-* " <2>:                                 chapter.            (line 1375)
+* " <1>:                                 chapter.            (line  702)
+* " <2>:                                 chapter.            (line 1387)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  696)
-* -option <2>:                           chapter.            (line 1375)
-* .:                                     chapter.            (line 2197)
-* ?:                                     chapter.            (line 2197)
-* a:                                     chapter.            (line 2197)
-* aaa, bbb:                              chapter.            (line 2197)
-* a--a:                                  chapter.            (line 2197)
-* a--asis:                               chapter.            (line  500)
-* a--asis <1>:                           chapter.            (line 1168)
-* a--asis <2>:                           chapter.            (line 1974)
-* b:                                     chapter.            (line  501)
-* b <1>:                                 chapter.            (line 1169)
-* b <2>:                                 chapter.            (line 1975)
-* b--b, c--c:                            chapter.            (line 2197)
+* -option <1>:                           chapter.            (line  702)
+* -option <2>:                           chapter.            (line 1387)
+* .:                                     chapter.            (line 2216)
+* ?:                                     chapter.            (line 2216)
+* a:                                     chapter.            (line 2216)
+* aaa, bbb:                              chapter.            (line 2216)
+* a--a:                                  chapter.            (line 2216)
+* a--asis:                               chapter.            (line  506)
+* a--asis <1>:                           chapter.            (line 1180)
+* a--asis <2>:                           chapter.            (line 1993)
+* b:                                     chapter.            (line  507)
+* b <1>:                                 chapter.            (line 1181)
+* b <2>:                                 chapter.            (line 1994)
+* b--b, c--c:                            chapter.            (line 2216)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2197)
-* d--efcv_name:                          chapter.            (line  341)
-* d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1009)
-* d--efcv_name <3>:                      chapter.            (line 1012)
-* d--efcv_name <4>:                      chapter.            (line 1815)
-* d--efcv_name <5>:                      chapter.            (line 1818)
-* d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1054)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1860)
-* d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1045)
-* d--efopt_name <2>:                     chapter.            (line 1851)
-* d--eftypecv_name of c--lass:           chapter.            (line  347)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1015)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1018)
-* 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  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1086)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1893)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1896)
-* d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1057)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1863)
-* d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1051)
-* d--eftypevar_name <2>:                 chapter.            (line 1857)
-* d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1006)
-* d--eftypevr_name <2>:                  chapter.            (line 1812)
-* d--efvar_name:                         chapter.            (line  371)
-* d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1039)
-* d--efvar_name <3>:                     chapter.            (line 1042)
-* d--efvar_name <4>:                     chapter.            (line 1845)
-* d--efvar_name <5>:                     chapter.            (line 1848)
-* d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  985)
-* d--efvr_name <2>:                      chapter.            (line 1791)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2197)
-* index entry between item and itemx:    chapter.            (line  505)
-* index entry between item and itemx <1>: chapter.           (line  631)
-* index entry between item and itemx <2>: chapter.           (line 1173)
-* index entry between item and itemx <3>: chapter.           (line 1299)
-* index entry between item and itemx <4>: chapter.           (line 1979)
-* index entry between item and itemx <5>: chapter.           (line 2138)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2216)
+* d--efcv_name:                          chapter.            (line  347)
+* d--efcv_name <1>:                      chapter.            (line  350)
+* d--efcv_name <2>:                      chapter.            (line 1021)
+* d--efcv_name <3>:                      chapter.            (line 1024)
+* d--efcv_name <4>:                      chapter.            (line 1834)
+* d--efcv_name <5>:                      chapter.            (line 1837)
+* d--efivar_name of c--lass:             chapter.            (line  392)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1066)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1879)
+* d--efopt_name:                         chapter.            (line  383)
+* d--efopt_name <1>:                     chapter.            (line 1057)
+* d--efopt_name <2>:                     chapter.            (line 1870)
+* d--eftypecv_name of c--lass:           chapter.            (line  353)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  356)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1027)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1030)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1840)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1843)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  424)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  427)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1912)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1915)
+* d--eftypeivar_name of c--lass:         chapter.            (line  395)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1069)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1882)
+* d--eftypevar_name:                     chapter.            (line  389)
+* d--eftypevar_name <1>:                 chapter.            (line 1063)
+* d--eftypevar_name <2>:                 chapter.            (line 1876)
+* d--eftypevr_name:                      chapter.            (line  344)
+* d--eftypevr_name <1>:                  chapter.            (line 1018)
+* d--eftypevr_name <2>:                  chapter.            (line 1831)
+* d--efvar_name:                         chapter.            (line  377)
+* d--efvar_name <1>:                     chapter.            (line  380)
+* d--efvar_name <2>:                     chapter.            (line 1051)
+* d--efvar_name <3>:                     chapter.            (line 1054)
+* d--efvar_name <4>:                     chapter.            (line 1864)
+* d--efvar_name <5>:                     chapter.            (line 1867)
+* d--efvr_name:                          chapter.            (line  323)
+* d--efvr_name <1>:                      chapter.            (line  997)
+* d--efvr_name <2>:                      chapter.            (line 1810)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2216)
+* index entry between item and itemx:    chapter.            (line  511)
+* index entry between item and itemx <1>: chapter.           (line  637)
+* index entry between item and itemx <2>: chapter.           (line 1185)
+* index entry between item and itemx <3>: chapter.           (line 1311)
+* index entry between item and itemx <4>: chapter.           (line 1998)
+* index entry between item and itemx <5>: chapter.           (line 2157)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  960)
-* index entry within deffn <2>:          chapter.            (line 1764)
-* index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  871)
-* index entry within itemize <2>:        chapter.            (line 1675)
-* index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  893)
-* index entry within multitable <2>:     chapter.            (line 1698)
-* t-ruc:                                 chapter.            (line 2197)
-* T-ruc:                                 chapter.            (line 2197)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  795)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1598)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  790)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1593)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  805)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1608)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  800)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1603)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  797)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1600)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
+* index entry within deffn:              chapter.            (line  298)
+* index entry within deffn <1>:          chapter.            (line  972)
+* index entry within deffn <2>:          chapter.            (line 1783)
+* index entry within itemize:            chapter.            (line  209)
+* index entry within itemize <1>:        chapter.            (line  883)
+* index entry within itemize <2>:        chapter.            (line 1694)
+* index entry within multitable:         chapter.            (line  231)
+* index entry within multitable <1>:     chapter.            (line  905)
+* index entry within multitable <2>:     chapter.            (line 1717)
+* t-ruc:                                 chapter.            (line 2216)
+* T-ruc:                                 chapter.            (line 2216)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  807)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1617)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  802)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1612)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  817)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1627)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  812)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1622)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  809)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1619)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  792)
+                                                             (line  804)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1595)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
+                                                             (line 1614)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  807)
+                                                             (line  819)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1610)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
+                                                             (line 1629)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  802)
+                                                             (line  814)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1605)
+                                                             (line 1624)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  696)
-* --foption <2>:                         chapter.            (line 1375)
-* .:                                     chapter.            (line 2197)
-* ?:                                     chapter.            (line 2197)
+* --foption <1>:                         chapter.            (line  702)
+* --foption <2>:                         chapter.            (line 1387)
+* .:                                     chapter.            (line 2216)
+* ?:                                     chapter.            (line 2216)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  696)
-* `` <2>:                                chapter.            (line 1375)
-* a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  504)
-* a <2>:                                 chapter.            (line  630)
-* a <3>:                                 chapter.            (line  973)
-* a <4>:                                 chapter.            (line 1172)
-* a <5>:                                 chapter.            (line 1298)
-* a <6>:                                 chapter.            (line 1777)
-* a <7>:                                 chapter.            (line 1978)
-* a <8>:                                 chapter.            (line 2137)
-* a <9>:                                 chapter.            (line 2197)
-* after:                                 chapter.            (line  641)
-* after <1>:                             chapter.            (line 1309)
-* after <2>:                             chapter.            (line 2148)
-* arg2:                                  chapter.            (line  424)
-* arg2 <1>:                              chapter.            (line 1092)
-* arg2 <2>:                              chapter.            (line 1900)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line  631)
-* b <2>:                                 chapter.            (line 1173)
-* b <3>:                                 chapter.            (line 1299)
-* b <4>:                                 chapter.            (line 1979)
-* b <5>:                                 chapter.            (line 2138)
-* bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  968)
-* bidule machin <2>:                     chapter.            (line 1772)
-* d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  952)
-* d--effn_name <2>:                      chapter.            (line 1756)
-* d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1033)
-* d--efmac_name <2>:                     chapter.            (line 1839)
-* d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1060)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1866)
-* d--efop_name on c--lass:               chapter.            (line  353)
-* d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1021)
-* d--efop_name on c--lass <3>:           chapter.            (line 1024)
-* 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  368)
-* d--efspec_name <1>:                    chapter.            (line 1036)
-* d--efspec_name <2>:                    chapter.            (line 1842)
-* d--eftypefn_name:                      chapter.            (line  326)
-* d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  994)
-* d--eftypefn_name <3>:                  chapter.            (line  997)
-* d--eftypefn_name <4>:                  chapter.            (line 1800)
-* d--eftypefn_name <5>:                  chapter.            (line 1803)
-* d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1071)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1878)
-* d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1048)
-* d--eftypefun_name <2>:                 chapter.            (line 1854)
-* d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1063)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1869)
-* d--eftypeop_name on c--lass:           chapter.            (line  332)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1000)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1003)
-* 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  408)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1076)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1081)
-* 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  362)
-* d--efun_name <1>:                      chapter.            (line 1030)
-* d--efun_name <2>:                      chapter.            (line 1836)
-* de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  955)
-* de--ffn_name <2>:                      chapter.            (line 1759)
-* deffn:                                 chapter.            (line  308)
-* deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  976)
-* deffn <3>:                             chapter.            (line  978)
-* deffn <4>:                             chapter.            (line 1781)
-* deffn <5>:                             chapter.            (line 1783)
-* deffnx:                                chapter.            (line  306)
-* deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  974)
-* deffnx <3>:                            chapter.            (line  979)
-* deffnx <4>:                            chapter.            (line 1778)
-* deffnx <5>:                            chapter.            (line 1784)
-* f---aa:                                chapter.            (line 2197)
-* f---bb, f---cc:                        chapter.            (line 2197)
-* f---ddd, f---eee, ffff:                chapter.            (line 2197)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2197)
-* followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  639)
-* followed <2>:                          chapter.            (line  971)
-* followed <3>:                          chapter.            (line 1307)
-* followed <4>:                          chapter.            (line 1775)
-* followed <5>:                          chapter.            (line 2146)
-* I:                                     chapter.            (line  291)
-* I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  959)
-* I <3>:                                 chapter.            (line  981)
-* I <4>:                                 chapter.            (line 1763)
-* I <5>:                                 chapter.            (line 1786)
-* id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  965)
-* id i ule <2>:                          chapter.            (line 1769)
-* id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  964)
-* id ule <2>:                            chapter.            (line 1768)
-* INVALID:                               chapter.            (line  643)
-* INVALID <1>:                           chapter.            (line 1311)
-* INVALID <2>:                           chapter.            (line 2150)
-* log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  961)
-* log trap <2>:                          chapter.            (line 1765)
-* log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  962)
-* log trap1 <2>:                         chapter.            (line 1766)
-* log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  963)
-* log trap2 <2>:                         chapter.            (line 1767)
-* machin:                                chapter.            (line  299)
-* machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  635)
-* machin <3>:                            chapter.            (line  636)
-* machin <4>:                            chapter.            (line  637)
-* machin <5>:                            chapter.            (line  638)
-* machin <6>:                            chapter.            (line  967)
-* machin <7>:                            chapter.            (line  969)
-* machin <8>:                            chapter.            (line 1303)
-* machin <9>:                            chapter.            (line 1304)
-* machin <10>:                           chapter.            (line 1305)
-* machin <11>:                           chapter.            (line 1306)
-* machin <12>:                           chapter.            (line 1771)
-* machin <13>:                           chapter.            (line 1773)
-* machin <14>:                           chapter.            (line 2142)
-* machin <15>:                           chapter.            (line 2143)
-* machin <16>:                           chapter.            (line 2144)
-* machin <17>:                           chapter.            (line 2145)
-* n--ame:                                chapter.            (line  320)
-* n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  988)
-* n--ame <3>:                            chapter.            (line  991)
-* n--ame <4>:                            chapter.            (line 1794)
-* n--ame <5>:                            chapter.            (line 1797)
-* name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1066)
-* name2 <2>:                             chapter.            (line 1873)
-* t--ruc:                                chapter.            (line 2197)
-* T--ruc:                                chapter.            (line 2197)
-* truc:                                  chapter.            (line  292)
-* truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  960)
-* truc <3>:                              chapter.            (line  982)
-* truc <4>:                              chapter.            (line 1764)
-* truc <5>:                              chapter.            (line 1787)
-* xxx, zzz:                              chapter.            (line 2197)
+* `` <1>:                                chapter.            (line  702)
+* `` <2>:                                chapter.            (line 1387)
+* a:                                     chapter.            (line  311)
+* a <1>:                                 chapter.            (line  510)
+* a <2>:                                 chapter.            (line  636)
+* a <3>:                                 chapter.            (line  985)
+* a <4>:                                 chapter.            (line 1184)
+* a <5>:                                 chapter.            (line 1310)
+* a <6>:                                 chapter.            (line 1796)
+* a <7>:                                 chapter.            (line 1997)
+* a <8>:                                 chapter.            (line 2156)
+* a <9>:                                 chapter.            (line 2216)
+* after:                                 chapter.            (line  647)
+* after <1>:                             chapter.            (line 1321)
+* after <2>:                             chapter.            (line 2167)
+* arg2:                                  chapter.            (line  430)
+* arg2 <1>:                              chapter.            (line 1104)
+* arg2 <2>:                              chapter.            (line 1919)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line  637)
+* b <2>:                                 chapter.            (line 1185)
+* b <3>:                                 chapter.            (line 1311)
+* b <4>:                                 chapter.            (line 1998)
+* b <5>:                                 chapter.            (line 2157)
+* bidule machin:                         chapter.            (line  306)
+* bidule machin <1>:                     chapter.            (line  980)
+* bidule machin <2>:                     chapter.            (line 1791)
+* d--effn_name:                          chapter.            (line  290)
+* d--effn_name <1>:                      chapter.            (line  964)
+* d--effn_name <2>:                      chapter.            (line 1775)
+* d--efmac_name:                         chapter.            (line  371)
+* d--efmac_name <1>:                     chapter.            (line 1045)
+* d--efmac_name <2>:                     chapter.            (line 1858)
+* d--efmethod_name on c--lass:           chapter.            (line  398)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1072)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1885)
+* d--efop_name on c--lass:               chapter.            (line  359)
+* d--efop_name on c--lass <1>:           chapter.            (line  362)
+* d--efop_name on c--lass <2>:           chapter.            (line 1033)
+* d--efop_name on c--lass <3>:           chapter.            (line 1036)
+* d--efop_name on c--lass <4>:           chapter.            (line 1846)
+* d--efop_name on c--lass <5>:           chapter.            (line 1849)
+* d--efspec_name:                        chapter.            (line  374)
+* d--efspec_name <1>:                    chapter.            (line 1048)
+* d--efspec_name <2>:                    chapter.            (line 1861)
+* d--eftypefn_name:                      chapter.            (line  332)
+* d--eftypefn_name <1>:                  chapter.            (line  335)
+* d--eftypefn_name <2>:                  chapter.            (line 1006)
+* d--eftypefn_name <3>:                  chapter.            (line 1009)
+* d--eftypefn_name <4>:                  chapter.            (line 1819)
+* d--eftypefn_name <5>:                  chapter.            (line 1822)
+* d--eftypefn_name2:                     chapter.            (line  409)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1083)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1897)
+* d--eftypefun_name:                     chapter.            (line  386)
+* d--eftypefun_name <1>:                 chapter.            (line 1060)
+* d--eftypefun_name <2>:                 chapter.            (line 1873)
+* d--eftypemethod_name on c--lass:       chapter.            (line  401)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1075)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1888)
+* d--eftypeop_name on c--lass:           chapter.            (line  338)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  341)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1012)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1015)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1825)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1828)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  414)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  419)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1902)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1907)
+* d--efun_name:                          chapter.            (line  368)
+* d--efun_name <1>:                      chapter.            (line 1042)
+* d--efun_name <2>:                      chapter.            (line 1855)
+* de--ffn_name:                          chapter.            (line  293)
+* de--ffn_name <1>:                      chapter.            (line  967)
+* de--ffn_name <2>:                      chapter.            (line 1778)
+* deffn:                                 chapter.            (line  314)
+* deffn <1>:                             chapter.            (line  316)
+* deffn <2>:                             chapter.            (line  988)
+* deffn <3>:                             chapter.            (line  990)
+* deffn <4>:                             chapter.            (line 1800)
+* deffn <5>:                             chapter.            (line 1802)
+* deffnx:                                chapter.            (line  312)
+* deffnx <1>:                            chapter.            (line  317)
+* deffnx <2>:                            chapter.            (line  986)
+* deffnx <3>:                            chapter.            (line  991)
+* deffnx <4>:                            chapter.            (line 1797)
+* deffnx <5>:                            chapter.            (line 1803)
+* f---aa:                                chapter.            (line 2216)
+* f---bb, f---cc:                        chapter.            (line 2216)
+* f---ddd, f---eee, ffff:                chapter.            (line 2216)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2216)
+* followed:                              chapter.            (line  309)
+* followed <1>:                          chapter.            (line  645)
+* followed <2>:                          chapter.            (line  983)
+* followed <3>:                          chapter.            (line 1319)
+* followed <4>:                          chapter.            (line 1794)
+* followed <5>:                          chapter.            (line 2165)
+* I:                                     chapter.            (line  297)
+* I <1>:                                 chapter.            (line  319)
+* I <2>:                                 chapter.            (line  971)
+* I <3>:                                 chapter.            (line  993)
+* I <4>:                                 chapter.            (line 1782)
+* I <5>:                                 chapter.            (line 1805)
+* id i ule:                              chapter.            (line  303)
+* id i ule <1>:                          chapter.            (line  977)
+* id i ule <2>:                          chapter.            (line 1788)
+* id ule:                                chapter.            (line  302)
+* id ule <1>:                            chapter.            (line  976)
+* id ule <2>:                            chapter.            (line 1787)
+* INVALID:                               chapter.            (line  649)
+* INVALID <1>:                           chapter.            (line 1323)
+* INVALID <2>:                           chapter.            (line 2169)
+* log trap:                              chapter.            (line  299)
+* log trap <1>:                          chapter.            (line  973)
+* log trap <2>:                          chapter.            (line 1784)
+* log trap1:                             chapter.            (line  300)
+* log trap1 <1>:                         chapter.            (line  974)
+* log trap1 <2>:                         chapter.            (line 1785)
+* log trap2:                             chapter.            (line  301)
+* log trap2 <1>:                         chapter.            (line  975)
+* log trap2 <2>:                         chapter.            (line 1786)
+* machin:                                chapter.            (line  305)
+* machin <1>:                            chapter.            (line  307)
+* machin <2>:                            chapter.            (line  641)
+* machin <3>:                            chapter.            (line  642)
+* machin <4>:                            chapter.            (line  643)
+* machin <5>:                            chapter.            (line  644)
+* machin <6>:                            chapter.            (line  979)
+* machin <7>:                            chapter.            (line  981)
+* machin <8>:                            chapter.            (line 1315)
+* machin <9>:                            chapter.            (line 1316)
+* machin <10>:                           chapter.            (line 1317)
+* machin <11>:                           chapter.            (line 1318)
+* machin <12>:                           chapter.            (line 1790)
+* machin <13>:                           chapter.            (line 1792)
+* machin <14>:                           chapter.            (line 2161)
+* machin <15>:                           chapter.            (line 2162)
+* machin <16>:                           chapter.            (line 2163)
+* machin <17>:                           chapter.            (line 2164)
+* n--ame:                                chapter.            (line  326)
+* n--ame <1>:                            chapter.            (line  329)
+* n--ame <2>:                            chapter.            (line 1000)
+* n--ame <3>:                            chapter.            (line 1003)
+* n--ame <4>:                            chapter.            (line 1813)
+* n--ame <5>:                            chapter.            (line 1816)
+* name2:                                 chapter.            (line  404)
+* name2 <1>:                             chapter.            (line 1078)
+* name2 <2>:                             chapter.            (line 1892)
+* t--ruc:                                chapter.            (line 2216)
+* T--ruc:                                chapter.            (line 2216)
+* truc:                                  chapter.            (line  298)
+* truc <1>:                              chapter.            (line  320)
+* truc <2>:                              chapter.            (line  972)
+* truc <3>:                              chapter.            (line  994)
+* truc <4>:                              chapter.            (line 1783)
+* truc <5>:                              chapter.            (line 1806)
+* xxx, zzz:                              chapter.            (line 2216)
 
    vr
 
@@ -2506,9 +2525,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  359)
-* d--eftp_name <1>:                      chapter.            (line 1027)
-* d--eftp_name <2>:                      chapter.            (line 1833)
+* d--eftp_name:                          chapter.            (line  365)
+* d--eftp_name <1>:                      chapter.            (line 1039)
+* d--eftp_name <2>:                      chapter.            (line 1852)
 
    (8)
 
@@ -2553,285 +2572,285 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  696)
-* " <2>:                                 chapter.            (line 1375)
+* " <1>:                                 chapter.            (line  702)
+* " <2>:                                 chapter.            (line 1387)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  696)
-* -option <2>:                           chapter.            (line 1375)
-* .:                                     chapter.            (line 2197)
-* ?:                                     chapter.            (line 2197)
-* a:                                     chapter.            (line 2197)
-* aaa, bbb:                              chapter.            (line 2197)
-* a--a:                                  chapter.            (line 2197)
-* a--asis:                               chapter.            (line  500)
-* a--asis <1>:                           chapter.            (line 1168)
-* a--asis <2>:                           chapter.            (line 1974)
-* b:                                     chapter.            (line  501)
-* b <1>:                                 chapter.            (line 1169)
-* b <2>:                                 chapter.            (line 1975)
-* b--b, c--c:                            chapter.            (line 2197)
-* counting entry:                        chapter.            (line 2534)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2197)
-* d--efcv_name:                          chapter.            (line  341)
-* d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1009)
-* d--efcv_name <3>:                      chapter.            (line 1012)
-* d--efcv_name <4>:                      chapter.            (line 1815)
-* d--efcv_name <5>:                      chapter.            (line 1818)
-* d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1054)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1860)
-* d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1045)
-* d--efopt_name <2>:                     chapter.            (line 1851)
-* d--eftypecv_name of c--lass:           chapter.            (line  347)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1015)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1018)
-* 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  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1086)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1893)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1896)
-* d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1057)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1863)
-* d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1051)
-* d--eftypevar_name <2>:                 chapter.            (line 1857)
-* d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1006)
-* d--eftypevr_name <2>:                  chapter.            (line 1812)
-* d--efvar_name:                         chapter.            (line  371)
-* d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1039)
-* d--efvar_name <3>:                     chapter.            (line 1042)
-* d--efvar_name <4>:                     chapter.            (line 1845)
-* d--efvar_name <5>:                     chapter.            (line 1848)
-* d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  985)
-* d--efvr_name <2>:                      chapter.            (line 1791)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2197)
-* index entry between item and itemx:    chapter.            (line  505)
-* index entry between item and itemx <1>: chapter.           (line  631)
-* index entry between item and itemx <2>: chapter.           (line 1173)
-* index entry between item and itemx <3>: chapter.           (line 1299)
-* index entry between item and itemx <4>: chapter.           (line 1979)
-* index entry between item and itemx <5>: chapter.           (line 2138)
-* index entry in footnote:               chapter.            (line 2529)
-* index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  960)
-* index entry within deffn <2>:          chapter.            (line 1764)
-* index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  871)
-* index entry within itemize <2>:        chapter.            (line 1675)
-* index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  893)
-* index entry within multitable <2>:     chapter.            (line 1698)
-* t-ruc:                                 chapter.            (line 2197)
-* T-ruc:                                 chapter.            (line 2197)
-* vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  795)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1598)
-* vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  790)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1593)
-* vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  805)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1608)
-* vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  800)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1603)
-* vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  797)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1600)
-* vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
+* -option <1>:                           chapter.            (line  702)
+* -option <2>:                           chapter.            (line 1387)
+* .:                                     chapter.            (line 2216)
+* ?:                                     chapter.            (line 2216)
+* a:                                     chapter.            (line 2216)
+* aaa, bbb:                              chapter.            (line 2216)
+* a--a:                                  chapter.            (line 2216)
+* a--asis:                               chapter.            (line  506)
+* a--asis <1>:                           chapter.            (line 1180)
+* a--asis <2>:                           chapter.            (line 1993)
+* b:                                     chapter.            (line  507)
+* b <1>:                                 chapter.            (line 1181)
+* b <2>:                                 chapter.            (line 1994)
+* b--b, c--c:                            chapter.            (line 2216)
+* counting entry:                        chapter.            (line 2553)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2216)
+* d--efcv_name:                          chapter.            (line  347)
+* d--efcv_name <1>:                      chapter.            (line  350)
+* d--efcv_name <2>:                      chapter.            (line 1021)
+* d--efcv_name <3>:                      chapter.            (line 1024)
+* d--efcv_name <4>:                      chapter.            (line 1834)
+* d--efcv_name <5>:                      chapter.            (line 1837)
+* d--efivar_name of c--lass:             chapter.            (line  392)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1066)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1879)
+* d--efopt_name:                         chapter.            (line  383)
+* d--efopt_name <1>:                     chapter.            (line 1057)
+* d--efopt_name <2>:                     chapter.            (line 1870)
+* d--eftypecv_name of c--lass:           chapter.            (line  353)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  356)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1027)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1030)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1840)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1843)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  424)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  427)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1098)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1101)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1912)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1915)
+* d--eftypeivar_name of c--lass:         chapter.            (line  395)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1069)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1882)
+* d--eftypevar_name:                     chapter.            (line  389)
+* d--eftypevar_name <1>:                 chapter.            (line 1063)
+* d--eftypevar_name <2>:                 chapter.            (line 1876)
+* d--eftypevr_name:                      chapter.            (line  344)
+* d--eftypevr_name <1>:                  chapter.            (line 1018)
+* d--eftypevr_name <2>:                  chapter.            (line 1831)
+* d--efvar_name:                         chapter.            (line  377)
+* d--efvar_name <1>:                     chapter.            (line  380)
+* d--efvar_name <2>:                     chapter.            (line 1051)
+* d--efvar_name <3>:                     chapter.            (line 1054)
+* d--efvar_name <4>:                     chapter.            (line 1864)
+* d--efvar_name <5>:                     chapter.            (line 1867)
+* d--efvr_name:                          chapter.            (line  323)
+* d--efvr_name <1>:                      chapter.            (line  997)
+* d--efvr_name <2>:                      chapter.            (line 1810)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2216)
+* index entry between item and itemx:    chapter.            (line  511)
+* index entry between item and itemx <1>: chapter.           (line  637)
+* index entry between item and itemx <2>: chapter.           (line 1185)
+* index entry between item and itemx <3>: chapter.           (line 1311)
+* index entry between item and itemx <4>: chapter.           (line 1998)
+* index entry between item and itemx <5>: chapter.           (line 2157)
+* index entry in footnote:               chapter.            (line 2548)
+* index entry within deffn:              chapter.            (line  298)
+* index entry within deffn <1>:          chapter.            (line  972)
+* index entry within deffn <2>:          chapter.            (line 1783)
+* index entry within itemize:            chapter.            (line  209)
+* index entry within itemize <1>:        chapter.            (line  883)
+* index entry within itemize <2>:        chapter.            (line 1694)
+* index entry within multitable:         chapter.            (line  231)
+* index entry within multitable <1>:     chapter.            (line  905)
+* index entry within multitable <2>:     chapter.            (line 1717)
+* t-ruc:                                 chapter.            (line 2216)
+* T-ruc:                                 chapter.            (line 2216)
+* vtable i--tem code kbdinputstyle:      chapter.            (line  133)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  807)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1617)
+* vtable i--tem default kbdinputstyle:   chapter.            (line  128)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  802)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1612)
+* vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  817)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1627)
+* vtable i--tem example kbdinputstyle:   chapter.            (line  138)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  812)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1622)
+* vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  809)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1619)
+* vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  792)
+                                                             (line  804)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1595)
-* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
+                                                             (line 1614)
+* vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  807)
+                                                             (line  819)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1610)
-* vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
+                                                             (line 1629)
+* vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  802)
+                                                             (line  814)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1605)
+                                                             (line 1624)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  696)
-* --foption <2>:                         chapter.            (line 1375)
-* .:                                     chapter.            (line 2197)
-* ?:                                     chapter.            (line 2197)
+* --foption <1>:                         chapter.            (line  702)
+* --foption <2>:                         chapter.            (line 1387)
+* .:                                     chapter.            (line 2216)
+* ?:                                     chapter.            (line 2216)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  696)
-* `` <2>:                                chapter.            (line 1375)
-* a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  504)
-* a <2>:                                 chapter.            (line  630)
-* a <3>:                                 chapter.            (line  973)
-* a <4>:                                 chapter.            (line 1172)
-* a <5>:                                 chapter.            (line 1298)
-* a <6>:                                 chapter.            (line 1777)
-* a <7>:                                 chapter.            (line 1978)
-* a <8>:                                 chapter.            (line 2137)
-* a <9>:                                 chapter.            (line 2197)
-* after:                                 chapter.            (line  641)
-* after <1>:                             chapter.            (line 1309)
-* after <2>:                             chapter.            (line 2148)
-* arg2:                                  chapter.            (line  424)
-* arg2 <1>:                              chapter.            (line 1092)
-* arg2 <2>:                              chapter.            (line 1900)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line  631)
-* b <2>:                                 chapter.            (line 1173)
-* b <3>:                                 chapter.            (line 1299)
-* b <4>:                                 chapter.            (line 1979)
-* b <5>:                                 chapter.            (line 2138)
-* bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  968)
-* bidule machin <2>:                     chapter.            (line 1772)
-* d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  952)
-* d--effn_name <2>:                      chapter.            (line 1756)
-* d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1033)
-* d--efmac_name <2>:                     chapter.            (line 1839)
-* d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1060)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1866)
-* d--efop_name on c--lass:               chapter.            (line  353)
-* d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1021)
-* d--efop_name on c--lass <3>:           chapter.            (line 1024)
-* 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  368)
-* d--efspec_name <1>:                    chapter.            (line 1036)
-* d--efspec_name <2>:                    chapter.            (line 1842)
-* d--eftypefn_name:                      chapter.            (line  326)
-* d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  994)
-* d--eftypefn_name <3>:                  chapter.            (line  997)
-* d--eftypefn_name <4>:                  chapter.            (line 1800)
-* d--eftypefn_name <5>:                  chapter.            (line 1803)
-* d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1071)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1878)
-* d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1048)
-* d--eftypefun_name <2>:                 chapter.            (line 1854)
-* d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1063)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1869)
-* d--eftypeop_name on c--lass:           chapter.            (line  332)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1000)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1003)
-* 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  408)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1076)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1081)
-* 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  362)
-* d--efun_name <1>:                      chapter.            (line 1030)
-* d--efun_name <2>:                      chapter.            (line 1836)
-* de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  955)
-* de--ffn_name <2>:                      chapter.            (line 1759)
-* deffn:                                 chapter.            (line  308)
-* deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  976)
-* deffn <3>:                             chapter.            (line  978)
-* deffn <4>:                             chapter.            (line 1781)
-* deffn <5>:                             chapter.            (line 1783)
-* deffnx:                                chapter.            (line  306)
-* deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  974)
-* deffnx <3>:                            chapter.            (line  979)
-* deffnx <4>:                            chapter.            (line 1778)
-* deffnx <5>:                            chapter.            (line 1784)
-* f---aa:                                chapter.            (line 2197)
-* f---bb, f---cc:                        chapter.            (line 2197)
-* f---ddd, f---eee, ffff:                chapter.            (line 2197)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2197)
-* followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  639)
-* followed <2>:                          chapter.            (line  971)
-* followed <3>:                          chapter.            (line 1307)
-* followed <4>:                          chapter.            (line 1775)
-* followed <5>:                          chapter.            (line 2146)
-* I:                                     chapter.            (line  291)
-* I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  959)
-* I <3>:                                 chapter.            (line  981)
-* I <4>:                                 chapter.            (line 1763)
-* I <5>:                                 chapter.            (line 1786)
-* id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  965)
-* id i ule <2>:                          chapter.            (line 1769)
-* id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  964)
-* id ule <2>:                            chapter.            (line 1768)
-* INVALID:                               chapter.            (line  643)
-* INVALID <1>:                           chapter.            (line 1311)
-* INVALID <2>:                           chapter.            (line 2150)
-* log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  961)
-* log trap <2>:                          chapter.            (line 1765)
-* log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  962)
-* log trap1 <2>:                         chapter.            (line 1766)
-* log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  963)
-* log trap2 <2>:                         chapter.            (line 1767)
-* machin:                                chapter.            (line  299)
-* machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  635)
-* machin <3>:                            chapter.            (line  636)
-* machin <4>:                            chapter.            (line  637)
-* machin <5>:                            chapter.            (line  638)
-* machin <6>:                            chapter.            (line  967)
-* machin <7>:                            chapter.            (line  969)
-* machin <8>:                            chapter.            (line 1303)
-* machin <9>:                            chapter.            (line 1304)
-* machin <10>:                           chapter.            (line 1305)
-* machin <11>:                           chapter.            (line 1306)
-* machin <12>:                           chapter.            (line 1771)
-* machin <13>:                           chapter.            (line 1773)
-* machin <14>:                           chapter.            (line 2142)
-* machin <15>:                           chapter.            (line 2143)
-* machin <16>:                           chapter.            (line 2144)
-* machin <17>:                           chapter.            (line 2145)
-* n--ame:                                chapter.            (line  320)
-* n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  988)
-* n--ame <3>:                            chapter.            (line  991)
-* n--ame <4>:                            chapter.            (line 1794)
-* n--ame <5>:                            chapter.            (line 1797)
-* name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1066)
-* name2 <2>:                             chapter.            (line 1873)
-* t--ruc:                                chapter.            (line 2197)
-* T--ruc:                                chapter.            (line 2197)
-* truc:                                  chapter.            (line  292)
-* truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  960)
-* truc <3>:                              chapter.            (line  982)
-* truc <4>:                              chapter.            (line 1764)
-* truc <5>:                              chapter.            (line 1787)
-* xxx, zzz:                              chapter.            (line 2197)
+* `` <1>:                                chapter.            (line  702)
+* `` <2>:                                chapter.            (line 1387)
+* a:                                     chapter.            (line  311)
+* a <1>:                                 chapter.            (line  510)
+* a <2>:                                 chapter.            (line  636)
+* a <3>:                                 chapter.            (line  985)
+* a <4>:                                 chapter.            (line 1184)
+* a <5>:                                 chapter.            (line 1310)
+* a <6>:                                 chapter.            (line 1796)
+* a <7>:                                 chapter.            (line 1997)
+* a <8>:                                 chapter.            (line 2156)
+* a <9>:                                 chapter.            (line 2216)
+* after:                                 chapter.            (line  647)
+* after <1>:                             chapter.            (line 1321)
+* after <2>:                             chapter.            (line 2167)
+* arg2:                                  chapter.            (line  430)
+* arg2 <1>:                              chapter.            (line 1104)
+* arg2 <2>:                              chapter.            (line 1919)
+* b:                                     chapter.            (line  511)
+* b <1>:                                 chapter.            (line  637)
+* b <2>:                                 chapter.            (line 1185)
+* b <3>:                                 chapter.            (line 1311)
+* b <4>:                                 chapter.            (line 1998)
+* b <5>:                                 chapter.            (line 2157)
+* bidule machin:                         chapter.            (line  306)
+* bidule machin <1>:                     chapter.            (line  980)
+* bidule machin <2>:                     chapter.            (line 1791)
+* d--effn_name:                          chapter.            (line  290)
+* d--effn_name <1>:                      chapter.            (line  964)
+* d--effn_name <2>:                      chapter.            (line 1775)
+* d--efmac_name:                         chapter.            (line  371)
+* d--efmac_name <1>:                     chapter.            (line 1045)
+* d--efmac_name <2>:                     chapter.            (line 1858)
+* d--efmethod_name on c--lass:           chapter.            (line  398)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1072)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1885)
+* d--efop_name on c--lass:               chapter.            (line  359)
+* d--efop_name on c--lass <1>:           chapter.            (line  362)
+* d--efop_name on c--lass <2>:           chapter.            (line 1033)
+* d--efop_name on c--lass <3>:           chapter.            (line 1036)
+* d--efop_name on c--lass <4>:           chapter.            (line 1846)
+* d--efop_name on c--lass <5>:           chapter.            (line 1849)
+* d--efspec_name:                        chapter.            (line  374)
+* d--efspec_name <1>:                    chapter.            (line 1048)
+* d--efspec_name <2>:                    chapter.            (line 1861)
+* d--eftypefn_name:                      chapter.            (line  332)
+* d--eftypefn_name <1>:                  chapter.            (line  335)
+* d--eftypefn_name <2>:                  chapter.            (line 1006)
+* d--eftypefn_name <3>:                  chapter.            (line 1009)
+* d--eftypefn_name <4>:                  chapter.            (line 1819)
+* d--eftypefn_name <5>:                  chapter.            (line 1822)
+* d--eftypefn_name2:                     chapter.            (line  409)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1083)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1897)
+* d--eftypefun_name:                     chapter.            (line  386)
+* d--eftypefun_name <1>:                 chapter.            (line 1060)
+* d--eftypefun_name <2>:                 chapter.            (line 1873)
+* d--eftypemethod_name on c--lass:       chapter.            (line  401)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1075)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1888)
+* d--eftypeop_name on c--lass:           chapter.            (line  338)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  341)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1012)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1015)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1825)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1828)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  414)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  419)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1088)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1093)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1902)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1907)
+* d--efun_name:                          chapter.            (line  368)
+* d--efun_name <1>:                      chapter.            (line 1042)
+* d--efun_name <2>:                      chapter.            (line 1855)
+* de--ffn_name:                          chapter.            (line  293)
+* de--ffn_name <1>:                      chapter.            (line  967)
+* de--ffn_name <2>:                      chapter.            (line 1778)
+* deffn:                                 chapter.            (line  314)
+* deffn <1>:                             chapter.            (line  316)
+* deffn <2>:                             chapter.            (line  988)
+* deffn <3>:                             chapter.            (line  990)
+* deffn <4>:                             chapter.            (line 1800)
+* deffn <5>:                             chapter.            (line 1802)
+* deffnx:                                chapter.            (line  312)
+* deffnx <1>:                            chapter.            (line  317)
+* deffnx <2>:                            chapter.            (line  986)
+* deffnx <3>:                            chapter.            (line  991)
+* deffnx <4>:                            chapter.            (line 1797)
+* deffnx <5>:                            chapter.            (line 1803)
+* f---aa:                                chapter.            (line 2216)
+* f---bb, f---cc:                        chapter.            (line 2216)
+* f---ddd, f---eee, ffff:                chapter.            (line 2216)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2216)
+* followed:                              chapter.            (line  309)
+* followed <1>:                          chapter.            (line  645)
+* followed <2>:                          chapter.            (line  983)
+* followed <3>:                          chapter.            (line 1319)
+* followed <4>:                          chapter.            (line 1794)
+* followed <5>:                          chapter.            (line 2165)
+* I:                                     chapter.            (line  297)
+* I <1>:                                 chapter.            (line  319)
+* I <2>:                                 chapter.            (line  971)
+* I <3>:                                 chapter.            (line  993)
+* I <4>:                                 chapter.            (line 1782)
+* I <5>:                                 chapter.            (line 1805)
+* id i ule:                              chapter.            (line  303)
+* id i ule <1>:                          chapter.            (line  977)
+* id i ule <2>:                          chapter.            (line 1788)
+* id ule:                                chapter.            (line  302)
+* id ule <1>:                            chapter.            (line  976)
+* id ule <2>:                            chapter.            (line 1787)
+* INVALID:                               chapter.            (line  649)
+* INVALID <1>:                           chapter.            (line 1323)
+* INVALID <2>:                           chapter.            (line 2169)
+* log trap:                              chapter.            (line  299)
+* log trap <1>:                          chapter.            (line  973)
+* log trap <2>:                          chapter.            (line 1784)
+* log trap1:                             chapter.            (line  300)
+* log trap1 <1>:                         chapter.            (line  974)
+* log trap1 <2>:                         chapter.            (line 1785)
+* log trap2:                             chapter.            (line  301)
+* log trap2 <1>:                         chapter.            (line  975)
+* log trap2 <2>:                         chapter.            (line 1786)
+* machin:                                chapter.            (line  305)
+* machin <1>:                            chapter.            (line  307)
+* machin <2>:                            chapter.            (line  641)
+* machin <3>:                            chapter.            (line  642)
+* machin <4>:                            chapter.            (line  643)
+* machin <5>:                            chapter.            (line  644)
+* machin <6>:                            chapter.            (line  979)
+* machin <7>:                            chapter.            (line  981)
+* machin <8>:                            chapter.            (line 1315)
+* machin <9>:                            chapter.            (line 1316)
+* machin <10>:                           chapter.            (line 1317)
+* machin <11>:                           chapter.            (line 1318)
+* machin <12>:                           chapter.            (line 1790)
+* machin <13>:                           chapter.            (line 1792)
+* machin <14>:                           chapter.            (line 2161)
+* machin <15>:                           chapter.            (line 2162)
+* machin <16>:                           chapter.            (line 2163)
+* machin <17>:                           chapter.            (line 2164)
+* n--ame:                                chapter.            (line  326)
+* n--ame <1>:                            chapter.            (line  329)
+* n--ame <2>:                            chapter.            (line 1000)
+* n--ame <3>:                            chapter.            (line 1003)
+* n--ame <4>:                            chapter.            (line 1813)
+* n--ame <5>:                            chapter.            (line 1816)
+* name2:                                 chapter.            (line  404)
+* name2 <1>:                             chapter.            (line 1078)
+* name2 <2>:                             chapter.            (line 1892)
+* t--ruc:                                chapter.            (line 2216)
+* T--ruc:                                chapter.            (line 2216)
+* truc:                                  chapter.            (line  298)
+* truc <1>:                              chapter.            (line  320)
+* truc <2>:                              chapter.            (line  972)
+* truc <3>:                              chapter.            (line  994)
+* truc <4>:                              chapter.            (line 1783)
+* truc <5>:                              chapter.            (line 1806)
+* xxx, zzz:                              chapter.            (line 2216)
 
 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 ca36845a8d..525738b947 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -100,62 +100,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} -a (an accronym)
@@ -932,62 +939,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} --a (an accronym)
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 d5d02bd638..17da638b82 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -70,62 +70,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -955,62 +962,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2032,62 +2046,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3142,62 +3163,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4223,62 +4251,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
@@ -5448,62 +5483,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index 29d34bc31c..936495427b 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
index e28900429e..c6c304cf4e 100644
--- 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
+++ 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
@@ -1,5 +1,5 @@
-1710  @chapter chapter
-1669  @top Top section
+1724  @chapter chapter
+1683  @top Top section
   10  @section A section
    7  @subsection subsection
    4  @centerchap chapter 2
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting 
b/tp/tests/layout/res_parser/formatting_textcontent/formatting
index 9cd36c3c2e..2c3f34d4ca 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -74,62 +74,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} --aan accronym
@@ -900,62 +907,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} --aan accronym
@@ -1747,62 +1761,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} --aan accronym
@@ -2568,62 +2589,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet *
-@copyright (C)
-@dots ...
+@bullet * (•)
+@copyright (C) (©)
+@dots ... (…)
 @enddots ...
-@equiv ==
+@equiv == (≡)
 @error error-->
-@expansion ==>
-@minus -
-@point -!-
-@print -|
-@result =>
+@expansion ==> (↦)
+@minus - (−)
+@point -!- (★)
+@print -| (⊣)
+@result => (⇒)
 @today a sunny day
 
-@aa aa
-@AA AA
-@ae ae
-@oe oe
-@AE AE
-@OE OE
-@o /o
-@O /O
-@ss ss
-@l /l
-@L /L
-@DH D
-@TH TH
-@dh d
-@th th
-
-@exclamdown !
-@questiondown ?
-@pounds #
-@registeredsymbol (R)
-@ordf a
-@ordm o
-@comma ,
-@quotedblleft "
-@quotedblright "
-@quoteleft `
-@quoteright '
-@quotedblbase ,,
-@quotesinglbase ,
-@guillemetleft <<
-@guillemetright >>
-@guillemotleft <<
-@guillemotright >>
-@guilsinglleft <
-@guilsinglright >
-
-@textdegree o
-@euro Euro
-@arrow ->
-@leq <=
-@geq >=
+@aa aa (å)
+@AA AA (Å)
+@ae ae (æ)
+@oe oe (œ)
+@AE AE (Æ)
+@OE OE (Œ)
+@o /o (ø)
+@O /O (Ø)
+@ss ss (ß)
+@l /l (ł)
+@L /L (Ł)
+@DH D (Ð)
+@TH TH (Þ)
+@dh d (ð)
+@th th (þ)
+
+@exclamdown ! (¡)
+@questiondown ? (¿)
+@pounds # (£)
+@registeredsymbol (R) (®)
+@ordf a (ª)
+@ordm o (º)
+@comma , (,)
+@quotedblleft " (“)
+@quotedblright " (”)
+@quoteleft ` (‘)
+@quoteright ' (’)
+@quotedblbase ,, („)
+@quotesinglbase , (‚)
+@guillemetleft << («)
+@guillemetright >> (»)
+@guillemotleft << («)
+@guillemotright >> (»)
+@guilsinglleft < (‹)
+@guilsinglright > (›)
+
+@textdegree o (°)
+@euro Euro (€)
+@arrow -> (→)
+@leq <= (≤)
+@geq >= (≥)
 @tie a b
 
 @acronym{--a,an accronym} --aan accronym
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 e5129c98ed..99024ff093 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 43a3ab488c..b19baf78fe 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -958,62 +965,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2036,62 +2050,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3170,62 +3191,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -4246,62 +4274,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-</p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-</p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+</p>
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+</p>
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -5328,62 +5363,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 154bf59587..56a3926a2e 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -83,62 +83,69 @@ And ? ?@:.
 Now ! !@:@@
 but , ,@:
 
+@@ampchar @ampchar{} (&amp;)
+@@atchar @atchar{} (@@)
+@@backslashchar @backslashchar{} (\\)
+@@hashchar @hashchar{} (#)
+@@lbracechar @lbracechar{} (@{)
+@@rbracechar @rbracechar{} (@})
+
 @@TeX @TeX{}
 @@LaTeX @LaTeX{}
-@@bullet @bullet{}
-@@copyright @copyright{}
-@@dots @dots{}
+@@bullet @bullet{} (•)
+@@copyright @copyright{} (©)
+@@dots @dots{} (…)
 @@enddots @enddots{}
-@@equiv @equiv{}
+@@equiv @equiv{} (≡)
 @@error @error{}
-@@expansion @expansion{}
-@@minus @minus{}
-@@point @point{}
-@@print @print{}
-@@result @result{}
+@@expansion @expansion{} (↦)
+@@minus @minus{} (−)
+@@point @point{} (★)
+@@print @print{} (⊣)
+@@result @result{} (⇒)
 @@today @today{}
 
-@@aa @aa{}
-@@AA @AA{}
-@@ae @ae{}
-@@oe @oe{}
-@@AE @AE{}
-@@OE @OE{}
-@@o @o{}
-@@O @O{}
-@@ss @ss{}
-@@l @l{}
-@@L @L{}
-@@DH @DH{}
-@@TH @TH{}
-@@dh @dh{}
-@@th @th{}
-
-@@exclamdown @exclamdown{}
-@@questiondown @questiondown{}
-@@pounds @pounds{}
-@@registeredsymbol @registeredsymbol{}
-@@ordf @ordf{}
-@@ordm @ordm{}
-@@comma @comma{}
-@@quotedblleft @quotedblleft{}
-@@quotedblright @quotedblright{}
-@@quoteleft @quoteleft{}
-@@quoteright @quoteright{}
-@@quotedblbase @quotedblbase{}
-@@quotesinglbase @quotesinglbase{}
-@@guillemetleft @guillemetleft{}
-@@guillemetright @guillemetright{}
-@@guillemotleft @guillemotleft{}
-@@guillemotright @guillemotright{}
-@@guilsinglleft @guilsinglleft{}
-@@guilsinglright @guilsinglright{}
-
-@@textdegree @textdegree{}
-@@euro @euro{}
-@@arrow @arrow{}
-@@leq @leq{}
-@@geq @geq{}
+@@aa @aa{} (å)
+@@AA @AA{} (Å)
+@@ae @ae{} (æ)
+@@oe @oe{} (œ)
+@@AE @AE{} (Æ)
+@@OE @OE{} (Œ)
+@@o @o{} (ø)
+@@O @O{} (Ø)
+@@ss @ss{} (ß)
+@@l @l{} (ł)
+@@L @L{} (Ł)
+@@DH @DH{} (Ð)
+@@TH @TH{} (Þ)
+@@dh @dh{} (ð)
+@@th @th{} (þ)
+
+@@exclamdown @exclamdown{} (¡)
+@@questiondown @questiondown{} (¿)
+@@pounds @pounds{} (£)
+@@registeredsymbol @registeredsymbol{} (®)
+@@ordf @ordf{} (ª)
+@@ordm @ordm{} (º)
+@@comma @comma{} (,)
+@@quotedblleft @quotedblleft{} (“)
+@@quotedblright @quotedblright{} (”)
+@@quoteleft @quoteleft{} (‘)
+@@quoteright @quoteright{} (’)
+@@quotedblbase @quotedblbase{} („)
+@@quotesinglbase @quotesinglbase{} (‚)
+@@guillemetleft @guillemetleft{} («)
+@@guillemetright @guillemetright{} (»)
+@@guillemotleft @guillemotleft{} («)
+@@guillemotright @guillemotright{} (»)
+@@guilsinglleft @guilsinglleft{} (‹)
+@@guilsinglright @guilsinglright{} (›)
+
+@@textdegree @textdegree{} (°)
+@@euro @euro{} (€)
+@@arrow @arrow{} (→)
+@@leq @leq{} (≤)
+@@geq @geq{} (≥)
 @@tie a@tie{}b
 
 @code{@@acronym@{--a,an accronym@}} @acronym{--a,an accronym}
@@ -1281,62 +1288,69 @@ And ? ?&noeos;.
 Now ! !&noeos;&arobase;
 but , ,&noeos;
 </para>
+<para>&arobase;ampchar &ampchar; (&amp;)
+&arobase;atchar &atchar; (&arobase;)
+&arobase;backslashchar &backslashchar; (\)
+&arobase;hashchar &hashchar; (#)
+&arobase;lbracechar &lbracechar; (&lbrace;)
+&arobase;rbracechar &rbracechar; (&rbrace;)
+</para>
 <para>&arobase;TeX &tex;
 &arobase;LaTeX &latex;
-&arobase;bullet &bullet;
-&arobase;copyright &copyright;
-&arobase;dots &dots;
+&arobase;bullet &bullet; (•)
+&arobase;copyright &copyright; (©)
+&arobase;dots &dots; (…)
 &arobase;enddots &enddots;
-&arobase;equiv &equiv;
+&arobase;equiv &equiv; (≡)
 &arobase;error &errorglyph;
-&arobase;expansion &expansion;
-&arobase;minus &minus;
-&arobase;point &point;
-&arobase;print &printglyph;
-&arobase;result &result;
+&arobase;expansion &expansion; (↦)
+&arobase;minus &minus; (−)
+&arobase;point &point; (★)
+&arobase;print &printglyph; (⊣)
+&arobase;result &result; (⇒)
 &arobase;today <today/>
 </para>
-<para>&arobase;aa &aring;
-&arobase;AA &Aring;
-&arobase;ae &aelig;
-&arobase;oe &oelig;
-&arobase;AE &AElig;
-&arobase;OE &OElig;
-&arobase;o &oslash;
-&arobase;O &Oslash;
-&arobase;ss &szlig;
-&arobase;l &lslash;
-&arobase;L &Lslash;
-&arobase;DH &ETH;
-&arobase;TH &THORN;
-&arobase;dh &eth;
-&arobase;th &thorn;
-</para>
-<para>&arobase;exclamdown &iexcl;
-&arobase;questiondown &iquest;
-&arobase;pounds &pound;
-&arobase;registeredsymbol &registered;
-&arobase;ordf &ordf;
-&arobase;ordm &ordm;
-&arobase;comma &comma;
-&arobase;quotedblleft &ldquo;
-&arobase;quotedblright &rdquo;
-&arobase;quoteleft &lsquo;
-&arobase;quoteright &rsquo;
-&arobase;quotedblbase &bdquo;
-&arobase;quotesinglbase &sbquo;
-&arobase;guillemetleft &laquo;
-&arobase;guillemetright &raquo;
-&arobase;guillemotleft &guillemotleft;
-&arobase;guillemotright &guillemotright;
-&arobase;guilsinglleft &lsaquo;
-&arobase;guilsinglright &rsaquo;
-</para>
-<para>&arobase;textdegree &deg;
-&arobase;euro &euro;
-&arobase;arrow &rarr;
-&arobase;leq &le;
-&arobase;geq &ge;
+<para>&arobase;aa &aring; (å)
+&arobase;AA &Aring; (Å)
+&arobase;ae &aelig; (æ)
+&arobase;oe &oelig; (œ)
+&arobase;AE &AElig; (Æ)
+&arobase;OE &OElig; (Œ)
+&arobase;o &oslash; (ø)
+&arobase;O &Oslash; (Ø)
+&arobase;ss &szlig; (ß)
+&arobase;l &lslash; (ł)
+&arobase;L &Lslash; (Ł)
+&arobase;DH &ETH; (Ð)
+&arobase;TH &THORN; (Þ)
+&arobase;dh &eth; (ð)
+&arobase;th &thorn; (þ)
+</para>
+<para>&arobase;exclamdown &iexcl; (¡)
+&arobase;questiondown &iquest; (¿)
+&arobase;pounds &pound; (£)
+&arobase;registeredsymbol &registered; (®)
+&arobase;ordf &ordf; (ª)
+&arobase;ordm &ordm; (º)
+&arobase;comma &comma; (,)
+&arobase;quotedblleft &ldquo; (“)
+&arobase;quotedblright &rdquo; (”)
+&arobase;quoteleft &lsquo; (‘)
+&arobase;quoteright &rsquo; (’)
+&arobase;quotedblbase &bdquo; („)
+&arobase;quotesinglbase &sbquo; (‚)
+&arobase;guillemetleft &laquo; («)
+&arobase;guillemetright &raquo; (»)
+&arobase;guillemotleft &guillemotleft; («)
+&arobase;guillemotright &guillemotright; (»)
+&arobase;guilsinglleft &lsaquo; (‹)
+&arobase;guilsinglright &rsaquo; (›)
+</para>
+<para>&arobase;textdegree &deg; (°)
+&arobase;euro &euro; (€)
+&arobase;arrow &rarr; (→)
+&arobase;leq &le; (≤)
+&arobase;geq &ge; (≥)
 &arobase;tie a&nbsp;b
 </para>
 <para><code>&arobase;acronym&lbrace;--a,an accronym&rbrace;</code> 
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an 
accronym</acronymdesc></acronym>
@@ -2421,62 +2435,69 @@ And ? ?&noeos;.
 Now ! !&noeos;&arobase;
 but , ,&noeos;
 </para>
+<para>&arobase;ampchar &ampchar; (&amp;)
+&arobase;atchar &atchar; (&arobase;)
+&arobase;backslashchar &backslashchar; (\)
+&arobase;hashchar &hashchar; (#)
+&arobase;lbracechar &lbracechar; (&lbrace;)
+&arobase;rbracechar &rbracechar; (&rbrace;)
+</para>
 <para>&arobase;TeX &tex;
 &arobase;LaTeX &latex;
-&arobase;bullet &bullet;
-&arobase;copyright &copyright;
-&arobase;dots &dots;
+&arobase;bullet &bullet; (•)
+&arobase;copyright &copyright; (©)
+&arobase;dots &dots; (…)
 &arobase;enddots &enddots;
-&arobase;equiv &equiv;
+&arobase;equiv &equiv; (≡)
 &arobase;error &errorglyph;
-&arobase;expansion &expansion;
-&arobase;minus &minus;
-&arobase;point &point;
-&arobase;print &printglyph;
-&arobase;result &result;
+&arobase;expansion &expansion; (↦)
+&arobase;minus &minus; (−)
+&arobase;point &point; (★)
+&arobase;print &printglyph; (⊣)
+&arobase;result &result; (⇒)
 &arobase;today <today/>
 </para>
-<para>&arobase;aa &aring;
-&arobase;AA &Aring;
-&arobase;ae &aelig;
-&arobase;oe &oelig;
-&arobase;AE &AElig;
-&arobase;OE &OElig;
-&arobase;o &oslash;
-&arobase;O &Oslash;
-&arobase;ss &szlig;
-&arobase;l &lslash;
-&arobase;L &Lslash;
-&arobase;DH &ETH;
-&arobase;TH &THORN;
-&arobase;dh &eth;
-&arobase;th &thorn;
-</para>
-<para>&arobase;exclamdown &iexcl;
-&arobase;questiondown &iquest;
-&arobase;pounds &pound;
-&arobase;registeredsymbol &registered;
-&arobase;ordf &ordf;
-&arobase;ordm &ordm;
-&arobase;comma &comma;
-&arobase;quotedblleft &ldquo;
-&arobase;quotedblright &rdquo;
-&arobase;quoteleft &lsquo;
-&arobase;quoteright &rsquo;
-&arobase;quotedblbase &bdquo;
-&arobase;quotesinglbase &sbquo;
-&arobase;guillemetleft &laquo;
-&arobase;guillemetright &raquo;
-&arobase;guillemotleft &guillemotleft;
-&arobase;guillemotright &guillemotright;
-&arobase;guilsinglleft &lsaquo;
-&arobase;guilsinglright &rsaquo;
-</para>
-<para>&arobase;textdegree &deg;
-&arobase;euro &euro;
-&arobase;arrow &rarr;
-&arobase;leq &le;
-&arobase;geq &ge;
+<para>&arobase;aa &aring; (å)
+&arobase;AA &Aring; (Å)
+&arobase;ae &aelig; (æ)
+&arobase;oe &oelig; (œ)
+&arobase;AE &AElig; (Æ)
+&arobase;OE &OElig; (Œ)
+&arobase;o &oslash; (ø)
+&arobase;O &Oslash; (Ø)
+&arobase;ss &szlig; (ß)
+&arobase;l &lslash; (ł)
+&arobase;L &Lslash; (Ł)
+&arobase;DH &ETH; (Ð)
+&arobase;TH &THORN; (Þ)
+&arobase;dh &eth; (ð)
+&arobase;th &thorn; (þ)
+</para>
+<para>&arobase;exclamdown &iexcl; (¡)
+&arobase;questiondown &iquest; (¿)
+&arobase;pounds &pound; (£)
+&arobase;registeredsymbol &registered; (®)
+&arobase;ordf &ordf; (ª)
+&arobase;ordm &ordm; (º)
+&arobase;comma &comma; (,)
+&arobase;quotedblleft &ldquo; (“)
+&arobase;quotedblright &rdquo; (”)
+&arobase;quoteleft &lsquo; (‘)
+&arobase;quoteright &rsquo; (’)
+&arobase;quotedblbase &bdquo; („)
+&arobase;quotesinglbase &sbquo; (‚)
+&arobase;guillemetleft &laquo; («)
+&arobase;guillemetright &raquo; (»)
+&arobase;guillemotleft &guillemotleft; («)
+&arobase;guillemotright &guillemotright; (»)
+&arobase;guilsinglleft &lsaquo; (‹)
+&arobase;guilsinglright &rsaquo; (›)
+</para>
+<para>&arobase;textdegree &deg; (°)
+&arobase;euro &euro; (€)
+&arobase;arrow &rarr; (→)
+&arobase;leq &le; (≤)
+&arobase;geq &ge; (≥)
 &arobase;tie a&nbsp;b
 </para>
 <para><code>&arobase;acronym&lbrace;--a,an accronym&rbrace;</code> 
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an 
accronym</acronymdesc></acronym>
@@ -3588,62 +3609,69 @@ And ? ?&noeos;.
 Now ! !&noeos;&arobase;
 but , ,&noeos;
 </para>
+<para>&arobase;ampchar &ampchar; (&amp;)
+&arobase;atchar &atchar; (&arobase;)
+&arobase;backslashchar &backslashchar; (\)
+&arobase;hashchar &hashchar; (#)
+&arobase;lbracechar &lbracechar; (&lbrace;)
+&arobase;rbracechar &rbracechar; (&rbrace;)
+</para>
 <para>&arobase;TeX &tex;
 &arobase;LaTeX &latex;
-&arobase;bullet &bullet;
-&arobase;copyright &copyright;
-&arobase;dots &dots;
+&arobase;bullet &bullet; (•)
+&arobase;copyright &copyright; (©)
+&arobase;dots &dots; (…)
 &arobase;enddots &enddots;
-&arobase;equiv &equiv;
+&arobase;equiv &equiv; (≡)
 &arobase;error &errorglyph;
-&arobase;expansion &expansion;
-&arobase;minus &minus;
-&arobase;point &point;
-&arobase;print &printglyph;
-&arobase;result &result;
+&arobase;expansion &expansion; (↦)
+&arobase;minus &minus; (−)
+&arobase;point &point; (★)
+&arobase;print &printglyph; (⊣)
+&arobase;result &result; (⇒)
 &arobase;today <today/>
 </para>
-<para>&arobase;aa &aring;
-&arobase;AA &Aring;
-&arobase;ae &aelig;
-&arobase;oe &oelig;
-&arobase;AE &AElig;
-&arobase;OE &OElig;
-&arobase;o &oslash;
-&arobase;O &Oslash;
-&arobase;ss &szlig;
-&arobase;l &lslash;
-&arobase;L &Lslash;
-&arobase;DH &ETH;
-&arobase;TH &THORN;
-&arobase;dh &eth;
-&arobase;th &thorn;
-</para>
-<para>&arobase;exclamdown &iexcl;
-&arobase;questiondown &iquest;
-&arobase;pounds &pound;
-&arobase;registeredsymbol &registered;
-&arobase;ordf &ordf;
-&arobase;ordm &ordm;
-&arobase;comma &comma;
-&arobase;quotedblleft &ldquo;
-&arobase;quotedblright &rdquo;
-&arobase;quoteleft &lsquo;
-&arobase;quoteright &rsquo;
-&arobase;quotedblbase &bdquo;
-&arobase;quotesinglbase &sbquo;
-&arobase;guillemetleft &laquo;
-&arobase;guillemetright &raquo;
-&arobase;guillemotleft &guillemotleft;
-&arobase;guillemotright &guillemotright;
-&arobase;guilsinglleft &lsaquo;
-&arobase;guilsinglright &rsaquo;
-</para>
-<para>&arobase;textdegree &deg;
-&arobase;euro &euro;
-&arobase;arrow &rarr;
-&arobase;leq &le;
-&arobase;geq &ge;
+<para>&arobase;aa &aring; (å)
+&arobase;AA &Aring; (Å)
+&arobase;ae &aelig; (æ)
+&arobase;oe &oelig; (œ)
+&arobase;AE &AElig; (Æ)
+&arobase;OE &OElig; (Œ)
+&arobase;o &oslash; (ø)
+&arobase;O &Oslash; (Ø)
+&arobase;ss &szlig; (ß)
+&arobase;l &lslash; (ł)
+&arobase;L &Lslash; (Ł)
+&arobase;DH &ETH; (Ð)
+&arobase;TH &THORN; (Þ)
+&arobase;dh &eth; (ð)
+&arobase;th &thorn; (þ)
+</para>
+<para>&arobase;exclamdown &iexcl; (¡)
+&arobase;questiondown &iquest; (¿)
+&arobase;pounds &pound; (£)
+&arobase;registeredsymbol &registered; (®)
+&arobase;ordf &ordf; (ª)
+&arobase;ordm &ordm; (º)
+&arobase;comma &comma; (,)
+&arobase;quotedblleft &ldquo; (“)
+&arobase;quotedblright &rdquo; (”)
+&arobase;quoteleft &lsquo; (‘)
+&arobase;quoteright &rsquo; (’)
+&arobase;quotedblbase &bdquo; („)
+&arobase;quotesinglbase &sbquo; (‚)
+&arobase;guillemetleft &laquo; («)
+&arobase;guillemetright &raquo; (»)
+&arobase;guillemotleft &guillemotleft; («)
+&arobase;guillemotright &guillemotright; (»)
+&arobase;guilsinglleft &lsaquo; (‹)
+&arobase;guilsinglright &rsaquo; (›)
+</para>
+<para>&arobase;textdegree &deg; (°)
+&arobase;euro &euro; (€)
+&arobase;arrow &rarr; (→)
+&arobase;leq &le; (≤)
+&arobase;geq &ge; (≥)
 &arobase;tie a&nbsp;b
 </para>
 <para><code>&arobase;acronym&lbrace;--a,an accronym&rbrace;</code> 
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an 
accronym</acronymdesc></acronym>
@@ -4723,62 +4751,69 @@ And ? ?&noeos;.
 Now ! !&noeos;&arobase;
 but , ,&noeos;
 
+&arobase;ampchar &ampchar; (&amp;)
+&arobase;atchar &atchar; (&arobase;)
+&arobase;backslashchar &backslashchar; (\)
+&arobase;hashchar &hashchar; (#)
+&arobase;lbracechar &lbracechar; (&lbrace;)
+&arobase;rbracechar &rbracechar; (&rbrace;)
+
 &arobase;TeX &tex;
 &arobase;LaTeX &latex;
-&arobase;bullet &bullet;
-&arobase;copyright &copyright;
-&arobase;dots &dots;
+&arobase;bullet &bullet; (•)
+&arobase;copyright &copyright; (©)
+&arobase;dots &dots; (…)
 &arobase;enddots &enddots;
-&arobase;equiv &equiv;
+&arobase;equiv &equiv; (≡)
 &arobase;error &errorglyph;
-&arobase;expansion &expansion;
-&arobase;minus &minus;
-&arobase;point &point;
-&arobase;print &printglyph;
-&arobase;result &result;
+&arobase;expansion &expansion; (↦)
+&arobase;minus &minus; (−)
+&arobase;point &point; (★)
+&arobase;print &printglyph; (⊣)
+&arobase;result &result; (⇒)
 &arobase;today <today/>
 
-&arobase;aa &aring;
-&arobase;AA &Aring;
-&arobase;ae &aelig;
-&arobase;oe &oelig;
-&arobase;AE &AElig;
-&arobase;OE &OElig;
-&arobase;o &oslash;
-&arobase;O &Oslash;
-&arobase;ss &szlig;
-&arobase;l &lslash;
-&arobase;L &Lslash;
-&arobase;DH &ETH;
-&arobase;TH &THORN;
-&arobase;dh &eth;
-&arobase;th &thorn;
-
-&arobase;exclamdown &iexcl;
-&arobase;questiondown &iquest;
-&arobase;pounds &pound;
-&arobase;registeredsymbol &registered;
-&arobase;ordf &ordf;
-&arobase;ordm &ordm;
-&arobase;comma &comma;
-&arobase;quotedblleft &ldquo;
-&arobase;quotedblright &rdquo;
-&arobase;quoteleft &lsquo;
-&arobase;quoteright &rsquo;
-&arobase;quotedblbase &bdquo;
-&arobase;quotesinglbase &sbquo;
-&arobase;guillemetleft &laquo;
-&arobase;guillemetright &raquo;
-&arobase;guillemotleft &guillemotleft;
-&arobase;guillemotright &guillemotright;
-&arobase;guilsinglleft &lsaquo;
-&arobase;guilsinglright &rsaquo;
-
-&arobase;textdegree &deg;
-&arobase;euro &euro;
-&arobase;arrow &rarr;
-&arobase;leq &le;
-&arobase;geq &ge;
+&arobase;aa &aring; (å)
+&arobase;AA &Aring; (Å)
+&arobase;ae &aelig; (æ)
+&arobase;oe &oelig; (œ)
+&arobase;AE &AElig; (Æ)
+&arobase;OE &OElig; (Œ)
+&arobase;o &oslash; (ø)
+&arobase;O &Oslash; (Ø)
+&arobase;ss &szlig; (ß)
+&arobase;l &lslash; (ł)
+&arobase;L &Lslash; (Ł)
+&arobase;DH &ETH; (Ð)
+&arobase;TH &THORN; (Þ)
+&arobase;dh &eth; (ð)
+&arobase;th &thorn; (þ)
+
+&arobase;exclamdown &iexcl; (¡)
+&arobase;questiondown &iquest; (¿)
+&arobase;pounds &pound; (£)
+&arobase;registeredsymbol &registered; (®)
+&arobase;ordf &ordf; (ª)
+&arobase;ordm &ordm; (º)
+&arobase;comma &comma; (,)
+&arobase;quotedblleft &ldquo; (“)
+&arobase;quotedblright &rdquo; (”)
+&arobase;quoteleft &lsquo; (‘)
+&arobase;quoteright &rsquo; (’)
+&arobase;quotedblbase &bdquo; („)
+&arobase;quotesinglbase &sbquo; (‚)
+&arobase;guillemetleft &laquo; («)
+&arobase;guillemetright &raquo; (»)
+&arobase;guillemotleft &guillemotleft; («)
+&arobase;guillemotright &guillemotright; (»)
+&arobase;guilsinglleft &lsaquo; (‹)
+&arobase;guilsinglright &rsaquo; (›)
+
+&arobase;textdegree &deg; (°)
+&arobase;euro &euro; (€)
+&arobase;arrow &rarr; (→)
+&arobase;leq &le; (≤)
+&arobase;geq &ge; (≥)
 &arobase;tie a&nbsp;b
 
 <code>&arobase;acronym&lbrace;--a,an accronym&rbrace;</code> 
<acronym><acronymword>--a</acronymword><acronymdesc>an 
accronym</acronymdesc></acronym>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html 
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index 57a05fbee4..d272637be5 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 62ebed8c31..c7a93bf985 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
@@ -999,62 +1006,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -2211,62 +2225,69 @@ And ? ?.
 Now ! !@
 but , ,
 </p>
+<p>@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+</p>
 <p>@TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots <small class="enddots">...</small>
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 </p>
-<p>@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
+<p>@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
 </p>
-<p>@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
+<p>@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
 </p>
-<p>@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+<p>@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 </p>
 <p><code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">&ndash;a</abbr> (an accronym)
@@ -3429,62 +3450,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar &amp; (&amp;)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet &bull;
-@copyright &copy;
-@dots &hellip;
+@bullet &bull; (•)
+@copyright &copy; (©)
+@dots &hellip; (…)
 @enddots ...
-@equiv &equiv;
+@equiv &equiv; (≡)
 @error error&rarr;
-@expansion &rarr;
-@minus &minus;
-@point &lowast;
-@print -|
-@result &rArr;
+@expansion &rarr; (↦)
+@minus &minus; (−)
+@point &lowast; (★)
+@print -| (⊣)
+@result &rArr; (⇒)
 @today a sunny day
 
-@aa &aring;
-@AA &Aring;
-@ae &aelig;
-@oe &oelig;
-@AE &AElig;
-@OE &OElig;
-@o &oslash;
-@O &Oslash;
-@ss &szlig;
-@l &#322;
-@L &#321;
-@DH &ETH;
-@TH &THORN;
-@dh &eth;
-@th &thorn;
-
-@exclamdown &iexcl;
-@questiondown &iquest;
-@pounds &pound;
-@registeredsymbol &reg;
-@ordf &ordf;
-@ordm &ordm;
-@comma ,
-@quotedblleft &ldquo;
-@quotedblright &rdquo;
-@quoteleft &lsquo;
-@quoteright &rsquo;
-@quotedblbase &bdquo;
-@quotesinglbase &sbquo;
-@guillemetleft &laquo;
-@guillemetright &raquo;
-@guillemotleft &laquo;
-@guillemotright &raquo;
-@guilsinglleft &lsaquo;
-@guilsinglright &rsaquo;
-
-@textdegree &deg;
-@euro &euro;
-@arrow &rarr;
-@leq &le;
-@geq &ge;
+@aa &aring; (å)
+@AA &Aring; (Å)
+@ae &aelig; (æ)
+@oe &oelig; (œ)
+@AE &AElig; (Æ)
+@OE &OElig; (Œ)
+@o &oslash; (ø)
+@O &Oslash; (Ø)
+@ss &szlig; (ß)
+@l &#322; (ł)
+@L &#321; (Ł)
+@DH &ETH; (Ð)
+@TH &THORN; (Þ)
+@dh &eth; (ð)
+@th &thorn; (þ)
+
+@exclamdown &iexcl; (¡)
+@questiondown &iquest; (¿)
+@pounds &pound; (£)
+@registeredsymbol &reg; (®)
+@ordf &ordf; (ª)
+@ordm &ordm; (º)
+@comma , (,)
+@quotedblleft &ldquo; (“)
+@quotedblright &rdquo; (”)
+@quoteleft &lsquo; (‘)
+@quoteright &rsquo; (’)
+@quotedblbase &bdquo; („)
+@quotesinglbase &sbquo; (‚)
+@guillemetleft &laquo; («)
+@guillemetright &raquo; (»)
+@guillemotleft &laquo; («)
+@guillemotright &raquo; (»)
+@guilsinglleft &lsaquo; (‹)
+@guilsinglright &rsaquo; (›)
+
+@textdegree &deg; (°)
+@euro &euro; (€)
+@arrow &rarr; (→)
+@leq &le; (≤)
+@geq &ge; (≥)
 @tie a&nbsp;b
 
 <code class="code">@acronym{--a,an accronym}</code> <abbr class="acronym" 
title="an accronym">--a</abbr> (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index e703cb5678..d4d104ad44 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index bfd381a8bd..b34780967a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html 
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index 0ec4de3f67..ece615ce69 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -72,62 +72,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 66c48c7ff3..c0675c3adf 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 002a52628e..7529488f07 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 2358d36df6..540026a298 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index 5d0477a8c4..83f625ee34 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index 49a2d3ad7f..0fe5f39415 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html 
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 3da158341c..763ca1cb2f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index d0160345c9..be7dca7854 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index df61fa943f..a957867321 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -71,62 +71,69 @@ And ? ?.
 Now ! !@
 but , ,
 
+@ampchar & (&)
+@atchar @ (@)
+@backslashchar \ (\)
+@hashchar # (#)
+@lbracechar { ({)
+@rbracechar } (})
+
 @TeX TeX
 @LaTeX LaTeX
-@bullet •
-@copyright ©
-@dots …
+@bullet • (•)
+@copyright © (©)
+@dots … (…)
 @enddots ...
-@equiv ≡
+@equiv ≡ (≡)
 @error error→
-@expansion ↦
-@minus −
-@point ★
-@print ⊣
-@result ⇒
+@expansion ↦ (↦)
+@minus − (−)
+@point ★ (★)
+@print ⊣ (⊣)
+@result ⇒ (⇒)
 @today a sunny day
 
-@aa å
-@AA Å
-@ae æ
-@oe œ
-@AE Æ
-@OE Œ
-@o ø
-@O Ø
-@ss ß
-@l ł
-@L Ł
-@DH Ð
-@TH Þ
-@dh ð
-@th þ
-
-@exclamdown ¡
-@questiondown ¿
-@pounds £
-@registeredsymbol ®
-@ordf ª
-@ordm º
-@comma ,
-@quotedblleft “
-@quotedblright ”
-@quoteleft ‘
-@quoteright ’
-@quotedblbase „
-@quotesinglbase ‚
-@guillemetleft «
-@guillemetright »
-@guillemotleft «
-@guillemotright »
-@guilsinglleft ‹
-@guilsinglright ›
-
-@textdegree °
-@euro €
-@arrow →
-@leq ≤
-@geq ≥
+@aa å (å)
+@AA Å (Å)
+@ae æ (æ)
+@oe œ (œ)
+@AE Æ (Æ)
+@OE Œ (Œ)
+@o ø (ø)
+@O Ø (Ø)
+@ss ß (ß)
+@l ł (ł)
+@L Ł (Ł)
+@DH Ð (Ð)
+@TH Þ (Þ)
+@dh ð (ð)
+@th þ (þ)
+
+@exclamdown ¡ (¡)
+@questiondown ¿ (¿)
+@pounds £ (£)
+@registeredsymbol ® (®)
+@ordf ª (ª)
+@ordm º (º)
+@comma , (,)
+@quotedblleft “ (“)
+@quotedblright ” (”)
+@quoteleft ‘ (‘)
+@quoteright ’ (’)
+@quotedblbase „ („)
+@quotesinglbase ‚ (‚)
+@guillemetleft « («)
+@guillemetright » (»)
+@guillemotleft « («)
+@guillemotright » (»)
+@guilsinglleft ‹ (‹)
+@guilsinglright › (›)
+
+@textdegree ° (°)
+@euro € (€)
+@arrow → (→)
+@leq ≤ (≤)
+@geq ≥ (≥)
 @tie a b
 
 @acronym{-a,an accronym} -a (an accronym)



reply via email to

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