texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Converter.pm (xml_accent): i


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm (xml_accent): if using numerical entities, use numerical entities for diacritics too. Suggestion from Hefferon, Jim S.
Date: Fri, 27 Aug 2021 15:45:04 -0400

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 37f61b3  * tp/Texinfo/Convert/Converter.pm (xml_accent): if using 
numerical entities, use numerical entities for diacritics too.  Suggestion from 
Hefferon, Jim S.
37f61b3 is described below

commit 37f61b3cbc4d5604d8451b679b3a1dc7e27ae521
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Aug 27 21:34:03 2021 +0200

    * tp/Texinfo/Convert/Converter.pm (xml_accent): if using numerical
    entities, use numerical entities for diacritics too.  Suggestion
    from Hefferon, Jim S.
---
 ChangeLog                                          |   6 +
 tp/Texinfo/Convert/Converter.pm                    |  25 ++-
 tp/t/accents.t                                     |  12 +-
 tp/t/results/converters_tests/accent.pl            |  14 +-
 tp/t/results/converters_tests/accent_with_text.pl  |   2 +-
 tp/t/results/converters_tests/accentenc.pl         |  14 +-
 .../converters_tests/accentenc_enable_encoding.pl  |  14 +-
 .../converters_tests/accentenc_no_entity.pl        |  14 +-
 .../converters_tests/at_commands_in_refs.pl        |  28 +--
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |   4 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   4 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |  12 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  14 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   6 +-
 .../at_commands_in_refs_latin1/res_html/i-E-C.html |  12 +-
 .../at_commands_in_refs_latin1/res_html/index.html |   6 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |   4 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   4 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |  12 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  14 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   6 +-
 .../at_commands_in_refs_utf8/res_html/i-E-C.html   |  12 +-
 .../at_commands_in_refs_utf8/res_html/index.html   |   6 +-
 tp/t/results/converters_tests/empty_accent.pl      |   2 +-
 .../some_at_commands_in_ref_nodes.pl               |   6 +-
 tp/t/results/converters_tests/weird_accents.pl     |  10 +-
 .../weird_accents_disable_encoding.pl              |  10 +-
 tp/t/results/coverage/accent_and_dash.pl           |   2 +-
 tp/t/results/coverage/at_after_accent_command.pl   |   2 +-
 tp/t/results/coverage/commands_in_math.pl          |   6 +-
 tp/t/results/coverage/unknown_accents.pl           |  14 +-
 tp/t/results/coverage_braces/empty_commands.pl     |   2 +-
 tp/t/results/coverage_braces/nested_in_sc.pl       |   2 +-
 tp/t/results/itemize/accent_argument.pl            |   4 +-
 .../layout/res_parser/formatting/formatting.html   | 220 ++++++++++-----------
 .../layout/res_parser/formatting_chm/chapter.html  | 132 ++++++-------
 .../res_parser/formatting_chm/formatting.html      |  88 ++++-----
 .../res_parser/formatting_exotic/chapter.html      | 132 ++++++-------
 .../res_parser/formatting_fr_icons/formatting.html | 220 ++++++++++-----------
 .../res_parser/formatting_html/formatting.html     | 220 ++++++++++-----------
 .../res_parser/formatting_html32/formatting.html   | 220 ++++++++++-----------
 .../formatting_html_no_texi2html/formatting.html   | 132 ++++++-------
 .../res_parser/formatting_html_nodes/chapter.html  | 132 ++++++-------
 .../res_parser/formatting_html_nodes/index.html    |  88 ++++-----
 .../res_parser/formatting_mathjax/formatting.html  | 220 ++++++++++-----------
 .../res_parser/formatting_nodes/chapter.html       | 132 ++++++-------
 .../layout/res_parser/formatting_nodes/index.html  |  88 ++++-----
 .../formatting_regions/formatting_regions.html     | 220 ++++++++++-----------
 .../formatting_weird_quotes/formatting.html        | 220 ++++++++++-----------
 .../res_parser/formatting_singular/chapter.html    | 114 +++++------
 50 files changed, 1455 insertions(+), 1428 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d72faf..68641c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-08-27  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Converter.pm (xml_accent): if using numerical
+       entities, use numerical entities for diacritics too.  Suggestion
+       from Hefferon, Jim S.
+
+2021-08-27  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/NodeNameNormalization.pm (unicode_accent):
        put @tieaccent diacritic between the characters.
 
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 05d3589..78a5d46 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1487,9 +1487,28 @@ sub xml_accent($$$;$$)
   if ($use_numeric_entities
       and 
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}) 
       and 
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text})) 
{
-    return '&#' . 
+    return '&#' .
       
hex($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text}). 
';';
   }
+  if ($use_numeric_entities
+      and exists($Texinfo::Convert::Unicode::unicode_diacritics{$accent})) {
+    my $diacritics_entity = '&#'
+       .hex($Texinfo::Convert::Unicode::unicode_diacritics{$accent}). ';';
+    if ($accent ne 'tieaccent') {
+      return $text . $diacritics_entity;
+    } else {
+      # tieaccent diacritic is naturally and correctly composed
+      # between two characters
+      my $remaining_text = $text;
+      # we consider that letters are either characters or entities
+      if ($remaining_text =~ 
s/^([\p{L}\d]|&[a-zA-Z0-9];)([\p{L}\d]|&[a-zA-Z0-9];)(.*)$/$3/) {
+        return $1.$diacritics_entity.$2.$remaining_text;
+      } else {
+        return $text . $diacritics_entity;
+      }
+    }
+  }
+
   return $text . '&lt;' if ($accent eq 'v');
   # FIXME it is not possible to call xml_protect_text since what is in $text
   # may already be xml.  But this means that each time ascii_accent changes
@@ -1700,7 +1719,9 @@ an argument.  I<$in_upper_case> is optional, and, if set, 
the text is put
 in upper case.  The function returns the accented letter as XML entity 
 if possible.  I<$use_numeric_entities> is also optional, and, if set, and
 there is no XML entity, the numerical entity corresponding to Unicode 
-points is preferred to an ASCII transliteration.
+points is preferred to an ASCII transliteration.  If I<$use_numeric_entities>
+is set numerci entities are also used for diacritics instead of ASCII
+characters.
 
 =item $result = $converter->xml_accents($accent_command, $in_upper_case)
 
diff --git a/tp/t/accents.t b/tp/t/accents.t
index 2e91f91..70180be 100644
--- a/tp/t/accents.t
+++ b/tp/t/accents.t
@@ -149,22 +149,22 @@ foreach my $test (
                                                    '&icirc;', chrx('00ee')],
   ['@~{@dotless{i}}',       'no 8bit dotless',     'i~', 'i~', '&#297;',
                                                    chrx('0129')],
-  ['@={@~{@dotless{i}}}',   'no 8 cplx dotless',   'i~=', 'i~=', '&#297;=',
+  ['@={@~{@dotless{i}}}',   'no 8 cplx dotless',   'i~=', 'i~=', 
'&#297;&#772;',
                                                    chrx('0129','0304')],
   ['@={@^{@dotless{i}}}',   'complex dotless',     chr(238).'=', '&icirc;=', 
-                                                   '&icirc;=',
+                                                   '&icirc;&#772;',
                                                    chrx('00ee','0304')],
   ['@={@,{@~{n}}}',         'complex encoding',    chr(241).',=', '&ntilde;,=',
-                                                   '&ntilde;,=', 
+                                                   '&ntilde;&#807;&#772;', 
                                                    chrx('0146','0303','0304')],
   ['@udotaccent{r}',        'udotaccent',          '.r', '.r', '&#7771;',
                                                    chrx('1e5b')],
-  ['@={@ubaraccent{a}}',    'complex ubaraccent',  'a_=', 'a_=', 'a_=',
+  ['@={@ubaraccent{a}}',    'complex ubaraccent',  'a_=', 'a_=', 
'a&#818;&#772;',
                                                    chrx('0101','0332')],
-  ['@^{@udotaccent{@`r}}',  'complex udotaccent',  '.r`^', '.r`^', '.r`^',
+  ['@^{@udotaccent{@`r}}',  'complex udotaccent',  '.r`^', '.r`^', 
'r&#768;&#803;&#770;',
                                                    chrx('1e5b','0300','0302')],
   ['@v{@\'{r}}',            'utf8 possible inside', 'r\'<', 'r\'&lt;', 
-                                                    '&#341;&lt;', 
+                                                    '&#341;&#780;', 
                                                     chrx('0155','030c')],
             ) {
   test_enable_encoding($test);
diff --git a/tp/t/results/converters_tests/accent.pl 
b/tp/t/results/converters_tests/accent.pl
index 5792b77..6925fc4 100644
--- a/tp/t/results/converters_tests/accent.pl
+++ b/tp/t/results/converters_tests/accent.pl
@@ -3275,17 +3275,17 @@ $result_converted{'html_text'}->{'accent'} = '<div 
class="top" id="Top-node">
 </p>
 <p>should be e=: &#275; &#275;
 </p>
-<p>should be e&rsquo;<!-- /@w -->&rsquo;: e\'\' e\'\'
+<p>should be e&rsquo;<!-- /@w -->&rsquo;: e&#779; e&#779;
 </p>
 <p>should be e.: &#279; &#279;
 </p>
-<p>should be e*: e* e*
+<p>should be e*: e&#778; e&#778;
 </p>
-<p>should be ee[: ee[
+<p>should be ee[: e&#865;e
 </p>
 <p>should be e(: &#277; &#277;
 </p>
-<p>should be e_: e_ e_
+<p>should be e_: e&#818; e&#818;
 </p>
 <p>should be .e: &#7865; &#7865;
 </p>
@@ -3319,13 +3319,13 @@ $result_converted{'html_text'}->{'accent'} = '<div 
class="top" id="Top-node">
 </p>
 <p>should be dotless i&quot;: &iuml;
 </p>
-<p>should be dotless j&lsquo;: j`
+<p>should be dotless j&lsquo;: j&#768;
 </p>
-<p>should be dotless j&rsquo;: j\'
+<p>should be dotless j&rsquo;: j&#769;
 </p>
 <p>should be dotless j^: &#309;
 </p>
-<p>should be dotless j&quot;: j"
+<p>should be dotless j&quot;: j&#776;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/converters_tests/accent_with_text.pl 
b/tp/t/results/converters_tests/accent_with_text.pl
index ba109c4..f5dd575 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -247,7 +247,7 @@ $result_converted{'plaintext'}->{'accent_with_text'} = '-ă 
-b î ĵ -â
 ';
 
 
-$result_converted{'html_text'}->{'accent_with_text'} = '<p>&ndash;a( &ndash;b 
&icirc; &#309; &ndash;a^
+$result_converted{'html_text'}->{'accent_with_text'} = '<p>&ndash;a&#774; 
&ndash;b &icirc; &#309; &ndash;a&#770;
 </p>';
 
 
diff --git a/tp/t/results/converters_tests/accentenc.pl 
b/tp/t/results/converters_tests/accentenc.pl
index e36445c..f801a50 100644
--- a/tp/t/results/converters_tests/accentenc.pl
+++ b/tp/t/results/converters_tests/accentenc.pl
@@ -3321,17 +3321,17 @@ $result_converted{'html_text'}->{'accentenc'} = '
 </p>
 <p>should be e=: &#275; &#275;
 </p>
-<p>should be e&rsquo;<!-- /@w -->&rsquo;: e\'\' e\'\'
+<p>should be e&rsquo;<!-- /@w -->&rsquo;: e&#779; e&#779;
 </p>
 <p>should be e.: &#279; &#279;
 </p>
-<p>should be e*: e* e*
+<p>should be e*: e&#778; e&#778;
 </p>
-<p>should be ee[: ee[
+<p>should be ee[: e&#865;e
 </p>
 <p>should be e(: &#277; &#277;
 </p>
-<p>should be e_: e_ e_
+<p>should be e_: e&#818; e&#818;
 </p>
 <p>should be .e: &#7865; &#7865;
 </p>
@@ -3365,13 +3365,13 @@ $result_converted{'html_text'}->{'accentenc'} = '
 </p>
 <p>should be dotless i&quot;: &iuml;
 </p>
-<p>should be dotless j&lsquo;: j`
+<p>should be dotless j&lsquo;: j&#768;
 </p>
-<p>should be dotless j&rsquo;: j\'
+<p>should be dotless j&rsquo;: j&#769;
 </p>
 <p>should be dotless j^: &#309;
 </p>
-<p>should be dotless j&quot;: j"
+<p>should be dotless j&quot;: j&#776;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/converters_tests/accentenc_enable_encoding.pl 
b/tp/t/results/converters_tests/accentenc_enable_encoding.pl
index cb87f33..bc354ae 100644
--- a/tp/t/results/converters_tests/accentenc_enable_encoding.pl
+++ b/tp/t/results/converters_tests/accentenc_enable_encoding.pl
@@ -3242,17 +3242,17 @@ 
$result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 </p>
 <p>should be e=: &#275; &#275;
 </p>
-<p>should be e&rsquo;<!-- /@w -->&rsquo;: e\'\' e\'\'
+<p>should be e&rsquo;<!-- /@w -->&rsquo;: e&#779; e&#779;
 </p>
 <p>should be e.: &#279; &#279;
 </p>
-<p>should be e*: e* e*
+<p>should be e*: e&#778; e&#778;
 </p>
-<p>should be ee[: ee[
+<p>should be ee[: e&#865;e
 </p>
 <p>should be e(: &#277; &#277;
 </p>
-<p>should be e_: e_ e_
+<p>should be e_: e&#818; e&#818;
 </p>
 <p>should be .e: &#7865; &#7865;
 </p>
@@ -3286,13 +3286,13 @@ 
$result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 </p>
 <p>should be dotless i&quot;: ï
 </p>
-<p>should be dotless j&lsquo;: j`
+<p>should be dotless j&lsquo;: j&#768;
 </p>
-<p>should be dotless j&rsquo;: j\'
+<p>should be dotless j&rsquo;: j&#769;
 </p>
 <p>should be dotless j^: &#309;
 </p>
-<p>should be dotless j&quot;: j"
+<p>should be dotless j&quot;: j&#776;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/converters_tests/accentenc_no_entity.pl 
b/tp/t/results/converters_tests/accentenc_no_entity.pl
index c6ff75f..829a5d8 100644
--- a/tp/t/results/converters_tests/accentenc_no_entity.pl
+++ b/tp/t/results/converters_tests/accentenc_no_entity.pl
@@ -3242,17 +3242,17 @@ $result_converted{'html_text'}->{'accentenc_no_entity'} 
= '
 </p>
 <p>should be e=: &#275; &#275;
 </p>
-<p>should be e&rsquo;<!-- /@w -->&rsquo;: e\'\' e\'\'
+<p>should be e&rsquo;<!-- /@w -->&rsquo;: e&#779; e&#779;
 </p>
 <p>should be e.: &#279; &#279;
 </p>
-<p>should be e*: e* e*
+<p>should be e*: e&#778; e&#778;
 </p>
-<p>should be ee[: ee[
+<p>should be ee[: e&#865;e
 </p>
 <p>should be e(: &#277; &#277;
 </p>
-<p>should be e_: e_ e_
+<p>should be e_: e&#818; e&#818;
 </p>
 <p>should be .e: &#7865; &#7865;
 </p>
@@ -3286,13 +3286,13 @@ $result_converted{'html_text'}->{'accentenc_no_entity'} 
= '
 </p>
 <p>should be dotless i&quot;: ï
 </p>
-<p>should be dotless j&lsquo;: j`
+<p>should be dotless j&lsquo;: j&#768;
 </p>
-<p>should be dotless j&rsquo;: j\'
+<p>should be dotless j&rsquo;: j&#769;
 </p>
 <p>should be dotless j^: &#309;
 </p>
-<p>should be dotless j&quot;: j"
+<p>should be dotless j&quot;: j&#776;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/converters_tests/at_commands_in_refs.pl 
b/tp/t/results/converters_tests/at_commands_in_refs.pl
index e67b18d..7c787be 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs.pl
+++ b/tp/t/results/converters_tests/at_commands_in_refs.pl
@@ -22913,9 +22913,9 @@ Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 <li><a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
 <li><a href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; 
&szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></li>
-<li><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' 
&#281;</a></li>
-<li><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; e_ 
&#7865; &#283; j ee[</a></li>
-<li><a href="#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a></li>
+<li><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a></li>
+<li><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a></li>
+<li><a href="#g_t_0131-_1e14-_1e08">i &#274;&#768; &#262;&#807;</a></li>
 <li><a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">&ldquo; 
&rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
@@ -23008,7 +23008,7 @@ Next: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_
 <div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="header">
 <p>
-Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e* e\'\' &#281;</a>, Previous: <a 
href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Previous: <a 
href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
 
@@ -23017,34 +23017,34 @@ Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b
 <div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="header">
 <p>
-Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="n" 
rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Previous: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="n" 
rel="next">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
 
 <hr>
 </div>
 <div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="header">
 <p>
-Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;` 
&#262;,</a>, Previous: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e* e\'\' &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</h2>
 
 <hr>
 </div>
 <div class="chapter" id="g_t_0131-_1e14-_1e08">
 <div class="header">
 <p>
-Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="p" 
rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="p" 
rel="prev">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;&#768; &#262;&#807;</h2>
 
 <hr>
 </div>
 <div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="header">
 <p>
-Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;` &#262;,</a>, 
Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;&#768; 
&#262;&#807;</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
@@ -23192,11 +23192,11 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd</sup
 </p>
 <p><a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring;
 &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a>
 </p>
-<p><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' &#281;</a>
+<p><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>
 </p>
-<p><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; e_ 
&#7865; &#283; j ee[</a>
+<p><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>
 </p>
-<p><a href="#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a>
+<p><a href="#g_t_0131-_1e14-_1e08">i &#274;&#768; &#262;&#807;</a>
 </p>
 <p><a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a>
 </p>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index d993164..00ac193 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 <link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
 <style type="text/css">
 <!--
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
 <div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="header">
 <p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, 
Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" rel="prev">&rArr; 
&deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index b569f06..e39205f 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" 
title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html" rel="prev" title="i &#274;` &#262;,">
+<link href="i-E-C.html" rel="prev" title="i &#274;&#768; &#262;&#807;">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="header">
 <p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 17da084..470f8c1 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -3,17 +3,17 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' 
&#281; (Top)</title>
+<title>&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281; (Top)</title>
 
-<meta name="description" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e* e'' &#281; (Top)">
-<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e* e'' &#281; (Top)">
+<meta name="description" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e&#778; e&#779; &#281; (Top)">
+<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e&#778; e&#779; &#281; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e_ &#7865; 
&#283; j ee[">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
 <link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
 <style type="text/css">
 <!--
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="header">
 <p>
-Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ 
&#7865; &#283; j ee[</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
index a718898..e71b954 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
@@ -3,18 +3,18 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>&#279; &#277; e_ &#7865; &#283; j ee[ (Top)</title>
+<title>&#279; &#277; e&#818; &#7865; &#283; j e&#865;e (Top)</title>
 
-<meta name="description" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
-<meta name="keywords" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
+<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e (Top)">
+<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; j e&#865;e 
(Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="i-E-C.html" rel="next" title="i &#274;` &#262;,">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="i-E-C.html" rel="next" title="i &#274;&#768; &#262;&#807;">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="header">
 <p>
-Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</a>, 
Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" rel="prev">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 1ad8684..8494342 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -64,11 +64,11 @@ Previous: <a href="gH-3rd.html" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd<
 </p>
 <p><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; &aelig; &oelig; 
&AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; 
&thorn;</a>
 </p>
-<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
+<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a>
 </p>
-<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a>
+<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a>
 </p>
-<p><a href="i-E-C.html">i &#274;` &#262;,</a>
+<p><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a>
 </p>
 <p><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a>
 </p>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
index 6cab2d0..40ca680 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
@@ -3,10 +3,10 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>i &#274;` &#262;, (Top)</title>
+<title>i &#274;&#768; &#262;&#807; (Top)</title>
 
-<meta name="description" content="i &#274;` &#262;, (Top)">
-<meta name="keywords" content="i &#274;` &#262;, (Top)">
+<meta name="description" content="i &#274;&#768; &#262;&#807; (Top)">
+<meta name="keywords" content="i &#274;&#768; &#262;&#807; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" 
title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e_ &#7865; 
&#283; j ee[">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_0131-_1e14-_1e08">
 <div class="header">
 <p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; 
&#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;&#768; &#262;&#807;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
index a3b6c8b..9648abf 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
@@ -57,9 +57,9 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
 <li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
-<li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></li>
-<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j 
ee[</a></li>
-<li><a href="i-E-C.html">i &#274;` &#262;,</a></li>
+<li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
+<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a></li>
+<li><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a></li>
 <li><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">&ldquo;
 &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 7190bc2..b49ef35 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 <link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
 <style type="text/css">
 <!--
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
 <div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="header">
 <p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, 
Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" rel="prev">&rArr; 
&deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index a5d870b..fc6567f 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" 
title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html" rel="prev" title="i &#274;` &#262;,">
+<link href="i-E-C.html" rel="prev" title="i &#274;&#768; &#262;&#807;">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="header">
 <p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 777375b..e4a95a1 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -3,17 +3,17 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' 
&#281; (Top)</title>
+<title>&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281; (Top)</title>
 
-<meta name="description" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e* e'' &#281; (Top)">
-<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e* e'' &#281; (Top)">
+<meta name="description" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e&#778; e&#779; &#281; (Top)">
+<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; 
&eacute; &ccedil; &#275; e&#778; e&#779; &#281; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e_ &#7865; 
&#283; j ee[">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
 <link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
 <style type="text/css">
 <!--
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="header">
 <p>
-Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ 
&#7865; &#283; j ee[</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
index b93155c..abf810c 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
@@ -3,18 +3,18 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>&#279; &#277; e_ &#7865; &#283; j ee[ (Top)</title>
+<title>&#279; &#277; e&#818; &#7865; &#283; j e&#865;e (Top)</title>
 
-<meta name="description" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
-<meta name="keywords" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
+<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e (Top)">
+<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; j e&#865;e 
(Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="i-E-C.html" rel="next" title="i &#274;` &#262;,">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="i-E-C.html" rel="next" title="i &#274;&#768; &#262;&#807;">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="header">
 <p>
-Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</a>, 
Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" rel="prev">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 48c0ad1..64b7b2a 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -64,11 +64,11 @@ Previous: <a href="gH-3rd.html" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd<
 </p>
 <p><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; &aelig; &oelig; 
&AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; 
&thorn;</a>
 </p>
-<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
+<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a>
 </p>
-<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a>
+<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a>
 </p>
-<p><a href="i-E-C.html">i &#274;` &#262;,</a>
+<p><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a>
 </p>
 <p><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a>
 </p>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
index f897656..ee17f5e 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
+++ b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
@@ -3,10 +3,10 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>i &#274;` &#262;, (Top)</title>
+<title>i &#274;&#768; &#262;&#807; (Top)</title>
 
-<meta name="description" content="i &#274;` &#262;, (Top)">
-<meta name="keywords" content="i &#274;` &#262;, (Top)">
+<meta name="description" content="i &#274;&#768; &#262;&#807; (Top)">
+<meta name="keywords" content="i &#274;&#768; &#262;&#807; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" 
title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e_ &#7865; 
&#283; j ee[">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -42,10 +42,10 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="g_t_0131-_1e14-_1e08">
 <div class="header">
 <p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; 
&#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;&#768; &#262;&#807;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
index 144120f..8cf27ba 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
+++ b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
@@ -57,9 +57,9 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
 <li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
-<li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></li>
-<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j 
ee[</a></li>
-<li><a href="i-E-C.html">i &#274;` &#262;,</a></li>
+<li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
+<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a></li>
+<li><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a></li>
 <li><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">&ldquo;
 &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
diff --git a/tp/t/results/converters_tests/empty_accent.pl 
b/tp/t/results/converters_tests/empty_accent.pl
index dd5b4ab..be389ae 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -61,7 +61,7 @@ $result_converted{'plaintext'}->{'empty_accent'} = '̀
 ';
 
 
-$result_converted{'html_text'}->{'empty_accent'} = '<p>`
+$result_converted{'html_text'}->{'empty_accent'} = '<p>&#768;
 </p>';
 
 
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index fd7d4b2..26e4993 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -1836,7 +1836,7 @@ 
$result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
 
 
 <ul class="section-toc">
-<li><a href="#A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1" 
accesskey="1">A <small>SC</small> node &iuml; &iuml; &#274;` &#322; &#262;, 
&iexcl;</a></li>
+<li><a href="#A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1" 
accesskey="1">A <small>SC</small> node &iuml; &iuml; &#274;&#768; &#322; 
&#262;&#807; &iexcl;</a></li>
 </ul>
 <hr>
 <div class="chapter" 
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
@@ -1844,9 +1844,9 @@ 
$result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
 <p>
  &nbsp; </p>
 </div>
-<span id="A-SC-node-i-i-E-l-C-_00a1"></span><h2 class="chapter">1 A 
<small>SC</small> node &iuml; &iuml; &#274;` &#322; &#262;, &iexcl;</h2>
+<span id="A-SC-node-i-i-E-l-C-_00a1"></span><h2 class="chapter">1 A 
<small>SC</small> node &iuml; &iuml; &#274;&#768; &#322; &#262;&#807; 
&iexcl;</h2>
 
-<p>see <a data-manual="manual" 
href="manual.html#a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1">(manual)a
 <strong>strong</strong> ref with <small>SC</small>, a i trema &iuml;, a 
dotless i trema &iuml; &#274;` and exclamdown &iexcl;</a>.
+<p>see <a data-manual="manual" 
href="manual.html#a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1">(manual)a
 <strong>strong</strong> ref with <small>SC</small>, a i trema &iuml;, a 
dotless i trema &iuml; &#274;&#768; and exclamdown &iexcl;</a>.
 </p></div>
 </div>
 ';
diff --git a/tp/t/results/converters_tests/weird_accents.pl 
b/tp/t/results/converters_tests/weird_accents.pl
index b1f4f8d..994a083 100644
--- a/tp/t/results/converters_tests/weird_accents.pl
+++ b/tp/t/results/converters_tests/weird_accents.pl
@@ -647,15 +647,15 @@ $result_converted{'html_text'}->{'weird_accents'} = '
 <div class="top" id="Top">
 <span id="top"></span><h1 class="top">top</h1>
 
-<p>&#297;=
+<p>&#297;&#772;
 </p>
-<p>&ntilde;,=
+<p>&ntilde;&#807;&#772;
 </p>
-<p>a_=
+<p>a&#818;&#772;
 </p>
-<p>.r`^
+<p>r&#768;&#803;&#770;
 </p>
-<p>r`\'=
+<p>r&#768;&#769;&#772;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/converters_tests/weird_accents_disable_encoding.pl 
b/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
index 16bbd75..4b0f64e 100644
--- a/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
+++ b/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
@@ -647,15 +647,15 @@ 
$result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
 <div class="top" id="Top">
 <span id="top"></span><h1 class="top">top</h1>
 
-<p>&#297;=
+<p>&#297;&#772;
 </p>
-<p>&ntilde;,=
+<p>&ntilde;&#807;&#772;
 </p>
-<p>a_=
+<p>a&#818;&#772;
 </p>
-<p>.r`^
+<p>r&#768;&#803;&#770;
 </p>
-<p>r`\'=
+<p>r&#768;&#769;&#772;
 </p><hr></div>
 ';
 
diff --git a/tp/t/results/coverage/accent_and_dash.pl 
b/tp/t/results/coverage/accent_and_dash.pl
index ade9cb8..f380869 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -59,7 +59,7 @@ $result_converted{'plaintext'}->{'accent_and_dash'} = 'a-̂
 ';
 
 
-$result_converted{'html_text'}->{'accent_and_dash'} = '<p>a&ndash;^</p>';
+$result_converted{'html_text'}->{'accent_and_dash'} = '<p>a&ndash;&#770;</p>';
 
 
 $result_converted{'xml'}->{'accent_and_dash'} = '<para><accent 
type="circ">a&textndash;</accent></para>';
diff --git a/tp/t/results/coverage/at_after_accent_command.pl 
b/tp/t/results/coverage/at_after_accent_command.pl
index e97b0d6..578b815 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -101,7 +101,7 @@ $result_converted{'plaintext'}->{'at_after_accent_command'} 
= '̊@.  ̂@.
 ';
 
 
-$result_converted{'html_text'}->{'at_after_accent_command'} = '<p>*@. ^@.
+$result_converted{'html_text'}->{'at_after_accent_command'} = '<p>&#778;@. 
&#770;@.
 </p>';
 
 
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 35e9c91..ea350a4 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2831,9 +2831,9 @@ $result_converted{'html_text'}->{'commands_in_math'} = '
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a\'\' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
diff --git a/tp/t/results/coverage/unknown_accents.pl 
b/tp/t/results/coverage/unknown_accents.pl
index 2d9cf1a..66cc45a 100644
--- a/tp/t/results/coverage/unknown_accents.pl
+++ b/tp/t/results/coverage/unknown_accents.pl
@@ -898,19 +898,19 @@ $result_converted{'plaintext'}->{'unknown_accents'} = 'Ẍ 
ẍ Q̈ Ÿ
 ';
 
 
-$result_converted{'html_text'}->{'unknown_accents'} = '<p>&#7820; &#7821; Q" 
&#376;
+$result_converted{'html_text'}->{'unknown_accents'} = '<p>&#7820; &#7821; 
Q&#776; &#376;
 </p>
-<p>&#394; q\' &#341;
-&#377; Q\' &#340;
+<p>&#394; q&#769; &#341;
+&#377; Q&#769; &#340;
 </p>
 <p>&#7720; &#7721;
 </p>
-<p>&#7825; r^ t^ k^
-&#7824; R^ T^ K^
+<p>&#7825; r&#770; t&#770; k&#770;
+&#7824; R&#770; T&#770; K&#770;
 </p>
-<p>z` m` p`
+<p>z&#768; m&#768; p&#768;
 </p>
-<p>Z~ s~
+<p>Z&#771; s&#771;
 </p>';
 
 
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index 14e4bd2..d98bc69 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -283,7 +283,7 @@ $result_converted{'plaintext'}->{'empty_commands'} = '
 
 $result_converted{'html_text'}->{'empty_commands'} = '
 
-<p> <abbr></abbr>  <code></code><a id="DOCF1" href="#FOOT1"><sup>1</sup></a> ~ 
 <tt></tt>
+<p> <abbr></abbr>  <code></code><a id="DOCF1" href="#FOOT1"><sup>1</sup></a> 
&#771;  <tt></tt>
 </p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 3210ed5..fd05c7b 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -333,7 +333,7 @@ $result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA Ñ Å 
TeX Å̃ (1), ABR
 ';
 
 
-$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA 
&Ntilde; &Aring; TeX &Aring;~ <a id="DOCF1" href="#FOOT1"><sup>1</sup></a>, 
<abbr title="expl">ABR</abbr> (EXPL), 
+$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA 
&Ntilde; &Aring; TeX &Aring;&#771; <a id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>, <abbr title="expl">ABR</abbr> (EXPL), 
 <tt>in verb</tt></small></small>
 </p><div class="footnote">
 <hr>
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 790a143..8685f02 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -292,11 +292,11 @@ $result_converted{'plaintext'}->{'accent_argument'} = '   
̃  item
 
 
 $result_converted{'html_text'}->{'accent_argument'} = '<ul class="no-bullet">
-<li>~ item
+<li>&#771; item
 </li></ul>
 
 <ul class="no-bullet">
-<li>~ item
+<li>&#771; item
 </li></ul>
 ';
 
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index a0b5303..4eb2361 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2623,9 +2623,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2756,26 +2756,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2804,9 +2804,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3365,14 +3365,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3511,9 +3511,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -3644,26 +3644,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3692,9 +3692,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4253,14 +4253,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4403,9 +4403,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -4539,26 +4539,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4591,9 +4591,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5250,17 +5250,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 7dda572..89a4210 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -796,9 +796,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -929,26 +929,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -977,9 +977,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1538,14 +1538,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1684,9 +1684,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1817,26 +1817,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -1865,9 +1865,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2426,14 +2426,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2576,9 +2576,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2712,26 +2712,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -2764,9 +2764,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3423,17 +3423,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 2123dc3..8003f00 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 9359927..acccb86 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -812,9 +812,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -945,26 +945,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>2</sup></a>
@@ -993,9 +993,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1554,14 +1554,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1700,9 +1700,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1833,26 +1833,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>4</sup></a>
@@ -1881,9 +1881,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2442,14 +2442,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2592,9 +2592,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2728,26 +2728,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
@@ -2780,9 +2780,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3439,17 +3439,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
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 a7b2455..bb391f0 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2623,9 +2623,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2756,26 +2756,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2804,9 +2804,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3365,14 +3365,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3511,9 +3511,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -3644,26 +3644,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3692,9 +3692,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4253,14 +4253,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4403,9 +4403,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -4539,26 +4539,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4591,9 +4591,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5250,17 +5250,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index a0b5303..4eb2361 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2623,9 +2623,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2756,26 +2756,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2804,9 +2804,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3365,14 +3365,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3511,9 +3511,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -3644,26 +3644,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3692,9 +3692,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4253,14 +4253,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4403,9 +4403,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -4539,26 +4539,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4591,9 +4591,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5250,17 +5250,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index af7000b..1a85a7c 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -769,9 +769,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
@@ -902,26 +902,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> -a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> -a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> -a.
+<code>@dotaccent{--a}</code> -a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> -a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> -a[
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> -a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> -a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> -a_
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> -a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .-a
+<code>@udotaccent{--a}</code> -a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> -a&lt;
+<code>@v{--a}</code> -a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> -c,
+<code>@,{--c}</code> -c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> -a;
+<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -951,9 +951,9 @@ After clickstyle =&gt;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1490,14 +1490,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&#34;u ,&uuml;
+@,@&#34;u &#807;&uuml;
 </p>
 <p>Invalid use of @':<br>
-@' '
+@' &#769;
 <br>
-@'@&#34;u '&uuml;
+@'@&#34;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1637,9 +1637,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
@@ -1770,26 +1770,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> -a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> -a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> -a.
+<code>@dotaccent{--a}</code> -a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> -a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> -a[
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> -a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> -a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> -a_
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> -a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .-a
+<code>@udotaccent{--a}</code> -a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> -a&lt;
+<code>@v{--a}</code> -a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> -c,
+<code>@,{--c}</code> -c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> -a;
+<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1818,9 +1818,9 @@ After clickstyle =&gt;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2357,14 +2357,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&#34;u ,&uuml;
+@,@&#34;u &#807;&uuml;
 </p>
 <p>Invalid use of @':<br>
-@' '
+@' &#769;
 <br>
-@'@&#34;u '&uuml;
+@'@&#34;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2560,9 +2560,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
@@ -2693,26 +2693,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> -a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> -a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> -a.
+<code>@dotaccent{--a}</code> -a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> -a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> -a[
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> -a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> -a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> -a_
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> -a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .-a
+<code>@udotaccent{--a}</code> -a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> -a&lt;
+<code>@v{--a}</code> -a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> -c,
+<code>@,{--c}</code> -c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> -a;
+<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2741,9 +2741,9 @@ After clickstyle =&gt;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3280,14 +3280,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&#34;u ,&uuml;
+@,@&#34;u &#807;&uuml;
 </p>
 <p>Invalid use of @':<br>
-@' '
+@' &#769;
 <br>
-@'@&#34;u '&uuml;
+@'@&#34;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3426,9 +3426,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&#34;u &ccedil;&uuml; <br>
 </p>
@@ -3559,26 +3559,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> -a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> -a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> -a.
+<code>@dotaccent{--a}</code> -a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> -a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> -a[
+<code>@ringaccent{--a}</code> -a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> -a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> -a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> -a_
+<code>@u{--a}</code> -a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> -a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .-a
+<code>@udotaccent{--a}</code> -a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> -a&lt;
+<code>@v{--a}</code> -a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> -c,
+<code>@,{--c}</code> -c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> -a;
+<code>@ogonek{--a}</code> -a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3607,9 +3607,9 @@ After clickstyle =&gt;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j 
&#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4146,14 +4146,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&#34;u ,&uuml;
+@,@&#34;u &#807;&uuml;
 </p>
 <p>Invalid use of @':<br>
-@' '
+@' &#769;
 <br>
-@'@&#34;u '&uuml;
+@'@&#34;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4295,9 +4295,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&#34;u &ccedil;&uuml; 
 
@@ -4431,26 +4431,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4483,9 +4483,9 @@ After clickstyle =&gt;
 
 </em></div><pre>
 
-</pre><div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; 
&eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; 
&eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5120,17 +5120,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&#34;u ,&uuml;
+@,@&#34;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&#34;u '&uuml;
+@'@&#34;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
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 e0fe12f..2ee4869 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
@@ -851,9 +851,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -984,26 +984,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>2</sup></a>
@@ -1032,9 +1032,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1593,14 +1593,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1739,9 +1739,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1872,26 +1872,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>4</sup></a>
@@ -1920,9 +1920,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2481,14 +2481,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2631,9 +2631,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2767,26 +2767,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
@@ -2819,9 +2819,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3478,17 +3478,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
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 31b0879..c6675af 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -812,9 +812,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -945,26 +945,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="formatting_fot.html#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="formatting_fot.html#FOOT2_6"><sup>6</sup></a>
@@ -993,9 +993,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1554,14 +1554,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1700,9 +1700,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1833,26 +1833,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="formatting_fot.html#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="formatting_fot.html#FOOT6"><sup>8</sup></a>
@@ -1881,9 +1881,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2442,14 +2442,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2592,9 +2592,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2728,26 +2728,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" 
href="formatting_fot.html#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" 
href="formatting_fot.html#FOOT8">(10)</a>
@@ -2780,9 +2780,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3439,17 +3439,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
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 832c41b..ec9a1a8 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="formatting_fot.html#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="formatting_fot.html#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="formatting_fot.html#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="formatting_fot.html#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 241749e..d2e20c4 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -798,9 +798,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -931,26 +931,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -980,9 +980,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 \]</em></div>
-<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1541,14 +1541,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1688,9 +1688,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1821,26 +1821,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1869,9 +1869,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 \]</em></div>
-<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2430,14 +2430,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2633,9 +2633,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2766,26 +2766,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2814,9 +2814,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 \]</em></div>
-<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3375,14 +3375,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3521,9 +3521,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -3654,26 +3654,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3702,9 +3702,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 \]</em></div>
-<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; &ntilde; 
&acirc; &eacute; &#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4263,14 +4263,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4413,9 +4413,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -4549,26 +4549,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4601,9 +4601,9 @@ After clickstyle &rArr;
 
 \]</em></div><pre class="example">
 
-</pre><div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; 
&ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em class="tex2jax_process">\[&uuml; &Uuml; 
&ntilde; &acirc; &eacute; &#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5260,17 +5260,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 31b0879..c6675af 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -812,9 +812,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -945,26 +945,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="formatting_fot.html#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="formatting_fot.html#FOOT2_6"><sup>6</sup></a>
@@ -993,9 +993,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1554,14 +1554,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1700,9 +1700,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1833,26 +1833,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="formatting_fot.html#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="formatting_fot.html#FOOT6"><sup>8</sup></a>
@@ -1881,9 +1881,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2442,14 +2442,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2592,9 +2592,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2728,26 +2728,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" 
href="formatting_fot.html#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" 
href="formatting_fot.html#FOOT8">(10)</a>
@@ -2780,9 +2780,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3439,17 +3439,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 832c41b..ec9a1a8 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="formatting_fot.html#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="formatting_fot.html#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="formatting_fot.html#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="formatting_fot.html#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
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 5289bf8..9ef192c 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1677,9 +1677,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1810,26 +1810,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1858,9 +1858,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2419,14 +2419,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2599,9 +2599,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2732,26 +2732,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>6</sup></a>
@@ -2780,9 +2780,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3341,14 +3341,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3490,9 +3490,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -3626,26 +3626,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(7)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(8)</a>
@@ -3678,9 +3678,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4337,17 +4337,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
@@ -4493,9 +4493,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -4626,26 +4626,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_9" 
href="#FOOT1_9"><sup>9</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_10" 
href="#FOOT2_10"><sup>10</sup></a>
@@ -4674,9 +4674,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5235,14 +5235,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
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 59daaca..51f8ec8 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -788,9 +788,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -921,26 +921,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF3" 
href="#FOOT3"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF4" 
href="#FOOT4"><sup>2</sup></a>
@@ -970,9 +970,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -1531,14 +1531,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1678,9 +1678,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1811,26 +1811,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="#FOOT1"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="#FOOT2"><sup>4</sup></a>
@@ -1859,9 +1859,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -2420,14 +2420,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2623,9 +2623,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -2756,26 +2756,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1_5" 
href="#FOOT1_5"><sup>5</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2_6" 
href="#FOOT2_6"><sup>6</sup></a>
@@ -2804,9 +2804,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -3365,14 +3365,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -3511,9 +3511,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -3644,26 +3644,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="#FOOT5"><sup>7</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="#FOOT6"><sup>8</sup></a>
@@ -3692,9 +3692,9 @@ After clickstyle &rArr;
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -4253,14 +4253,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -4403,9 +4403,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -4539,26 +4539,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(9)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(10)</a>
@@ -4591,9 +4591,9 @@ After clickstyle &rArr;
 
 </em></div><pre class="example">
 
-</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;`
-&#322; &#262;, &#262;, &ccedil; a'' &#551; &aring; a[
-&#259; a_ &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
+</pre><div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; i j &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup>h</sup><sub>l</sub>
 
  &nbsp;&nbsp; &nbsp;   ! ? . @ } { 
 a sunny day
@@ -5250,17 +5250,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij
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 87a1d5b..71afd46 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -838,9 +838,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -976,26 +976,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF1" 
href="sing_fot.htm#FOOT1"><sup>1</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF2" 
href="sing_fot.htm#FOOT2"><sup>2</sup></a>
@@ -1680,14 +1680,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -1826,9 +1826,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @&rsquo;{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@&lsquo;{@=E} &#274;` 
+@&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@&rsquo;C} &#262;,
+@,{@&rsquo;C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; <br>
 </p>
@@ -1964,26 +1964,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> &ndash;a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> &ndash;a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> &ndash;a.
+<code>@dotaccent{--a}</code> &ndash;a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> &ndash;a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> &ndash;a[
+<code>@ringaccent{--a}</code> &ndash;a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> &ndash;a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> &ndash;a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@u{--a}</code> &ndash;a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> &ndash;a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .&ndash;a
+<code>@udotaccent{--a}</code> &ndash;a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> &ndash;a&lt;
+<code>@v{--a}</code> &ndash;a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> &ndash;c,
+<code>@,{--c}</code> &ndash;c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> &ndash;a;
+<code>@ogonek{--a}</code> &ndash;a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF5" 
href="sing_fot.htm#FOOT5"><sup>3</sup></a>
 <code>@footnote{in footnote2}</code> <a id="DOCF6" 
href="sing_fot.htm#FOOT6"><sup>4</sup></a>
@@ -2668,14 +2668,14 @@ html ''
 
 
 <p>Somehow invalid use of @,:<br>
-@, ,
+@, &#807;
 <br>
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 </p>
 <p>Invalid use of @&rsquo;:<br>
-@&rsquo; '
+@&rsquo; &#769;
 <br>
-@&rsquo;@&quot;u '&uuml;
+@&rsquo;@&quot;u &#769;&uuml;
 </p>
 <p>@dotless{truc} truc
 @dotless{ij} ij
@@ -2818,9 +2818,9 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @'{@dotless{i}} &iacute; 
 @dotless{i} i
 @dotless{j} j
-@`{@=E} &#274;` 
+@`{@=E} &#274;&#768; 
 @l{} &#322;
-@,{@'C} &#262;,
+@,{@'C} &#262;&#807;
 @,c &ccedil;
 @,c@&quot;u &ccedil;&uuml; 
 
@@ -2959,26 +2959,26 @@ but , ,
 <code>@verb{:--a:}</code> <tt>--a</tt>
 <code>@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt>a  &lt; &amp; @ % 
&quot; --    b</tt>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
-<code>@H{a}</code> a''
-<code>@H{--a}</code> --a''
+<code>@H{a}</code> a&#779;
+<code>@H{--a}</code> --a&#779;
 <code>@dotaccent{a}</code> &#551;
-<code>@dotaccent{--a}</code> --a.
+<code>@dotaccent{--a}</code> --a&#775;
 <code>@ringaccent{a}</code> &aring;
-<code>@ringaccent{--a}</code> --a*
-<code>@tieaccent{a}</code> a[
-<code>@tieaccent{--a}</code> --a[
+<code>@ringaccent{--a}</code> --a&#778;
+<code>@tieaccent{a}</code> a&#865;
+<code>@tieaccent{--a}</code> --a&#865;
 <code>@u{a}</code> &#259;
-<code>@u{--a}</code> --a(
-<code>@ubaraccent{a}</code> a_
-<code>@ubaraccent{--a}</code> --a_
+<code>@u{--a}</code> --a&#774;
+<code>@ubaraccent{a}</code> a&#818;
+<code>@ubaraccent{--a}</code> --a&#818;
 <code>@udotaccent{a}</code> &#7841;
-<code>@udotaccent{--a}</code> .--a
+<code>@udotaccent{--a}</code> --a&#803;
 <code>@v{a}</code> &#462;
-<code>@v{--a}</code> --a&lt;
+<code>@v{--a}</code> --a&#780;
 <code>@,{c}</code> &ccedil;
-<code>@,{--c}</code> --c,
+<code>@,{--c}</code> --c&#807;
 <code>@ogonek{a}</code> &#261;
-<code>@ogonek{--a}</code> --a;
+<code>@ogonek{--a}</code> --a&#808;
 <code>a@sup{h}@sub{l}</code> a<sup>h</sup><sub>l</sub>
 <code>@footnote{in footnote}</code> <a id="DOCF7" 
href="sing_fot.htm#FOOT7">(5)</a>
 <code>@footnote{in footnote2}</code> <a id="DOCF8" 
href="sing_fot.htm#FOOT8">(6)</a>
@@ -3765,17 +3765,17 @@ html ''
 
 Somehow invalid use of @,:
 
-@, ,
+@, &#807;
 
 
-@,@&quot;u ,&uuml;
+@,@&quot;u &#807;&uuml;
 
 Invalid use of @':
 
-@' '
+@' &#769;
 
 
-@'@&quot;u '&uuml;
+@'@&quot;u &#769;&uuml;
 
 @dotless{truc} truc
 @dotless{ij} ij



reply via email to

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