branch master updated: * tp/Texinfo/Convert/Converter.pm (xml_accent): fix tieaccent regexp for entities.

[Patrice Dumas]

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 5e41760  * tp/Texinfo/Convert/Converter.pm (xml_accent): fix tieaccent 
regexp for entities.
5e41760 is described below

commit 5e4176092166c4acb7b772685062302896c7ce98
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 19 12:34:00 2021 +0100

    * tp/Texinfo/Convert/Converter.pm (xml_accent): fix tieaccent
    regexp for entities.
---
 ChangeLog                                                         | 5 +++++
 tp/Texinfo/Convert/Converter.pm                                   | 2 +-
 tp/tests/layout/res_parser/formatting/formatting.html             | 8 ++++----
 tp/tests/layout/res_parser/formatting_chm/chapter.html            | 4 ++--
 tp/tests/layout/res_parser/formatting_chm/formatting.html         | 4 ++--
 tp/tests/layout/res_parser/formatting_exotic/chapter.html         | 4 ++--
 tp/tests/layout/res_parser/formatting_fr_icons/formatting.html    | 8 ++++----
 tp/tests/layout/res_parser/formatting_html/formatting.html        | 8 ++++----
 .../res_parser/formatting_html_no_texi2html/formatting.html       | 4 ++--
 tp/tests/layout/res_parser/formatting_html_nodes/chapter.html     | 4 ++--
 tp/tests/layout/res_parser/formatting_html_nodes/index.html       | 4 ++--
 tp/tests/layout/res_parser/formatting_mathjax/formatting.html     | 8 ++++----
 tp/tests/layout/res_parser/formatting_nodes/chapter.html          | 4 ++--
 tp/tests/layout/res_parser/formatting_nodes/index.html            | 4 ++--
 .../layout/res_parser/formatting_regions/formatting_regions.html  | 8 ++++----
 .../layout/res_parser/formatting_weird_quotes/formatting.html     | 8 ++++----
 tp/tests/tex_html/res_parser/formatting_singular/chapter.html     | 4 ++--
 17 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc05893..556191c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@
 
 2021-12-19  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Converter.pm (xml_accent): fix tieaccent
+       regexp for entities.
+
+2021-12-19  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (@variable_string_settables),
        tp/Texinfo/Convert/Converter.pm (xml_accents), 
        tp/Texinfo/Convert/HTML.pm (%defaults, _set_variables_texi2html),
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 302aca1..a947f3a 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1520,7 +1520,7 @@ sub xml_accent($$$;$$)
       # 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/) {
+      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;
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index b1302a6..ddb9c2a 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2987,7 +2987,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -3961,7 +3961,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index d4d72e8..8a1759a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -988,7 +988,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1962,7 +1962,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 230da19..450714f 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index e6dab0a..ce233da 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1004,7 +1004,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1978,7 +1978,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 b2b48cd..1964ed6 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2987,7 +2987,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -3961,7 +3961,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index b1302a6..ddb9c2a 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2987,7 +2987,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -3961,7 +3961,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 8fab51f..8caf2cf 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
@@ -1043,7 +1043,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2017,7 +2017,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 22bcb94..d0ecfd5 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1004,7 +1004,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1978,7 +1978,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 fea02ce..d97d7ab 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index a6bc2fc..4720dae 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -990,7 +990,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1966,7 +1966,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2997,7 +2997,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -3971,7 +3971,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 22bcb94..d0ecfd5 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1004,7 +1004,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1978,7 +1978,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index fea02ce..d97d7ab 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 7a9270a..1bc39e6 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1955,7 +1955,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2963,7 +2963,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -5057,7 +5057,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 4d3addf..4240858 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -980,7 +980,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -1956,7 +1956,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2987,7 +2987,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -3961,7 +3961,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
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 746df15..805a6e1 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1035,7 +1035,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;
@@ -2109,7 +2109,7 @@ but , ,
 <code>@ringaccent{a}</code> &aring;
 <code>@ringaccent{--a}</code> &ndash;a&#778;
 <code>@tieaccent{a}</code> a&#865;
-<code>@tieaccent{--a}</code> &ndash;a&#865;
+<code>@tieaccent{--a}</code> &ndash;&#865;a
 <code>@u{a}</code> &#259;
 <code>@u{--a}</code> &ndash;a&#774;
 <code>@ubaraccent{a}</code> a&#818;