[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: add @latex to l2h and use CONVERT_TO_LATEX_IN_MAT
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: add @latex to l2h and use CONVERT_TO_LATEX_IN_MATH |
|
Date: |
Sat, 15 Oct 2022 08:55:44 -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 38aa82115b add @latex to l2h and use CONVERT_TO_LATEX_IN_MATH
38aa82115b is described below
commit 38aa82115b4c06b587887eb269a43ab775399853
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 15 14:55:31 2022 +0200
add @latex to l2h and use CONVERT_TO_LATEX_IN_MATH
* doc/texinfo.texi (@command{latex2html} Customization Variables),
tp/ext/latex2html.pm (l2h_process): select @latex blocks too. If
CONVERT_TO_LATEX_IN_MATH is set, convert input tree element content to
LaTeX instead of Texinfo.
* tp/ext/tex4ht.pm (tex4ht_prepare): actually output latex blocks.
---
ChangeLog | 11 +
doc/texinfo.texi | 11 +-
tp/ext/latex2html.pm | 20 +-
tp/ext/tex4ht.pm | 2 +-
.../res_parser/formatting_singular/chapter.html | 381 ++++++++++-----------
.../formatting_singular/sing-l2h_cache.pm | 206 +++++------
.../res_parser/formatting_singular/sing_l2h.html | 147 ++++----
.../res_parser/formatting_singular/sing_l2h.tex | 68 ++--
.../formatting_singular/sing_l2h_images.tex | 81 +++--
tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm | 39 ++-
tp/tests/tex_html/res_parser/tex/tex.html | 27 +-
tp/tests/tex_html/res_parser/tex/tex_l2h.html | 27 +-
tp/tests/tex_html/res_parser/tex/tex_l2h.tex | 10 +-
.../tex_html/res_parser/tex/tex_l2h_images.tex | 24 +-
.../tex_in_copying/tex_in_copying-l2h_cache.pm | 4 +-
.../res_parser/tex_in_copying/tex_in_copying.html | 6 +-
.../tex_in_copying/tex_in_copying_l2h.html | 2 +-
.../tex_in_copying/tex_in_copying_l2h.tex | 2 +-
.../tex_in_copying/tex_in_copying_l2h_images.tex | 4 +-
19 files changed, 560 insertions(+), 512 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f72063b3a7..aac92d70c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-10-15 Patrice Dumas <pertusus@free.fr>
+
+ add @latex to l2h and use CONVERT_TO_LATEX_IN_MATH
+
+ * doc/texinfo.texi (@command{latex2html} Customization Variables),
+ tp/ext/latex2html.pm (l2h_process): select @latex blocks too. If
+ CONVERT_TO_LATEX_IN_MATH is set, convert input tree element content to
+ LaTeX instead of Texinfo.
+
+ * tp/ext/tex4ht.pm (tex4ht_prepare): actually output latex blocks.
+
2022-10-15 Patrice Dumas <pertusus@free.fr>
* tp/ext/tex4ht.pm (tex4ht_process_format): remove leading and
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 5f01642e87..2f31fce9e4 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16626,11 +16626,14 @@ others' distribution systems.
@subsection @command{latex2html} Customization Variables
This table lists the customization variables which can be used when
-@command{latex2html} is being used to convert @code{@@math} and
-@code{@@tex} sections for HTML@. These customization variables
-are relevant only if @code{HTML_MATH} is set to @samp{l2h}.
+@command{latex2html} is being used to convert @code{@@math},
+@code{@@displaymath}, @code{@@latex} and @code{@@tex} sections for HTML@.
+These customization variables are relevant only if @code{HTML_MATH} is set to
+@samp{l2h}.
-To actually convert @code{@@tex} sections, @option{--iftex} should be used.
+To actually convert @code{@@tex} sections, @option{--iftex} should be used,
+and to actually convert @code{@@latex} sections, @option{--iflatex} should be
+used.
@vtable @code
@item L2H_CLEAN
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index bbea3bd4fc..ed314ea5b6 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -39,6 +39,8 @@ use Encode qw(encode);
# also for __(
use Texinfo::Common;
use Texinfo::Convert::Texinfo;
+# to implement CONVERT_TO_LATEX_IN_MATH
+use Texinfo::Convert::LaTeX;
texinfo_register_handler('structure', \&l2h_process);
texinfo_register_handler('finish', \&l2h_finish);
@@ -228,13 +230,19 @@ sub l2h_process($$)
return 0 if (defined($self->get_conf('OUTFILE'))
and $Texinfo::Common::null_device_file{$self->get_conf('OUTFILE')});
+ my $options_latex_math;
+ if ($self->get_conf('CONVERT_TO_LATEX_IN_MATH')) {
+ $options_latex_math
+ =
{Texinfo::Convert::LaTeX::copy_options_for_convert_to_latex_math($self)};
+ }
+
my $l2h_skip = $self->get_conf('L2H_SKIP');
# open the database that holds cached text
l2h_init_cache($self) if (!defined($l2h_skip) or $l2h_skip);
- my @replaced_commands = ('tex', 'math', 'displaymath');
+ my @replaced_commands = ('displaymath', 'latex', 'math', 'tex');
my $collected_commands = Texinfo::Common::collect_commands_list_in_tree(
$document_root, \@replaced_commands);
@@ -263,11 +271,17 @@ sub l2h_process($$)
pop @{$tree->{'contents'}};
}
}
- my $texinfo_text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
+ my $texinfo_text;
+ if ($self->get_conf('CONVERT_TO_LATEX_IN_MATH')) {
+ $texinfo_text = Texinfo::Convert::LaTeX::convert_to_latex_math(undef,
+ $tree, $options_latex_math);
+ } else {
+ $texinfo_text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
+ }
# print $texinfo_text into latex file (if not already there nor in cache)
# which can be later on replaced by the latex2html generated text.
my $latex_text = $texinfo_text;
- if ($command eq 'tex') {
+ if ($command eq 'tex' or $command eq 'latex') {
$latex_text .= ' ';
} elsif ($command eq 'math') {
$latex_text = "\$".$latex_text."\$";
diff --git a/tp/ext/tex4ht.pm b/tp/ext/tex4ht.pm
index 6fb0e27ebf..0002e44307 100644
--- a/tp/ext/tex4ht.pm
+++ b/tp/ext/tex4ht.pm
@@ -272,7 +272,7 @@ sub tex4ht_prepare($$)
my $begin_comment = "<!-- tex4ht_begin $formats{$format}->{'basename'}
$cmdname $counter -->";
print $fh "$before_comment_open$begin_comment$after_comment_open";
- if ($cmdname eq 'tex') {
+ if ($cmdname eq 'tex' or $cmdname eq 'latex') {
print $fh $text;
} elsif ($cmdname eq 'math') {
if ($format eq 'texi') {
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 6dd2e1b7f4..5f4392577f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1075,11 +1075,11 @@ but , ,
<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> <!-- MATH
- $- -a {\frac{1}{2}} @minus{}$
+ $- -a {\frac{1}{2}} -$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
- ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
+ ALT="$--a {\frac{1}{2}} -$"></SPAN>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
<code class="code">@r{--a}</code> <span class="r">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
@@ -1144,107 +1144,106 @@ After clickstyle ⇒
<!-- MATH
\begin{displaymath}
disp- -laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_2.svg"
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="sing_2.svg"
ALT="$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@strong{``simple-double- -three- - -four- - - -''} @w{aa}
-`@w{}`simple-double-@w{}-three- - -four- - - -'@w{}'@*
+\mathbf{``simple-double- -three- - -four- - - -''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three- - -four- - - -'\hbox{}'
\end{displaymath}
-->
<IMG
STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_3.svg"
- ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
-\lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
+ ALT="$\displaystyle \mathbf{\lq\lq simple-double--three---four----''}
\hbox{aa}
+\lq \hbox{}\lq simple-double-\hbox{}-three---four----'\hbox{}'
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @{ @} @/
-@today{}
+\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
- ALT="$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\vert @! @@ @{ @} @/
-@today{}
+ STYLE="height: 2.89ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
+ ALT="$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b...
+...\textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+\ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
- ALT="$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equi...
-... @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+ STYLE="height: 3.03ex; vertical-align: -0.91ex; " SRC="sing_5.svg"
+ ALT="$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\...
+...{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
- ALT="$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quo...
-...lemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_6.svg"
+ ALT="$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedbl...
+...eft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
- ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+ STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_7.svg"
+ ALT="$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$">
</DIV>
@@ -1944,11 +1943,11 @@ html ''
<code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr"
title="Étude–, Autonome">É–. ,A.</abbr>
</p>
<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
+ $- -a- {\frac{1}{2}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>
</p>
@@ -2002,45 +2001,45 @@ html ''
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_10.svg"
- ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @\lq {@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+ STYLE="height: 3.14ex; vertical-align: -0.51ex; " SRC="sing_10.svg"
+ ALT="$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \...
+...}} \textsl{\H{a}} \dot{a} \mathring{a} \textsl{\t{a}}
+\breve{a} \check{a}
+? .
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_11.svg"
- ALT="$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+ STYLE="height: 1.94ex; vertical-align: -0.12ex; " SRC="sing_11.svg"
+ ALT="$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@t{t}
+\mathtt{t}
\end{displaymath}
-->
<IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
- ALT="$\displaystyle @t{t}
+ STYLE="height: 1.51ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
+ ALT="$\displaystyle \mathtt{t}
$">
</DIV>
@@ -2287,11 +2286,11 @@ but , ,
<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> <!-- MATH
- $- -a {\frac{1}{2}} @minus{}$
+ $- -a {\frac{1}{2}} -$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
- ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
+ ALT="$--a {\frac{1}{2}} -$"></SPAN>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
<code class="code">@r{--a}</code> <span class="r">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
@@ -2356,107 +2355,106 @@ After clickstyle ⇒
<!-- MATH
\begin{displaymath}
disp- -laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_2.svg"
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="sing_2.svg"
ALT="$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@strong{``simple-double- -three- - -four- - - -''} @w{aa}
-`@w{}`simple-double-@w{}-three- - -four- - - -'@w{}'@*
+\mathbf{``simple-double- -three- - -four- - - -''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three- - -four- - - -'\hbox{}'
\end{displaymath}
-->
<IMG
STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_3.svg"
- ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
-\lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
+ ALT="$\displaystyle \mathbf{\lq\lq simple-double--three---four----''}
\hbox{aa}
+\lq \hbox{}\lq simple-double-\hbox{}-three---four----'\hbox{}'
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @{ @} @/
-@today{}
+\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
- ALT="$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\vert @! @@ @{ @} @/
-@today{}
+ STYLE="height: 2.89ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
+ ALT="$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b...
+...\textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+\ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
- ALT="$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equi...
-... @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+ STYLE="height: 3.03ex; vertical-align: -0.91ex; " SRC="sing_5.svg"
+ ALT="$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\...
+...{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
- ALT="$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quo...
-...lemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_6.svg"
+ ALT="$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedbl...
+...eft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
- ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+ STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_7.svg"
+ ALT="$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$">
</DIV>
@@ -3156,11 +3154,11 @@ html ''
<code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr"
title="Étude–, Autonome">É–. ,A.</abbr>
</p>
<p><code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
+ $- -a- {\frac{1}{2}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>
</p>
@@ -3214,45 +3212,45 @@ html ''
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_10.svg"
- ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @\lq {@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+ STYLE="height: 3.14ex; vertical-align: -0.51ex; " SRC="sing_10.svg"
+ ALT="$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \...
+...}} \textsl{\H{a}} \dot{a} \mathring{a} \textsl{\t{a}}
+\breve{a} \check{a}
+? .
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_11.svg"
- ALT="$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+ STYLE="height: 1.94ex; vertical-align: -0.12ex; " SRC="sing_11.svg"
+ ALT="$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$">
</DIV>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@t{t}
+\mathtt{t}
\end{displaymath}
-->
<IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
- ALT="$\displaystyle @t{t}
+ STYLE="height: 1.51ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
+ ALT="$\displaystyle \mathtt{t}
$">
</DIV>
@@ -3505,11 +3503,11 @@ but , ,
<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> <!-- MATH
- $- -a {\frac{1}{2}} @minus{}$
+ $- -a {\frac{1}{2}} -$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
- ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
+ ALT="$--a {\frac{1}{2}} -$"></SPAN>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
<code class="code">@r{--a}</code> <span class="r">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
@@ -3579,14 +3577,14 @@ After clickstyle ⇒
<!-- MATH
\begin{displaymath}
disp- -laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_2.svg"
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="sing_2.svg"
ALT="$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$">
</DIV>
<pre class="example-preformatted">
@@ -3594,15 +3592,15 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@strong{``simple-double- -three- - -four- - - -''} @w{aa}
-`@w{}`simple-double-@w{}-three- - -four- - - -'@w{}'@*
+\mathbf{``simple-double- -three- - -four- - - -''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three- - -four- - - -'\hbox{}'
\end{displaymath}
-->
<IMG
STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_3.svg"
- ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
-\lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
+ ALT="$\displaystyle \mathbf{\lq\lq simple-double--three---four----''}
\hbox{aa}
+\lq \hbox{}\lq simple-double-\hbox{}-three---four----'\hbox{}'
$">
</DIV>
<pre class="example-preformatted">
@@ -3610,23 +3608,22 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @{ @} @/
-@today{}
+\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
- ALT="$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\vert @! @@ @{ @} @/
-@today{}
+ STYLE="height: 2.89ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
+ ALT="$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b...
+...\textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+\ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$">
</DIV>
<pre class="example-preformatted">
@@ -3634,23 +3631,24 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
- ALT="$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equi...
-... @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+ STYLE="height: 3.03ex; vertical-align: -0.91ex; " SRC="sing_5.svg"
+ ALT="$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\...
+...{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$">
</DIV>
<pre class="example-preformatted">
@@ -3658,19 +3656,18 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
- ALT="$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quo...
-...lemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_6.svg"
+ ALT="$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedbl...
+...eft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$">
</DIV>
<pre class="example-preformatted">
@@ -3678,13 +3675,13 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
- ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+ STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_7.svg"
+ ALT="$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$">
</DIV>
<pre class="example-preformatted">
@@ -4506,11 +4503,11 @@ html ''
<code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr"
title="Étude–, Autonome">É--. ,A.</abbr>
<code class="code">@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
+ $- -a- {\frac{1}{2}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>
@@ -4568,19 +4565,19 @@ Invalid use of @':
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_10.svg"
- ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @\lq {@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+ STYLE="height: 3.14ex; vertical-align: -0.51ex; " SRC="sing_10.svg"
+ ALT="$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \...
+...}} \textsl{\H{a}} \dot{a} \mathring{a} \textsl{\t{a}}
+\breve{a} \check{a}
+? .
$">
</DIV>
<pre class="example-preformatted">
@@ -4588,13 +4585,13 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_11.svg"
- ALT="$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+ STYLE="height: 1.94ex; vertical-align: -0.12ex; " SRC="sing_11.svg"
+ ALT="$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$">
</DIV>
<pre class="example-preformatted">
@@ -4602,13 +4599,13 @@ $">
</pre><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@t{t}
+\mathtt{t}
\end{displaymath}
-->
<IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
- ALT="$\displaystyle @t{t}
+ STYLE="height: 1.51ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
+ ALT="$\displaystyle \mathtt{t}
$">
</DIV>
<pre class="example-preformatted">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
b/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
index dce9d425fd..daaff90d53 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
@@ -2,233 +2,235 @@
use utf8;
our %l2h_cache;
-$l2h_cache_key = q/$$@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+$l2h_cache_key = q//;
+$l2h_cache{$l2h_cache_key} = q|
+<P>|;
+
+$l2h_cache_key = q/$$TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_10.svg"
- ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @\lq {@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+ STYLE="height: 1.94ex; vertical-align: -0.12ex; " SRC="sing_11.svg"
+ ALT="$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$">
</DIV>
|;
-$l2h_cache_key = q/$$@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+$l2h_cache_key = q/$$\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \acute{e} \grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_11.svg"
- ALT="$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+ STYLE="height: 3.14ex; vertical-align: -0.51ex; " SRC="sing_10.svg"
+ ALT="$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \...
+...}} \textsl{\H{a}} \dot{a} \mathring{a} \textsl{\t{a}}
+\breve{a} \check{a}
+? .
$">
</DIV>
|;
-$l2h_cache_key = q/$$@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+$l2h_cache_key = q/$$\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
- ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+ STYLE="height: 2.89ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
+ ALT="$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b...
+...\textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+\ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$">
</DIV>
|;
-$l2h_cache_key = q/$$@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+$l2h_cache_key = q/$$\mathbf{``simple-double--three---four----''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\mathbf{``simple-double- -three- - -four- - - -''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three- - -four- - - -'\hbox{}'
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
- ALT="$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equi...
-... @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_3.svg"
+ ALT="$\displaystyle \mathbf{\lq\lq simple-double--three---four----''}
\hbox{aa}
+\lq \hbox{}\lq simple-double-\hbox{}-three---four----'\hbox{}'
$">
</DIV>
|;
-$l2h_cache_key = q/$$@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @} @{ @\/
-@today{}
+$l2h_cache_key = q/$$\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\| @! @@ @{ @} @/
-@today{}
+\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_4.svg"
- ALT="$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\vert @! @@ @{ @} @/
-@today{}
+ STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_7.svg"
+ ALT="$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$">
</DIV>
|;
-$l2h_cache_key = q/$$@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+$l2h_cache_key = q/$$\mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
- ALT="$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quo...
-...lemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_6.svg"
+ ALT="$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedbl...
+...eft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$">
</DIV>
|;
-$l2h_cache_key = q/$$@strong{``simple-double--three---four----''} @w{aa}
-`@w{}`simple-double-@w{}-three---four----'@w{}'@*
+$l2h_cache_key = q/$$\mathtt{t}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@strong{``simple-double- -three- - -four- - - -''} @w{aa}
-`@w{}`simple-double-@w{}-three- - -four- - - -'@w{}'@*
+\mathtt{t}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_3.svg"
- ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
-\lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
+ STYLE="height: 1.51ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
+ ALT="$\displaystyle \mathtt{t}
$">
</DIV>
|;
-$l2h_cache_key = q/$$@t{t}
-$$/;
+$l2h_cache_key = q/$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@t{t}
+\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
<IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_12.svg"
- ALT="$\displaystyle @t{t}
-$">
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
+ ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
</DIV>
-|;
+ ”|;
-$l2h_cache_key = q/$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''/;
+$l2h_cache_key = q/$$\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown{}}} \mathord{\text{\textquestiondown{}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
+$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-\partial_t \eta (t) = g(\eta(t),\varphi(t))
+\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
- ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
+ STYLE="height: 3.03ex; vertical-align: -0.91ex; " SRC="sing_5.svg"
+ ALT="$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\...
+...{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
+$">
</DIV>
- ”|;
+|;
$l2h_cache_key = q/$$disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
disp- -laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_2.svg"
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="sing_2.svg"
ALT="$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$">
</DIV>
|;
-$l2h_cache_key = q/$--a {\frac{1}{2}} @minus{}$/;
+$l2h_cache_key = q/$--a {\frac{1}{2}} -$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $- -a {\frac{1}{2}} @minus{}$
+ $- -a {\frac{1}{2}} -$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
- ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>|;
+ ALT="$--a {\frac{1}{2}} -$"></SPAN>|;
-$l2h_cache_key = q/$--a@minus{} {\frac{1}{2}}$/;
+$l2h_cache_key = q/$--a- {\frac{1}{2}}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
+ $- -a- {\frac{1}{2}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>|;
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>|;
1;
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
index e5f4324794..404a2744be 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
@@ -17,11 +17,11 @@
<!-- l2h_begin sing_l2h 1 -->
<!-- MATH
- $- -a {\frac{1}{2}} @minus{}$
+ $- -a {\frac{1}{2}} -$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img1.svg"
- ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
+ ALT="$--a {\frac{1}{2}} -$"></SPAN>
<!-- l2h_end sing_l2h 1 -->
@@ -30,14 +30,14 @@
<!-- MATH
\begin{displaymath}
disp- -laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_l2h_img2.svg"
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="sing_l2h_img2.svg"
ALT="$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$">
</DIV>
@@ -48,15 +48,15 @@ $">
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@strong{``simple-double- -three- - -four- - - -''} @w{aa}
-`@w{}`simple-double-@w{}-three- - -four- - - -'@w{}'@*
+\mathbf{``simple-double- -three- - -four- - - -''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three- - -four- - - -'\hbox{}'
\end{displaymath}
-->
<IMG
STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_l2h_img3.svg"
- ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
-\lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
+ ALT="$\displaystyle \mathbf{\lq\lq simple-double--three---four----''}
\hbox{aa}
+\lq \hbox{}\lq simple-double-\hbox{}-three---four----'\hbox{}'
$">
</DIV>
@@ -67,23 +67,22 @@ $">
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @{ @} @/
-@today{}
+\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_l2h_img4.svg"
- ALT="$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @\vert @! @@ @{ @} @/
-@today{}
+ STYLE="height: 2.89ex; vertical-align: -0.70ex; " SRC="sing_l2h_img4.svg"
+ ALT="$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b...
+...\textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+\ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$">
</DIV>
@@ -94,23 +93,24 @@ $">
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img5.svg"
- ALT="$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equi...
-... @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+ STYLE="height: 3.03ex; vertical-align: -0.91ex; " SRC="sing_l2h_img5.svg"
+ ALT="$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\...
+...{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$">
</DIV>
@@ -121,19 +121,18 @@ $">
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img6.svg"
- ALT="$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quo...
-...lemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_l2h_img6.svg"
+ ALT="$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedbl...
+...eft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$">
</DIV>
@@ -144,13 +143,13 @@ $">
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img7.svg"
- ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+ STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_l2h_img7.svg"
+ ALT="$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$">
</DIV>
@@ -174,71 +173,77 @@ $">
<!-- l2h_end sing_l2h 8 -->
<!-- l2h_begin sing_l2h 9 -->
+
+<P>
+
+<!-- l2h_end sing_l2h 9 -->
+
+<!-- l2h_begin sing_l2h 10 -->
<!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
+ $- -a- {\frac{1}{2}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img9.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>
-<!-- l2h_end sing_l2h 9 -->
+<!-- l2h_end sing_l2h 10 -->
-<!-- l2h_begin sing_l2h 10 -->
+<!-- l2h_begin sing_l2h 11 -->
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
\end{displaymath}
-->
<IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_l2h_img10.svg"
- ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @\lq {@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+ STYLE="height: 3.14ex; vertical-align: -0.51ex; " SRC="sing_l2h_img10.svg"
+ ALT="$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \...
+...}} \textsl{\H{a}} \dot{a} \mathring{a} \textsl{\t{a}}
+\breve{a} \check{a}
+? .
$">
</DIV>
-<!-- l2h_end sing_l2h 10 -->
+<!-- l2h_end sing_l2h 11 -->
-<!-- l2h_begin sing_l2h 11 -->
+<!-- l2h_begin sing_l2h 12 -->
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
\end{displaymath}
-->
<IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img11.svg"
- ALT="$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+ STYLE="height: 1.94ex; vertical-align: -0.12ex; " SRC="sing_l2h_img11.svg"
+ ALT="$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
$">
</DIV>
-<!-- l2h_end sing_l2h 11 -->
+<!-- l2h_end sing_l2h 12 -->
-<!-- l2h_begin sing_l2h 12 -->
+<!-- l2h_begin sing_l2h 13 -->
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-@t{t}
+\mathtt{t}
\end{displaymath}
-->
<IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="sing_l2h_img12.svg"
- ALT="$\displaystyle @t{t}
+ STYLE="height: 1.51ex; vertical-align: -0.12ex; " SRC="sing_l2h_img12.svg"
+ ALT="$\displaystyle \mathtt{t}
$">
</DIV>
-<!-- l2h_end sing_l2h 12 -->
+<!-- l2h_end sing_l2h 13 -->
<BR>
<HR>
</BODY>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
index e4b6fb9525..42e2939a27 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
@@ -7,7 +7,7 @@
<!-- l2h_begin sing_l2h 1 -->
\end{rawhtml}
-$--a {\frac{1}{2}} @minus{}$
+$--a {\frac{1}{2}} -$
\begin{rawhtml}
<!-- l2h_end sing_l2h 1 -->
@@ -17,7 +17,7 @@ $--a {\frac{1}{2}} @minus{}$
<!-- l2h_begin sing_l2h 2 -->
\end{rawhtml}
$$disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 2 -->
@@ -27,8 +27,8 @@ $$
<!-- l2h_begin sing_l2h 3 -->
\end{rawhtml}
-$$@strong{``simple-double--three---four----''} @w{aa}
-`@w{}`simple-double-@w{}-three---four----'@w{}'@*
+$$\mathbf{``simple-double--three---four----''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 3 -->
@@ -38,12 +38,11 @@ $$
<!-- l2h_begin sing_l2h 4 -->
\end{rawhtml}
-$$@dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @} @{ @/
-@today{}
+$$\imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 4 -->
@@ -53,13 +52,13 @@ $$
<!-- l2h_begin sing_l2h 5 -->
\end{rawhtml}
-$$@click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+$$\rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown{}}} \mathord{\text{\textquestiondown{}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 5 -->
@@ -69,10 +68,10 @@ $$
<!-- l2h_begin sing_l2h 6 -->
\end{rawhtml}
-$$@quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+$$\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 6 -->
@@ -82,7 +81,7 @@ $$
<!-- l2h_begin sing_l2h 7 -->
\end{rawhtml}
-$$@b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif} @slanted{slanted}
+$$\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 7 -->
@@ -101,7 +100,7 @@ $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
<!-- l2h_begin sing_l2h 9 -->
\end{rawhtml}
-$--a@minus{} {\frac{1}{2}}$
+
\begin{rawhtml}
<!-- l2h_end sing_l2h 9 -->
@@ -110,11 +109,7 @@ $--a@minus{} {\frac{1}{2}}$
<!-- l2h_begin sing_l2h 10 -->
\end{rawhtml}
-$$@"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
-$$
+$--a- {\frac{1}{2}}$
\begin{rawhtml}
<!-- l2h_end sing_l2h 10 -->
@@ -123,7 +118,10 @@ $$
<!-- l2h_begin sing_l2h 11 -->
\end{rawhtml}
-$$@TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{} @textdegree{}
+$$\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 11 -->
@@ -133,10 +131,20 @@ $$
<!-- l2h_begin sing_l2h 12 -->
\end{rawhtml}
-$$@t{t}
+$$TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
$$
\begin{rawhtml}
<!-- l2h_end sing_l2h 12 -->
+\end{rawhtml}
+\begin{rawhtml}
+
+<!-- l2h_begin sing_l2h 13 -->
+\end{rawhtml}
+$$\mathtt{t}
+$$
+\begin{rawhtml}
+<!-- l2h_end sing_l2h 13 -->
+
\end{rawhtml}
\end{document}
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
index df13163ad3..acc48225a4 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
@@ -118,101 +118,100 @@
% !!! IMAGES START HERE !!!
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline105}%
-$--a {\frac{1}{2}} @minus{}$%
+\lthtmlinlinemathA{tex2html_wrap_inline183}%
+$--a {\frac{1}{2}} -$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay131}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay217}%
$\displaystyle disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay133}%
-$\displaystyle @strong{``simple-double--three---four----''} @w{aa}
-`@w{}`simple-double-@w{}-three---four----'@w{}'@*
+\lthtmlinlinemathA{tex2html_wrap_indisplay219}%
+$\displaystyle \mathbf{``simple-double--three---four----''} \hbox{aa}
+`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay135}%
-$\displaystyle @dotless{i} @dotless{j}
-@l{} @,c
-@ubaraccent{a} @udotaccent{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @ @
-@- @| @! @@ @{ @} @/
-@today{}
+\lthtmlinlinemathA{tex2html_wrap_indisplay221}%
+$\displaystyle \imath{} \jmath{}
+\mathord{\text{\l{}}} \textsl{\c{c}}
+\textsl{\b{a}} \textsl{\d{a}} \textsl{\k{a}} a^{h}_{l}
+ \ {}\ {} \ {}\-{} ! @ \} \{
+\today{}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay137}%
-$\displaystyle @click{}
-@U{0075}
-@bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @print{} @result{}
-@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@ordf{} @ordm{} @comma{}
+\lthtmlinlinemathA{tex2html_wrap_indisplay223}%
+$\displaystyle \rightarrow{}
+u
+\bullet{} \copyright{} \dots{} \dots{} \equiv{}
+\fbox{error} \mapsto{} - \dashv{} \Rightarrow{}
+\mathord{\text{\AA{}}} \mathord{\text{\ae{}}} \mathord{\text{\oe{}}}
\mathord{\text{\AE{}}} \mathord{\text{\OE{}}} \mathord{\text{\o{}}}
\mathord{\text{\O{}}} \mathord{\text{\ss{}}} \mathord{\text{\l{}}}
\mathord{\text{\L{}}} \mathord{\text{\DH{}}}
+\mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}}
\mathord{\text{\textexclamdown {}}} \mathord{\text{\textquestiondown {}}}
\mathsterling{}
+\mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} ,
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay139}%
-$\displaystyle @quotedblleft{} @quotedblright{}
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @euro{} @arrow{} @leq{} @geq{}
+\lthtmlinlinemathA{tex2html_wrap_indisplay225}%
+$\displaystyle \mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedblright{}}}
+\mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}}
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}}
\mathord{\text{\guillemotleft{}}}
+\mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}}
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
+\mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay141}%
-$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @sansserif{sansserif}
@slanted{slanted}
+\lthtmlinlinemathA{tex2html_wrap_indisplay227}%
+$\displaystyle \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay143}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay229}%
$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline121}%
-$--a@minus{} {\frac{1}{2}}$%
+\lthtmlinlinemathA{tex2html_wrap_inline199}%
+$--a- {\frac{1}{2}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay146}%
-$\displaystyle @"u @"{U} @~n @^a @'e @=o @`i @'{e} @`{@=E}
-@,{@'C} @,{@'C} @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @v{a}
-@: @? @.
+\lthtmlinlinemathA{tex2html_wrap_indisplay232}%
+$\displaystyle \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i}
\acute{e} \grave{\bar{E}}
+\textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a}
\textsl{\t{a}}
+\breve{a} \check{a}
+ ? .
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay148}%
-$\displaystyle @TeX{} @LaTeX{} @point{} @aa{} @registeredsymbol{}
@textdegree{}
+\lthtmlinlinemathA{tex2html_wrap_indisplay234}%
+$\displaystyle TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay150}%
-$\displaystyle @t{t}
+\lthtmlinlinemathA{tex2html_wrap_indisplay236}%
+$\displaystyle \mathtt{t}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
index 86a4b604fc..060c6df8ab 100644
--- a/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
@@ -31,50 +31,53 @@ $l2h_cache{$l2h_cache_key} = q|
<P>
tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>|;
-$l2h_cache_key = q/$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
+$l2h_cache_key = q/$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-- - f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+- - f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="tex_7.svg"
- ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_7.svg"
+ ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
$">
</DIV>
|;
-$l2h_cache_key = q/$@code{math code} a < b$/;
+$l2h_cache_key = q/$\mathtt{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $@code{math code} a < b$
+ $\mathtt{math code} a < b$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
- ALT="$@code{math code} a < b$"></SPAN>|;
+ ALT="$\mathtt{math code} a < b$"></SPAN>|;
-$l2h_cache_key = q/$\sum_{i} f(x)@sup{2}$/;
+$l2h_cache_key = q/$\sum_{i} f(x)^{2}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $\sum_{i} f(x)@sup{2}$
+ $\sum_{i} f(x)^{2}$
-->
<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.66ex; vertical-align: -0.81ex; " SRC="tex_6.svg"
- ALT="$\sum_{i} f(x)@sup{2}$"></SPAN>|;
+ STYLE="height: 2.81ex; vertical-align: -0.81ex; " SRC="tex_6.svg"
+ ALT="$\sum_{i} f(x)^{2}$"></SPAN>|;
-$l2h_cache_key = q/$\underline{@code{math \hbox{ code }}}
\sum_{i}{\underline{@var{eff}}}$/;
+$l2h_cache_key = q/$\underline{\mathtt{math \hbox{ code }}}
\sum_{i}{\underline{\mathit{eff}}}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{@var{eff}}}$
+ $\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
- ALT="$\underline{@code{math \hbox{ code }}}
\sum_{i}{\underline{@var{eff}}}$"></SPAN>|;
+ ALT="$\underline{\mathtt{math \hbox{ code }}}
\sum_{i}{\underline{\mathit{eff}}}$"></SPAN>|;
-$l2h_cache_key = q/$a @\ b$/;
-$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
- ALT="$a @\ b$"></SPAN>|;
+$l2h_cache_key = q/$a \backslash{} b$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $a \backslash{} b$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_3.svg"
+ ALT="$a \backslash{} b$"></SPAN>|;
$l2h_cache_key = q/${x^i}\over{\tan y}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
diff --git a/tp/tests/tex_html/res_parser/tex/tex.html
b/tp/tests/tex_html/res_parser/tex/tex.html
index aa2e019770..7bcd435401 100644
--- a/tp/tests/tex_html/res_parser/tex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex/tex.html
@@ -61,36 +61,39 @@ Here some <!-- MATH
ALT="${x^i}\over{\tan y}$"></SPAN>.
</p>
<p>Maths with protected \:
+<!-- MATH
+ $a \backslash{} b$
+ -->
<SPAN CLASS="MATH"><IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
- ALT="$a @\ b$"></SPAN>.
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_3.svg"
+ ALT="$a \backslash{} b$"></SPAN>.
</p>
<p>Maths with code @-command:
</p>
<p><!-- MATH
- $@code{math code} a < b$
+ $\mathtt{math code} a < b$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
- ALT="$@code{math code} a < b$"></SPAN>
+ ALT="$\mathtt{math code} a < b$"></SPAN>
</p>
<p>Maths with code @-command and braces:
</p>
<p><!-- MATH
- $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{@var{eff}}}$
+ $\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
- ALT="$\underline{@code{math \hbox{ code }}}
\sum_{i}{\underline{@var{eff}}}$"></SPAN>
+ ALT="$\underline{\mathtt{math \hbox{ code }}}
\sum_{i}{\underline{\mathit{eff}}}$"></SPAN>
</p>
<p>Maths with @-sup
</p>
<p><!-- MATH
- $\sum_{i} f(x)@sup{2}$
+ $\sum_{i} f(x)^{2}$
-->
<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.66ex; vertical-align: -0.81ex; " SRC="tex_6.svg"
- ALT="$\sum_{i} f(x)@sup{2}$"></SPAN>
+ STYLE="height: 2.81ex; vertical-align: -0.81ex; " SRC="tex_6.svg"
+ ALT="$\sum_{i} f(x)^{2}$"></SPAN>
</p>
<p>@\ outside of math
</p>
@@ -100,13 +103,13 @@ Here some <!-- MATH
</p><DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-- - f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+- - f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="tex_7.svg"
- ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_7.svg"
+ ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
$">
</DIV>
diff --git a/tp/tests/tex_html/res_parser/tex/tex_l2h.html
b/tp/tests/tex_html/res_parser/tex/tex_l2h.html
index 245adafbe7..78722ede80 100644
--- a/tp/tests/tex_html/res_parser/tex/tex_l2h.html
+++ b/tp/tests/tex_html/res_parser/tex/tex_l2h.html
@@ -54,39 +54,42 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- l2h_end tex_l2h 3 -->
<!-- l2h_begin tex_l2h 4 -->
+<!-- MATH
+ $a \backslash{} b$
+ -->
<SPAN CLASS="MATH"><IMG
- STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_l2h_img3.svg"
- ALT="$a @\ b$"></SPAN>
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_l2h_img3.svg"
+ ALT="$a \backslash{} b$"></SPAN>
<!-- l2h_end tex_l2h 4 -->
<!-- l2h_begin tex_l2h 5 -->
<!-- MATH
- $@code{math code} a < b$
+ $\mathtt{math code} a < b$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_l2h_img4.svg"
- ALT="$@code{math code} a < b$"></SPAN>
+ ALT="$\mathtt{math code} a < b$"></SPAN>
<!-- l2h_end tex_l2h 5 -->
<!-- l2h_begin tex_l2h 6 -->
<!-- MATH
- $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{@var{eff}}}$
+ $\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$
-->
<SPAN CLASS="MATH"><IMG
STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_l2h_img5.svg"
- ALT="$\underline{@code{math \hbox{ code }}}
\sum_{i}{\underline{@var{eff}}}$"></SPAN>
+ ALT="$\underline{\mathtt{math \hbox{ code }}}
\sum_{i}{\underline{\mathit{eff}}}$"></SPAN>
<!-- l2h_end tex_l2h 6 -->
<!-- l2h_begin tex_l2h 7 -->
<!-- MATH
- $\sum_{i} f(x)@sup{2}$
+ $\sum_{i} f(x)^{2}$
-->
<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.66ex; vertical-align: -0.81ex; " SRC="tex_l2h_img6.svg"
- ALT="$\sum_{i} f(x)@sup{2}$"></SPAN>
+ STYLE="height: 2.81ex; vertical-align: -0.81ex; " SRC="tex_l2h_img6.svg"
+ ALT="$\sum_{i} f(x)^{2}$"></SPAN>
<!-- l2h_end tex_l2h 7 -->
@@ -94,13 +97,13 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
-- - f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+- - f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
\end{displaymath}
-->
<IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="tex_l2h_img7.svg"
- ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_l2h_img7.svg"
+ ALT="$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
$">
</DIV>
diff --git a/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
b/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
index ca79c8fb60..398bd16b9c 100644
--- a/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
@@ -38,7 +38,7 @@ ${x^i}\over{\tan y}$
<!-- l2h_begin tex_l2h 4 -->
\end{rawhtml}
-$a @\ b$
+$a \backslash{} b$
\begin{rawhtml}
<!-- l2h_end tex_l2h 4 -->
@@ -47,7 +47,7 @@ $a @\ b$
<!-- l2h_begin tex_l2h 5 -->
\end{rawhtml}
-$@code{math code} a < b$
+$\mathtt{math code} a < b$
\begin{rawhtml}
<!-- l2h_end tex_l2h 5 -->
@@ -56,7 +56,7 @@ $@code{math code} a < b$
<!-- l2h_begin tex_l2h 6 -->
\end{rawhtml}
-$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{@var{eff}}}$
+$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$
\begin{rawhtml}
<!-- l2h_end tex_l2h 6 -->
@@ -65,7 +65,7 @@ $\underline{@code{math \hbox{ code }}}
\sum_{i}{\underline{@var{eff}}}$
<!-- l2h_begin tex_l2h 7 -->
\end{rawhtml}
-$\sum_{i} f(x)@sup{2}$
+$\sum_{i} f(x)^{2}$
\begin{rawhtml}
<!-- l2h_end tex_l2h 7 -->
@@ -74,7 +74,7 @@ $\sum_{i} f(x)@sup{2}$
<!-- l2h_begin tex_l2h 8 -->
\end{rawhtml}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
$$
\begin{rawhtml}
<!-- l2h_end tex_l2h 8 -->
diff --git a/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
index f207e4b7eb..b20b77b26c 100644
--- a/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
@@ -118,7 +118,7 @@
% !!! IMAGES START HERE !!!
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay44}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay45}%
$\displaystyle \chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 $%
@@ -126,38 +126,38 @@ $\displaystyle \chi^2 = \sum_{i=1}^N
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline25}%
+\lthtmlinlinemathA{tex2html_wrap_inline26}%
${x^i}\over{\tan y}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline27}%
-$a @\ b$%
+\lthtmlinlinemathA{tex2html_wrap_inline28}%
+$a \backslash{} b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline29}%
-$@code{math code} a < b$%
+\lthtmlinlinemathA{tex2html_wrap_inline30}%
+$\mathtt{math code} a < b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline31}%
-$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{@var{eff}}}$%
+\lthtmlinlinemathA{tex2html_wrap_inline32}%
+$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline33}%
-$\sum_{i} f(x)@sup{2}$%
+\lthtmlinlinemathA{tex2html_wrap_inline34}%
+$\sum_{i} f(x)^{2}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay51}%
-$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
+\lthtmlinlinemathA{tex2html_wrap_indisplay52}%
+$\displaystyle -- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\right)^2}
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git
a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
index 52d657781c..2cd7147bbe 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
@@ -19,11 +19,11 @@ $">
</DIV>
|;
-$l2h_cache_key = q/From @ someone <> !
+$l2h_cache_key = q/From \ {}someone <> !
$$
a = \phi
$$/;
-$l2h_cache{$l2h_cache_key} = q|From @ someone <> !
+$l2h_cache{$l2h_cache_key} = q|From someone <> !
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
diff --git a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index 5ef8b3e327..e7e0a7f878 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -49,7 +49,7 @@ td.name-direction-about {text-align:center}
<p>Some equation is indeed needed to understand the copyright of
that file
-From @ someone <> !
+From someone <> !
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -72,7 +72,7 @@ $">
<p>Some equation is indeed needed to understand the copyright of
that file
-From @ someone <> !
+From someone <> !
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -124,7 +124,7 @@ $">
</p>
<p>Some equation is indeed needed to understand the copyright of
that file
-From @ someone <> !
+From someone <> !
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
diff --git
a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
index ce7b029b58..6f80512158 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
@@ -16,7 +16,7 @@
<BODY >
<!-- l2h_begin tex_in_copying_l2h 1 -->
-From @ someone <> !
+From someone <> !
<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
diff --git a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.tex
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.tex
index 0f21e3b80d..16c869d4f4 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.tex
@@ -7,7 +7,7 @@
<!-- l2h_begin tex_in_copying_l2h 1 -->
\end{rawhtml}
-From @ someone <> !
+From \ {}someone <> !
$$
a = \phi
$$
diff --git
a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
index 41b7bdfcd3..bb1c692ce2 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
@@ -118,14 +118,14 @@
% !!! IMAGES START HERE !!!
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay11}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay12}%
$\displaystyle a = \phi
$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay13}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay14}%
$\displaystyle 2 a = \dot{\phi}
$%
\lthtmlindisplaymathZ
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: add @latex to l2h and use CONVERT_TO_LATEX_IN_MATH,
Patrice Dumas <=