texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Use − for @minus{} in HTML output


From: Patrice Dumas
Subject: branch master updated: Use − for @minus{} in HTML output
Date: Thu, 13 Oct 2022 15:39:56 -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 8a14a50472 Use − for @minus{} in HTML output
8a14a50472 is described below

commit 8a14a5047246ac70d53622e242ab18708a8f95b7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Oct 13 21:39:42 2022 +0200

    Use &minus; for @minus{} in HTML output
    
    * tp/Texinfo/Convert/Converter.pm
    (%xml_text_entity_no_arg_commands_formatting): use &minus; for
    @minus{}.  Report from Vincent Lefèvre.
---
 ChangeLog                                          |  8 ++++
 tp/Texinfo/Convert/Converter.pm                    |  2 +-
 tp/t/results/coverage/commands_in_math.pl          |  2 +-
 .../formats_encodings/at_commands_in_refs.pl       | 10 ++---
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |  4 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |  8 ++--
 .../res_html/_2265-_2264-_2192.html                |  4 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_latin1/res_html/index.html |  2 +-
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |  4 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |  8 ++--
 .../res_html/_2265-_2264-_2192.html                |  4 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_utf8/res_html/index.html   |  2 +-
 .../html_tests/mathjax_with_texinfo_html_text.pl   |  2 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |  2 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |  2 +-
 .../res_html/node-chap.html                        |  2 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  8 ++--
 .../layout/res_parser/formatting/formatting.html   | 40 ++++++++---------
 .../layout/res_parser/formatting_chm/chapter.html  | 24 +++++------
 .../res_parser/formatting_chm/formatting.html      | 16 +++----
 .../res_parser/formatting_exotic/chapter.html      | 24 +++++------
 .../res_parser/formatting_fr_icons/formatting.html | 40 ++++++++---------
 .../res_parser/formatting_html/formatting.html     | 40 ++++++++---------
 .../res_parser/formatting_html32/formatting.html   | 50 +++++++++++-----------
 .../formatting_html_no_texi2html/formatting.html   | 24 +++++------
 .../res_parser/formatting_html_nodes/chapter.html  | 24 +++++------
 .../res_parser/formatting_html_nodes/index.html    | 16 +++----
 .../formatting_inline_css/formatting.html          | 40 ++++++++---------
 .../res_parser/formatting_mathjax/formatting.html  | 10 ++---
 .../res_parser/formatting_nodes/chapter.html       | 24 +++++------
 .../layout/res_parser/formatting_nodes/index.html  | 16 +++----
 .../formatting_regions/formatting_regions.html     | 40 ++++++++---------
 .../formatting_weird_quotes/formatting.html        | 40 ++++++++---------
 .../res_parser/formatting_xhtml/formatting.html    | 40 ++++++++---------
 .../res_parser/formatting_singular/chapter.html    |  6 +--
 47 files changed, 310 insertions(+), 302 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 501430d208..fd55aec5eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-10-13  Patrice Dumas  <pertusus@free.fr>
+
+       Use &minus; for @minus{} in HTML output
+
+       * tp/Texinfo/Convert/Converter.pm
+       (%xml_text_entity_no_arg_commands_formatting): use &minus; for
+       @minus{}.  Report from Vincent Lefèvre.
+
 2022-10-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm: setup %description_command_format in
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 87789524a5..458c75fc5d 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1523,7 +1523,7 @@ our %xml_text_entity_no_arg_commands_formatting = (
                'expansion'    => '&rarr;',
                'arrow'        => '&rarr;',
                'click'        => '&rarr;',
-               'minus'        => '-',
+               'minus'        => '&minus;',
                'point'        => '&lowast;',
                'print'        => '-|',
                'result'       => '&rArr;',
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 0f16a13c4f..3c617624aa 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2691,7 +2691,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 TeX LaTeX &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - &lowast; -| &rArr;
+error&rarr; &rarr; &minus; &lowast; -| &rArr;
 &aring; &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &reg; &ordf; &ordm; , 
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index adbff5b1fb..1c5ca3694e 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22066,7 +22066,7 @@ Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 <li><a href="#-_0021-_002e-_002e-_003f-_0040" accesskey="2">&nbsp; &nbsp; ! 
<br> .  . ? @</a></li>
 <li><a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="3">@ { } \\ 
#</a></li>
 <li><a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
-<li><a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
+<li><a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a></li>
 <li><a href="#g_t_2265-_2264-_2192" accesskey="6">&ge; &le; &rarr;</a></li>
 <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>
@@ -22121,7 +22121,7 @@ Next: <a 
href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="n"
 <div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="p" 
rel="prev">@ { } \\ #</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
+Next: <a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, 
Previous: <a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="p" 
rel="prev">@ { } \\ #</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <h2 class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">4 
LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></h2>
 
@@ -22132,14 +22132,14 @@ Next: <a 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey
 <p>
 Next: <a href="#g_t_2265-_2264-_2192" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; -</h2>
+<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="g_t_2265-_2264-_2192-1">6 &ge; &le; &rarr;</h2>
 
@@ -22340,7 +22340,7 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub class="sub">g</sub>H 3
 </p>
 <p><a class="ref" 
href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">LaTeX TeX &bull; , 
&copy; &hellip; <small class="enddots">...</small></a>
 </p>
-<p><a class="ref" 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; 
error&rarr; &euro; &iexcl; &rarr; -</a>
+<p><a class="ref" 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</a>
 </p>
 <p><a class="ref" href="#g_t_2265-_2264-_2192">&ge; &le; &rarr;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index df1d543f4c..555f4ef5ec 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;">
 <link href="_0040-_007b-_007d-_005c-_0023.html" rel="prev" title="@ { } \ #">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-panel">
 <p>
-Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">4 
LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index 125c7a3bba..207ac725a0 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.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>&equiv; error&rarr; &euro; &iexcl; &rarr; - (Top)</title>
+<title>&equiv; error&rarr; &euro; &iexcl; &rarr; &minus; (Top)</title>
 
-<meta name="description" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - 
(Top)">
-<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - 
(Top)">
+<meta name="description" content="&equiv; error&rarr; &euro; &iexcl; &rarr; 
&minus; (Top)">
+<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; 
&minus; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -26,7 +26,7 @@
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; -</h2>
+<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
index 284999d94e..87d385e328 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="next" 
title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-panel">
 <p>
-Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_2265-_2264-_2192-1">6 &ge; &le; &rarr;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 9a0465d7cb..4759d47b21 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -43,7 +43,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html">LaTeX TeX &bull; 
, &copy; &hellip; <small class="enddots">...</small></a>
 </p>
-<p><a class="ref" 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; 
error&rarr; &euro; &iexcl; &rarr; -</a>
+<p><a class="ref" 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</a>
 </p>
 <p><a class="ref" href="_2265-_2264-_2192.html">&ge; &le; &rarr;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index a8ac5044f9..9e3ddc8e05 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -41,7 +41,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; 
! <br> .  . ? @</a></li>
 <li><a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ 
#</a></li>
 <li><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
-<li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
+<li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a></li>
 <li><a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></li>
 <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>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 7e9079dc2c..13084493ab 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;">
 <link href="_0040-_007b-_007d-_005c-_0023.html" rel="prev" title="@ { } \ #">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-panel">
 <p>
-Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">4 
LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index b66251d5d7..e55895b81b 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.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>&equiv; error&rarr; &euro; &iexcl; &rarr; - (Top)</title>
+<title>&equiv; error&rarr; &euro; &iexcl; &rarr; &minus; (Top)</title>
 
-<meta name="description" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - 
(Top)">
-<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - 
(Top)">
+<meta name="description" content="&equiv; error&rarr; &euro; &iexcl; &rarr; 
&minus; (Top)">
+<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; 
&minus; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -26,7 +26,7 @@
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; -</h2>
+<h2 class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">5 &equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
index 5cbc2c04bd..c757088c56 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="next" 
title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-panel">
 <p>
-Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_2265-_2264-_2192-1">6 &ge; &le; &rarr;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 7a31de294c..064d282898 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -43,7 +43,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html">LaTeX TeX &bull; 
, &copy; &hellip; <small class="enddots">...</small></a>
 </p>
-<p><a class="ref" 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; 
error&rarr; &euro; &iexcl; &rarr; -</a>
+<p><a class="ref" 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; 
error&rarr; &euro; &iexcl; &rarr; &minus;</a>
 </p>
 <p><a class="ref" href="_2265-_2264-_2192.html">&ge; &le; &rarr;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index 8e8d3f90b4..d685c661dd 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -41,7 +41,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; 
! <br> .  . ? @</a></li>
 <li><a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ 
#</a></li>
 <li><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
-<li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
+<li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; &minus;</a></li>
 <li><a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></li>
 <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>
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
index 32ca673797..58f6ca43bc 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
@@ -349,7 +349,7 @@ $result_floats{'mathjax_with_texinfo_html_text'} = {};
 
 $result_converted{'html_text'}->{'mathjax_with_texinfo_html_text'} = '<div 
class="displaymath"><em class="tex2jax_process">\\[a<sup class="sup">b - 
\\frac{\\xi}{phi &copy;}</sup> &inodot;
 \\]</em></div>
-<p>Some <em class="math tex2jax_process">\\(a - b &ge; &Aring; &ecirc;\\)</em>.
+<p>Some <em class="math tex2jax_process">\\(a &minus; b &ge; &Aring; 
&ecirc;\\)</em>.
 </p>';
 
 1;
diff --git 
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index 457130b3a7..47669fabe1 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -377,7 +377,7 @@ MathJax = {
 <body lang="en" class="tex2jax_ignore">
 <div class="displaymath"><em class="tex2jax_process">\\[a<sup class="sup">b - 
\\frac{\\xi}{phi &copy;}</sup> &inodot;
 \\]</em></div>
-<p>Some <em class="math tex2jax_process">\\(a - b &ge; &Aring; &ecirc;\\)</em>.
+<p>Some <em class="math tex2jax_process">\\(a &minus; b &ge; &Aring; 
&ecirc;\\)</em>.
 </p>
 
 <a href="js_licenses.html" rel="jslicense"><small>JavaScript license 
information</small></a>
diff --git a/tp/t/results/html_tests/test_accents_sc_default.pl 
b/tp/t/results/html_tests/test_accents_sc_default.pl
index ff5ede6ba1..1b719a381c 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -1690,7 +1690,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default'} = '<div class="top-l
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html 
b/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
index cbc9407d15..3568faf65b 100644
--- a/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
+++ b/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index a2e419ff77..831ea6f567 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -1736,7 +1736,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default_latin1'} = '
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
index ff2eb1b73e..b7549305e2 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index 97db37b923..9582a7a224 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -1765,7 +1765,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default_usascii'} = '
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
index f7469116c9..7ddc8c72f0 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index ef4c041190..6f63db32fb 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -1736,7 +1736,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_enable_encoding_latin1'} = '
 </p>
 <p>&ge; <small class="enddots">...</small> Å é &#550; &#322;. ©. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- ®
+&minus; ®
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
index d8bdd8c99f..7de04f128f 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> � � &#550; &#322;. �. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- �
+&minus; �
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 3db1759421..8dce25fb55 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -1765,7 +1765,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_enable_encoding_usascii'} = '
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
index f7469116c9..7ddc8c72f0 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 5dff81bc3d..b56e0af19c 100644
--- a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -1736,7 +1736,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_to_utf8_latin1'} = '
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git 
a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
index cbc9407d15..3568faf65b 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
@@ -33,7 +33,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p>&ge; <small class="enddots">...</small> &Aring; &eacute; &#550; &#322;. 
&copy;. error&rarr;.
 &ldquo; in quotes &rdquo;. &rarr;
-- &reg;
+&minus; &reg;
 </p>
 
 <p>&ndash;a&#774;
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index d53c6d8f5e..83c2133546 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2701,7 +2701,7 @@ Out of code &mdash; out-of-code.
 <code class="code">1aaa</code> <code class="code">2aaa-</code> <code 
class="code">-3bbb</code> <code class="code">4aaa-bbb</code> 
 <code class="code"> 5aaa-bb</code> <code class="code">6aaa-bb </code> <code 
class="code">ccc 7aaa-bbb</code> <code class="code">ccc 8aaa-bbb ddd</code>
 <code class="code">9aaa-bbb rrr_vv</code>
-&lsquo;<samp class="samp">fff-- --- minus-b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
+&lsquo;<samp class="samp">fff-- --- minus&minus;b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
 anc-hor<a class="anchor" id="A-node0"></a></samp>&rsquo;
 </p>
 <div class="example">
@@ -2713,7 +2713,7 @@ Out of code &mdash; out-of-code.
 <code class="code">1aaa</code> <code class="code">2aaa-</code> <code 
class="code">-3bbb</code> <code class="code">4aaa-bbb</code> 
 <code class="code"> 5aaa-bb</code> <code class="code">6aaa-bb </code> <code 
class="code">ccc 7aaa-bbb</code> <code class="code">ccc 8aaa-bbb ddd</code>
 <code class="code">9aaa-bbb rrr_vv</code>
-&lsquo;<samp class="samp">fff-- --- minus-b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
+&lsquo;<samp class="samp">fff-- --- minus&minus;b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
 anc-hor<a class="anchor" id="A-node1"></a></samp>&rsquo;
 </p>
 <div class="example">
@@ -2721,7 +2721,7 @@ anc-hor<a class="anchor" id="A-node1"></a></samp>&rsquo;
 </pre></div>
 
 <p>In w:
-Out&nbsp;of&nbsp;code&nbsp;&mdash;&nbsp;<span 
class="w-nolinebreak-text">out-of-code.</span>&nbsp;<code 
class="code">1aaa</code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">2aaa-</span></code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">-3bbb</span></code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">4aaa-bbb</span></code>&nbsp;&nbsp;<code 
class="code">&nbsp;<span 
class="w-nolinebreak-text">5aaa-bb</span></code>&nbsp;<code class="code"><span 
class="w [...]
+Out&nbsp;of&nbsp;code&nbsp;&mdash;&nbsp;<span 
class="w-nolinebreak-text">out-of-code.</span>&nbsp;<code 
class="code">1aaa</code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">2aaa-</span></code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">-3bbb</span></code>&nbsp;<code class="code"><span 
class="w-nolinebreak-text">4aaa-bbb</span></code>&nbsp;&nbsp;<code 
class="code">&nbsp;<span 
class="w-nolinebreak-text">5aaa-bb</span></code>&nbsp;<code class="code"><span 
class="w [...]
 </p>
 <div class="example">
 <pre class="example-preformatted"><code class="code">in-example</code><!-- /@w 
-->
@@ -2732,7 +2732,7 @@ Out of code &mdash; out-of-code.
 <code class="code">1aaa</code> <code class="code">2aaa-</code> <code 
class="code">-3bbb</code> <code class="code">4aaa-bbb</code> 
 <code class="code"> 5aaa-bb</code> <code class="code">6aaa-bb </code> <code 
class="code">ccc 7aaa-bbb</code> <code class="code">ccc 8aaa-bbb ddd</code>
 <code class="code">9aaa-bbb rrr_vv</code>
-&lsquo;<samp class="samp">fff-- --- minus-b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
+&lsquo;<samp class="samp">fff-- --- minus&minus;b aa-tt&eacute;ff_gg aa<span 
class="r">r-oman</span> 
 anc-hor<a class="anchor" id="A-node2"></a></samp>&rsquo;
 </p>
 <div class="example">
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 3b387c5c37..b19ddf3488 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -964,7 +964,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1033,7 +1033,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1111,7 +1111,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1806,7 +1806,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2041,7 +2041,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2110,7 +2110,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2188,7 +2188,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2883,7 +2883,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3321,7 +3321,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4016,7 +4016,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4249,7 +4249,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4318,7 +4318,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4396,7 +4396,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5091,7 +5091,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5330,7 +5330,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5399,7 +5399,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5485,7 +5485,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6304,7 +6304,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index e5b5d7c811..cf162cd1a6 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -960,7 +960,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1029,7 +1029,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1107,7 +1107,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &#339; &AElig; &#338; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1802,7 +1802,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2035,7 +2035,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2104,7 +2104,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2182,7 +2182,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &#339; &AElig; &#338; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2877,7 +2877,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3116,7 +3116,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3185,7 +3185,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3271,7 +3271,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &#339; &AElig; &#338; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4090,7 +4090,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index a50b030fec..f6eed90d4f 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -948,7 +948,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1017,7 +1017,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1095,7 +1095,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &#339; &AElig; &#338; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1790,7 +1790,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2025,7 +2025,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2094,7 +2094,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2172,7 +2172,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &#339; &AElig; &#338; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2867,7 +2867,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 4397bafc29..20d7b600c7 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -979,7 +979,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1048,7 +1048,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1126,7 +1126,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1821,7 +1821,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2054,7 +2054,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2123,7 +2123,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2201,7 +2201,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2896,7 +2896,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3135,7 +3135,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3204,7 +3204,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3290,7 +3290,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4105,7 +4105,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
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 c77249aa10..139d254500 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -964,7 +964,7 @@ but , ,
 @equiv &equiv;
 @error erreur&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1033,7 +1033,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1111,7 +1111,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-erreur&rarr; &rarr; - -| &rArr;
+erreur&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1806,7 +1806,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2041,7 +2041,7 @@ but , ,
 @equiv &equiv;
 @error erreur&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2110,7 +2110,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2188,7 +2188,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-erreur&rarr; &rarr; - -| &rArr;
+erreur&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2883,7 +2883,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error erreur&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3321,7 +3321,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-erreur&rarr; &rarr; - -| &rArr;
+erreur&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4016,7 +4016,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4249,7 +4249,7 @@ but , ,
 @equiv &equiv;
 @error erreur&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4318,7 +4318,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4396,7 +4396,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-erreur&rarr; &rarr; - -| &rArr;
+erreur&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5091,7 +5091,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5330,7 +5330,7 @@ but , ,
 @equiv &equiv;
 @error erreur&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5399,7 +5399,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5485,7 +5485,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-erreur&rarr; &rarr; - -| &rArr;
+erreur&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6304,7 +6304,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 3b387c5c37..b19ddf3488 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -964,7 +964,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1033,7 +1033,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1111,7 +1111,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1806,7 +1806,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2041,7 +2041,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2110,7 +2110,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2188,7 +2188,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2883,7 +2883,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3321,7 +3321,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4016,7 +4016,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4249,7 +4249,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4318,7 +4318,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4396,7 +4396,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5091,7 +5091,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5330,7 +5330,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5399,7 +5399,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5485,7 +5485,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6304,7 +6304,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 24f72d9f3d..952301184c 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -926,7 +926,7 @@ but , ,
 @equiv ==
 @error error-&gt;
 @expansion ==&gt;
-@minus -
+@minus &minus;
 @point -!-
 @print -|
 @result =&gt;
@@ -995,7 +995,7 @@ but , ,
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
-<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} 
&minus;</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
 <code>@samp{--a}</code> `<samp>--a</samp>'
@@ -1073,7 +1073,7 @@ a sunny day
 <div><em>-&gt;
 &#x0075;
 * &copy; ... ... ==
-error-&gt; ==&gt; - -| =&gt;
+error-&gt; ==&gt; &minus; -| =&gt;
 &Aring; &aelig; &#156; &AElig; &#140; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1237,7 +1237,7 @@ error-&gt; ==&gt; - -| =&gt;
 </li></ul>
 
 <ul>
-<li>- minu-s
+<li>&minus; minu-s
 </li></ul>
 
 <ul>
@@ -1742,7 +1742,7 @@ html ''
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;-. ,A.
 </p>
-<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a&minus; 
{\frac{1}{2}}</em>
 </p>
 
 
@@ -1977,7 +1977,7 @@ but , ,
 @equiv ==
 @error error-&gt;
 @expansion ==&gt;
-@minus -
+@minus &minus;
 @point -!-
 @print -|
 @result =&gt;
@@ -2046,7 +2046,7 @@ but , ,
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
-<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} 
&minus;</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
 <code>@samp{--a}</code> `<samp>--a</samp>'
@@ -2124,7 +2124,7 @@ a sunny day
 <div><em>-&gt;
 &#x0075;
 * &copy; ... ... ==
-error-&gt; ==&gt; - -| =&gt;
+error-&gt; ==&gt; &minus; -| =&gt;
 &Aring; &aelig; &#156; &AElig; &#140; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2288,7 +2288,7 @@ error-&gt; ==&gt; - -| =&gt;
 </li></ul>
 
 <ul>
-<li>- minu-s
+<li>&minus; minu-s
 </li></ul>
 
 <ul>
@@ -2793,7 +2793,7 @@ html ''
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;-. ,A.
 </p>
-<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a&minus; 
{\frac{1}{2}}</em>
 </p>
 
 
@@ -3084,7 +3084,7 @@ but , ,
 @equiv ==
 @error error-&gt;
 @expansion ==&gt;
-@minus -
+@minus &minus;
 @point -!-
 @print -|
 @result =&gt;
@@ -3153,7 +3153,7 @@ but , ,
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
-<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} 
&minus;</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
 <code>@samp{--a}</code> `<samp>--a</samp>'
@@ -3231,7 +3231,7 @@ a sunny day
 <div><em>-&gt;
 &#x0075;
 * &copy; ... ... ==
-error-&gt; ==&gt; - -| =&gt;
+error-&gt; ==&gt; &minus; -| =&gt;
 &Aring; &aelig; &#156; &AElig; &#140; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -3395,7 +3395,7 @@ error-&gt; ==&gt; - -| =&gt;
 </li></ul>
 
 <ul>
-<li>- minu-s
+<li>&minus; minu-s
 </li></ul>
 
 <ul>
@@ -3900,7 +3900,7 @@ html ''
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;-. ,A.
 </p>
-<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a&minus; 
{\frac{1}{2}}</em>
 </p>
 
 
@@ -4133,7 +4133,7 @@ but , ,
 @equiv ==
 @error error-&gt;
 @expansion ==&gt;
-@minus -
+@minus &minus;
 @point -!-
 @print -|
 @result =&gt;
@@ -4202,7 +4202,7 @@ but , ,
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
-<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} 
&minus;</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
 <code>@samp{--a}</code> `<samp>--a</samp>'
@@ -4280,7 +4280,7 @@ a sunny day
 <div><em>-&gt;
 &#x0075;
 * &copy; ... ... ==
-error-&gt; ==&gt; - -| =&gt;
+error-&gt; ==&gt; &minus; -| =&gt;
 &Aring; &aelig; &#156; &AElig; &#140; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4444,7 +4444,7 @@ error-&gt; ==&gt; - -| =&gt;
 </li></ul>
 
 <ul>
-<li>- minu-s
+<li>&minus; minu-s
 </li></ul>
 
 <ul>
@@ -4949,7 +4949,7 @@ html ''
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;-. ,A.
 </p>
-<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a&minus; 
{\frac{1}{2}}</em>
 </p>
 
 
@@ -5187,7 +5187,7 @@ but , ,
 @equiv ==
 @error error-&gt;
 @expansion ==&gt;
-@minus -
+@minus &minus;
 @point -!-
 @print -|
 @result =&gt;
@@ -5256,7 +5256,7 @@ but , ,
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
-<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} 
&minus;</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
 <code>@samp{--a}</code> `<samp>--a</samp>'
@@ -5342,7 +5342,7 @@ a sunny day
 </pre><div><em>-&gt;
 &#x0075;
 * &copy; ... ... ==
-error-&gt; ==&gt; - -| =&gt;
+error-&gt; ==&gt; &minus; -| =&gt;
 &Aring; &aelig; &#156; &AElig; &#140; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5541,7 +5541,7 @@ error-&gt; ==&gt; - -| =&gt;
 <pre>
 
 </pre><ul>
-<li>- <pre>minu--s
+<li>&minus; <pre>minu--s
 </pre></li></ul>
 <pre>
 
@@ -6135,7 +6135,7 @@ html ''
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;--. ,A. (&Eacute;tude--, <b>Autonome</b>)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;--. ,A.
 
-<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
+<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em>--a&minus; {\frac{1}{2}}</em>
 
 
 
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 0e69c7f605..2c3379a299 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
@@ -1018,7 +1018,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1087,7 +1087,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1165,7 +1165,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1860,7 +1860,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2093,7 +2093,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2162,7 +2162,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2240,7 +2240,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2935,7 +2935,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3329,7 +3329,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4148,7 +4148,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
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 3c2fcc679a..cbe15ee7f7 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -980,7 +980,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1049,7 +1049,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1127,7 +1127,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1822,7 +1822,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2055,7 +2055,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2124,7 +2124,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2202,7 +2202,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2897,7 +2897,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3136,7 +3136,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3205,7 +3205,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3291,7 +3291,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4110,7 +4110,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
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 9a3f259d28..db31439ac6 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -953,7 +953,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1022,7 +1022,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1100,7 +1100,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1795,7 +1795,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2030,7 +2030,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2099,7 +2099,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2177,7 +2177,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2872,7 +2872,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 00d8d9dc25..c65d5e044b 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -926,7 +926,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -995,7 +995,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1073,7 +1073,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1768,7 +1768,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2003,7 +2003,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2072,7 +2072,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2150,7 +2150,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2845,7 +2845,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3136,7 +3136,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3205,7 +3205,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3283,7 +3283,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -3978,7 +3978,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4211,7 +4211,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4280,7 +4280,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4358,7 +4358,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5053,7 +5053,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5292,7 +5292,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5361,7 +5361,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5447,7 +5447,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6266,7 +6266,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 57be9710b8..4a06a66494 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -974,7 +974,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2049,7 +2049,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3180,7 +3180,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4253,7 +4253,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5332,7 +5332,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 3c2fcc679a..cbe15ee7f7 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -980,7 +980,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1049,7 +1049,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1127,7 +1127,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1822,7 +1822,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2055,7 +2055,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2124,7 +2124,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2202,7 +2202,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2897,7 +2897,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3136,7 +3136,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3205,7 +3205,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3291,7 +3291,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4110,7 +4110,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 9a3f259d28..db31439ac6 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -953,7 +953,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1022,7 +1022,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1100,7 +1100,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1795,7 +1795,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2030,7 +2030,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2099,7 +2099,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2177,7 +2177,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2872,7 +2872,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
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 a7913423bf..adf31647cd 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -963,7 +963,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1032,7 +1032,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1110,7 +1110,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1805,7 +1805,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2039,7 +2039,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2108,7 +2108,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2186,7 +2186,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2881,7 +2881,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3148,7 +3148,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3217,7 +3217,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3295,7 +3295,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -3990,7 +3990,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4228,7 +4228,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4297,7 +4297,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4383,7 +4383,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5202,7 +5202,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
@@ -5452,7 +5452,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5521,7 +5521,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5599,7 +5599,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6294,7 +6294,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
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 2d50999ecf..edb7ebea70 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -964,7 +964,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1033,7 +1033,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> @<samp class="samp">--a</samp>'&lsquo;
@@ -1111,7 +1111,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1806,7 +1806,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2041,7 +2041,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2110,7 +2110,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> @<samp class="samp">--a</samp>'&lsquo;
@@ -2188,7 +2188,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2883,7 +2883,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> @<samp class="samp">--a</samp>'&lsquo;
@@ -3321,7 +3321,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4016,7 +4016,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4249,7 +4249,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4318,7 +4318,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> @<samp class="samp">--a</samp>'&lsquo;
@@ -4396,7 +4396,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5091,7 +5091,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5330,7 +5330,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5399,7 +5399,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> @<samp class="samp">--a</samp>'&lsquo;
@@ -5485,7 +5485,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6304,7 +6304,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 84bbc7de04..1c85f62eef 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -964,7 +964,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -1033,7 +1033,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -1111,7 +1111,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -1806,7 +1806,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -2041,7 +2041,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2110,7 +2110,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -2188,7 +2188,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -2883,7 +2883,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -3174,7 +3174,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -3321,7 +3321,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -4016,7 +4016,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -4249,7 +4249,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -4318,7 +4318,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -4396,7 +4396,7 @@ a sunny day
 <div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -5091,7 +5091,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, 
Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b 
class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
 </p>
-<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 </p>
 
 
@@ -5330,7 +5330,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -5399,7 +5399,7 @@ but , ,
 <code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
-<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
+<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &minus;</em>
 <code class="code">@option{--a}</code> <samp class="option">--a</samp>
 <code class="code">@r{--a}</code> <span class="r">&ndash;a</span>
 <code class="code">@samp{--a}</code> &lsquo;<samp 
class="samp">--a</samp>&rsquo;
@@ -5485,7 +5485,7 @@ a sunny day
 </pre><div class="displaymath"><em>&rarr;
 &#x0075;
 &bull; &copy; &hellip; ... &equiv;
-error&rarr; &rarr; - -| &rArr;
+error&rarr; &rarr; &minus; -| &rArr;
 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH;
 &THORN; &eth; &thorn; &iexcl; &iquest; &pound;
 &ordf; &ordm; , 
@@ -6304,7 +6304,7 @@ html ''
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} 
}</code> <abbr class="abbr" title="&Eacute;tude&ndash;, Autonome">&Eacute;--. 
,A.</abbr> (&Eacute;tude--, <b class="b">Autonome</b>)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
 
-<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a- {\frac{1}{2}}</em>
+<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <em 
class="math">--a&minus; {\frac{1}{2}}</em>
 
 
 
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 a1fa1fd26c..6dd2e1b7f4 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1005,7 +1005,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -2217,7 +2217,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;
@@ -3435,7 +3435,7 @@ but , ,
 @equiv &equiv;
 @error error&rarr;
 @expansion &rarr;
-@minus -
+@minus &minus;
 @point &lowast;
 @print -|
 @result &rArr;



reply via email to

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