[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Wed, 26 Oct 2022 16:13:28 -0400 (EDT) |
branch: master
commit 27fd56513731ae8c7a69aa7c31170ae2c1067160
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Oct 26 22:05:50 2022 +0200
Use \[..\] for @displaymath for LaTeX in tex4ht and latex2html
* tp/ext/latex2html.pm (l2h_process), tp/ext/tex4ht.pm
(tex4ht_prepare): use \[..\] instead of $$..$$ as it is better to
use \[ in LaTeX, $$ being a TeX primitive. Report from Vincent
Lefèvre.
---
ChangeLog | 9 ++
tp/ext/latex2html.pm | 2 +-
tp/ext/tex4ht.pm | 8 +-
.../tex_encod\303\251_utf8-l2h_cache.pm" | 20 ++---
.../encod\303\251/tex_encod\303\251_utf8_l2h.tex" | 4 +-
.../tex_encod\303\251_utf8_l2h_images.tex" | 2 +-
.../many_input_files/tex_l2h_res/tex-l2h_cache.pm | 32 ++++----
tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex | 4 +-
.../tex_l2h_res/tex_l2h_images.tex | 10 +--
.../formatting_singular/sing-l2h_cache.pm | 96 +++++++++++-----------
.../res_parser/formatting_singular/sing_l2h.tex | 36 ++++----
.../formatting_singular/sing_l2h_images.tex | 4 +-
tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm | 32 ++++----
tp/tests/tex_html/res_parser/tex/tex_l2h.tex | 4 +-
.../tex_html/res_parser/tex/tex_l2h_images.tex | 10 +--
.../tex_encode_latin1-l2h_cache.pm | 20 ++---
.../tex_encode_latin1_l2h.tex | 4 +-
.../tex_encode_latin1_l2h_images.tex | 2 +-
.../tex_encod\303\251_utf8-l2h_cache.pm" | 20 ++---
.../tex_encod\303\251_utf8_l2h.tex" | 4 +-
.../tex_encod\303\251_utf8_l2h_images.tex" | 2 +-
.../tex_eqalign_l2h/tex_eqalign-l2h_cache.pm | 8 +-
.../res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex | 4 +-
.../res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm | 30 +++----
.../res_parser/tex_gdef_l2h/tex_gdef_l2h.tex | 4 +-
.../tex_gdef_l2h/tex_gdef_l2h_images.tex | 2 +-
.../res_parser/tex_httex_latex_math/tex.html | 6 +-
.../tex_httex_latex_math/tex_tex4ht_latex.html | 6 +-
.../tex_httex_latex_math/tex_tex4ht_latex.tex | 4 +-
.../res_parser/tex_httex_tex_latex_math/tex.html | 6 +-
.../tex_httex_tex_latex_math/tex_tex4ht_latex.html | 6 +-
.../tex_httex_tex_latex_math/tex_tex4ht_latex.tex | 4 +-
.../res_parser/tex_l2h_latex/tex-l2h_cache.pm | 32 ++++----
.../tex_html/res_parser/tex_l2h_latex/tex_l2h.tex | 4 +-
.../res_parser/tex_l2h_latex/tex_l2h_images.tex | 10 +--
.../res_parser/tex_l2h_tex_latex/tex-l2h_cache.pm | 32 ++++----
.../res_parser/tex_l2h_tex_latex/tex_l2h.tex | 4 +-
.../tex_l2h_tex_latex/tex_l2h_images.tex | 10 +--
38 files changed, 256 insertions(+), 241 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6ae0bcebd9..f9ebe4d8cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-10-25 Patrice Dumas <pertusus@free.fr>
+
+ Use \[..\] for @displaymath for LaTeX in tex4ht and latex2html
+
+ * tp/ext/latex2html.pm (l2h_process), tp/ext/tex4ht.pm
+ (tex4ht_prepare): use \[..\] instead of $$..$$ as it is better to
+ use \[ in LaTeX, $$ being a TeX primitive. Report from Vincent
+ Lefèvre.
+
2022-10-25 Patrice Dumas <pertusus@free.fr>
* tp/maintain/copy_change_file_name_encoding.pl: change the character
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index 678e110dc4..27a7b14ae0 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -297,7 +297,7 @@ sub l2h_process($$)
} elsif ($command eq 'math') {
$latex_text = "\$".$latex_text."\$";
} elsif ($command eq 'displaymath') {
- $latex_text = "\$\$".$latex_text."\$\$";
+ $latex_text = "\\[".$latex_text."\\]";
}
$latex_text =~ s/(\s*)$//;
# try whether we have text already on things to do
diff --git a/tp/ext/tex4ht.pm b/tp/ext/tex4ht.pm
index cde37d602b..3deacf0cf9 100644
--- a/tp/ext/tex4ht.pm
+++ b/tp/ext/tex4ht.pm
@@ -290,7 +290,13 @@ sub tex4ht_prepare($$)
print $fh "\\IgnorePar \$" . $text . "\$";
}
} elsif ($cmdname eq 'displaymath') {
- print $fh "\n\$\$" . $text . "\$\$\n";
+ if ($format eq 'texi') {
+ print $fh "\@displaymath\n".$text."\@end displaymath\n";
+ } elsif ($format eq 'latex') {
+ print $fh "\n\\[" . $text . "\\]\n";
+ } else { # tex
+ print $fh "\n\$\$" . $text . "\$\$\n";
+ }
}
my $end_comment = "<!-- tex4ht_end $formats{$format}->{'basename'}
$cmdname $counter -->";
print $fh "$before_comment_close$end_comment$after_comment_close";
diff --git
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8-l2h_cache.pm"
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8-l2h_cache.pm"
index 0a39189a25..1324c2f1cf 100644
---
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8-l2h_cache.pm"
+++
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8-l2h_cache.pm"
@@ -19,8 +19,16 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$ é ï î \int v(t)\, dt = u(t) + C
-$$/;
+$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $(I-D) é \varphi(t)$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_encodé_utf8_2.svg"
+ ALT="$(I-D) é \varphi(t)$"></SPAN>|;
+
+$l2h_cache_key = q/\[ é ï î \int v(t)\, dt = u(t) + C
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -35,12 +43,4 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $(I-D) é \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_encodé_utf8_2.svg"
- ALT="$(I-D) é \varphi(t)$"></SPAN>|;
-
1;
diff --git
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h.tex"
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h.tex"
index a0b99e8e8c..e064ac740b 100644
---
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h.tex"
+++
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h.tex"
@@ -27,8 +27,8 @@ $(I-D) é \varphi(t)$
<!-- l2h_begin tex_encodé_utf8_l2h 3 -->
\end{rawhtml}
-$$ é ï î \int v(t)\, dt = u(t) + C
-$$
+\[ é ï î \int v(t)\, dt = u(t) + C
+\]
\begin{rawhtml}
<!-- l2h_end tex_encodé_utf8_l2h 3 -->
diff --git
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h_images.tex"
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h_images.tex"
index 1539f4c313..8d3b79be31 100644
---
"a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h_images.tex"
+++
"b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii_res/encod\303\251/tex_encod\303\251_utf8_l2h_images.tex"
@@ -125,7 +125,7 @@ $%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline8}%
+\lthtmlinlinemathA{tex2html_wrap_inline10}%
$(I-D) é \varphi(t)$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
b/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
index 060c6df8ab..7fa392284f 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
+++ b/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
@@ -31,22 +31,6 @@ $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^{-{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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
-\end{displaymath}
- -->
-
-<IMG
- 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/$\mathtt{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$\mathtt{math code} a < b$
@@ -87,4 +71,20 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
+$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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+\end{displaymath}
+ -->
+
+<IMG
+ 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>
+|;
+
1;
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
b/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
index 398bd16b9c..b4504f3d67 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
@@ -74,8 +74,8 @@ $\sum_{i} f(x)^{2}$
<!-- l2h_begin tex_l2h 8 -->
\end{rawhtml}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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/many_input_files/tex_l2h_res/tex_l2h_images.tex
b/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
index b20b77b26c..bf33889dac 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
@@ -126,31 +126,31 @@ $\displaystyle \chi^2 = \sum_{i=1}^N
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline26}%
+\lthtmlinlinemathA{tex2html_wrap_inline28}%
${x^i}\over{\tan y}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline28}%
+\lthtmlinlinemathA{tex2html_wrap_inline30}%
$a \backslash{} b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline30}%
+\lthtmlinlinemathA{tex2html_wrap_inline32}%
$\mathtt{math code} a < b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline32}%
+\lthtmlinlinemathA{tex2html_wrap_inline34}%
$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline34}%
+\lthtmlinlinemathA{tex2html_wrap_inline36}%
$\sum_{i} f(x)^{2}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
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 c96650ef04..8da9f4ea85 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,8 +2,38 @@
use utf8;
our %l2h_cache;
-$l2h_cache_key = q/$$TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
-$$/;
+$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}
+\partial_t \eta (t) = g(\eta(t),\varphi(t))
+\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))$">
+</DIV>
+ ”|;
+
+$l2h_cache_key = q/$--a {\frac{1}{2}} -$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $- -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}} -$"></SPAN>|;
+
+$l2h_cache_key = q/$--a- {\frac{1}{2}}$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $- -a- {\frac{1}{2}}$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
+ ALT="$--a- {\frac{1}{2}}$"></SPAN>|;
+
+$l2h_cache_key = q/\[TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{}
^{\circ{}}
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -18,11 +48,11 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o}
\grave{i} \acute{e} \grave{\bar{E}}
+$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}
@@ -43,12 +73,12 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\imath{} \jmath{}
+$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}
@@ -72,9 +102,9 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\mathbf{``simple-double--three---four----''} \hbox{aa}
+$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}
@@ -91,8 +121,8 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif}
\mathit{slanted}
-$$/;
+$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}
@@ -107,11 +137,11 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\mathord{\text{\textquotedblleft{}}}
\mathord{\text{\textquotedblright{}}}
+$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}
@@ -131,8 +161,8 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\mathtt{t}
-$$/;
+$l2h_cache_key = q/\[\mathtt{t}
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -147,28 +177,14 @@ $">
</DIV>
|;
-$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}
-\partial_t \eta (t) = g(\eta(t),\varphi(t))
-\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))$">
-</DIV>
- ”|;
-
-$l2h_cache_key = q/$$\rightarrow{}
+$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}
@@ -194,9 +210,9 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$disp--laymath
+$l2h_cache_key = q/\[disp--laymath
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}
@@ -213,20 +229,4 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$--a {\frac{1}{2}} -$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $- -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}} -$"></SPAN>|;
-
-$l2h_cache_key = q/$--a- {\frac{1}{2}}$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $- -a- {\frac{1}{2}}$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
- ALT="$--a- {\frac{1}{2}}$"></SPAN>|;
-
1;
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 96a47d27f5..5b150c1c47 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
@@ -16,9 +16,9 @@ $--a {\frac{1}{2}} -$
<!-- l2h_begin sing_l2h 2 -->
\end{rawhtml}
-$$disp--laymath
+\[disp--laymath
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,9 +27,9 @@ $$
<!-- l2h_begin sing_l2h 3 -->
\end{rawhtml}
-$$\mathbf{``simple-double--three---four----''} \hbox{aa}
+\[\mathbf{``simple-double--three---four----''} \hbox{aa}
`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'
-$$
+\]
\begin{rawhtml}
<!-- l2h_end sing_l2h 3 -->
@@ -38,12 +38,12 @@ $$
<!-- l2h_begin sing_l2h 4 -->
\end{rawhtml}
-$$\imath{} \jmath{}
+\[\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 -->
@@ -52,14 +52,14 @@ $$
<!-- l2h_begin sing_l2h 5 -->
\end{rawhtml}
-$$\rightarrow{}
+\[\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 -->
@@ -68,11 +68,11 @@ $$
<!-- l2h_begin sing_l2h 6 -->
\end{rawhtml}
-$$\mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}}
+\[\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 -->
@@ -81,8 +81,8 @@ $$
<!-- l2h_begin sing_l2h 7 -->
\end{rawhtml}
-$$\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
-$$
+\[\mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} \mathit{slanted}
+\]
\begin{rawhtml}
<!-- l2h_end sing_l2h 7 -->
@@ -109,11 +109,11 @@ $--a- {\frac{1}{2}}$
<!-- l2h_begin sing_l2h 10 -->
\end{rawhtml}
-$$\ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e}
\grave{\bar{E}}
+\[\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 10 -->
@@ -122,8 +122,8 @@ $$
<!-- l2h_begin sing_l2h 11 -->
\end{rawhtml}
-$$TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
-$$
+\[TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}}
+\]
\begin{rawhtml}
<!-- l2h_end sing_l2h 11 -->
@@ -132,8 +132,8 @@ $$
<!-- l2h_begin sing_l2h 12 -->
\end{rawhtml}
-$$\mathtt{t}
-$$
+\[\mathtt{t}
+\]
\begin{rawhtml}
<!-- l2h_end sing_l2h 12 -->
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 e56bfa06ad..266558fc07 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,7 +118,7 @@
% !!! IMAGES START HERE !!!
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline183}%
+\lthtmlinlinemathA{tex2html_wrap_inline201}%
$--a {\frac{1}{2}} -$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
@@ -187,7 +187,7 @@ $\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline199}%
+\lthtmlinlinemathA{tex2html_wrap_inline205}%
$--a- {\frac{1}{2}}$%
\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 060c6df8ab..7fa392284f 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,22 +31,6 @@ $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^{-{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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
-\end{displaymath}
- -->
-
-<IMG
- 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/$\mathtt{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$\mathtt{math code} a < b$
@@ -87,4 +71,20 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
+$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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+\end{displaymath}
+ -->
+
+<IMG
+ 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>
+|;
+
1;
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 398bd16b9c..b4504f3d67 100644
--- a/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
@@ -74,8 +74,8 @@ $\sum_{i} f(x)^{2}$
<!-- l2h_begin tex_l2h 8 -->
\end{rawhtml}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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 b20b77b26c..bf33889dac 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
@@ -126,31 +126,31 @@ $\displaystyle \chi^2 = \sum_{i=1}^N
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline26}%
+\lthtmlinlinemathA{tex2html_wrap_inline28}%
${x^i}\over{\tan y}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline28}%
+\lthtmlinlinemathA{tex2html_wrap_inline30}%
$a \backslash{} b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline30}%
+\lthtmlinlinemathA{tex2html_wrap_inline32}%
$\mathtt{math code} a < b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline32}%
+\lthtmlinlinemathA{tex2html_wrap_inline34}%
$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline34}%
+\lthtmlinlinemathA{tex2html_wrap_inline36}%
$\sum_{i} f(x)^{2}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1-l2h_cache.pm
index c8dae60cdb..72bae19ca2 100644
---
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1-l2h_cache.pm
+++
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1-l2h_cache.pm
@@ -19,8 +19,16 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$ é ï î \int v(t)\, dt = u(t) + C
-$$/;
+$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $(I-D) é \varphi(t)$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; "
SRC="tex_encode_latin1_2.svg"
+ ALT="$(I-D) é \varphi(t)$"></SPAN>|;
+
+$l2h_cache_key = q/\[ é ï î \int v(t)\, dt = u(t) + C
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -35,12 +43,4 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $(I-D) é \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; "
SRC="tex_encode_latin1_2.svg"
- ALT="$(I-D) é \varphi(t)$"></SPAN>|;
-
1;
diff --git
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h.tex
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h.tex
index 1e8dbf886f..afed4b8381 100644
---
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h.tex
+++
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h.tex
@@ -27,8 +27,8 @@ $(I-D) é \varphi(t)$
<!-- l2h_begin tex_encode_latin1_l2h 3 -->
\end{rawhtml}
-$$ é ï î \int v(t)\, dt = u(t) + C
-$$
+\[ é ï î \int v(t)\, dt = u(t) + C
+\]
\begin{rawhtml}
<!-- l2h_end tex_encode_latin1_l2h 3 -->
diff --git
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h_images.tex
index 1539f4c313..8d3b79be31 100644
---
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h_images.tex
+++
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1_l2h_images.tex
@@ -125,7 +125,7 @@ $%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline8}%
+\lthtmlinlinemathA{tex2html_wrap_inline10}%
$(I-D) é \varphi(t)$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8-l2h_cache.pm"
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8-l2h_cache.pm"
index 0a39189a25..1324c2f1cf 100644
---
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8-l2h_cache.pm"
+++
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8-l2h_cache.pm"
@@ -19,8 +19,16 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$ é ï î \int v(t)\, dt = u(t) + C
-$$/;
+$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $(I-D) é \varphi(t)$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_encodé_utf8_2.svg"
+ ALT="$(I-D) é \varphi(t)$"></SPAN>|;
+
+$l2h_cache_key = q/\[ é ï î \int v(t)\, dt = u(t) + C
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -35,12 +43,4 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$(I-D) é \varphi(t)$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $(I-D) é \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_encodé_utf8_2.svg"
- ALT="$(I-D) é \varphi(t)$"></SPAN>|;
-
1;
diff --git
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h.tex"
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h.tex"
index a0b99e8e8c..e064ac740b 100644
---
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h.tex"
+++
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h.tex"
@@ -27,8 +27,8 @@ $(I-D) é \varphi(t)$
<!-- l2h_begin tex_encodé_utf8_l2h 3 -->
\end{rawhtml}
-$$ é ï î \int v(t)\, dt = u(t) + C
-$$
+\[ é ï î \int v(t)\, dt = u(t) + C
+\]
\begin{rawhtml}
<!-- l2h_end tex_encodé_utf8_l2h 3 -->
diff --git
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h_images.tex"
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h_images.tex"
index 1539f4c313..8d3b79be31 100644
---
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h_images.tex"
+++
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8_l2h_images.tex"
@@ -125,7 +125,7 @@ $%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline8}%
+\lthtmlinlinemathA{tex2html_wrap_inline10}%
$(I-D) é \varphi(t)$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git
a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
index d774ed7ff8..277b416add 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
@@ -5,8 +5,7 @@ our %l2h_cache;
$l2h_cache_key = q/$$\leqalignno{
\int v(t)\, dt &= u(t) + C&[3.1]\cr
\int v(t)\, dt &= u(t) + H&[3.2]\cr
-}
-$$/;
+}$$/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
@@ -27,10 +26,11 @@ $">
</DIV>
|;
-$l2h_cache_key = q/$$\leqalignno{
+$l2h_cache_key = q/\[\leqalignno{
\int v(t)\, dt &= u(t) + C&[3.1]\cr
\int v(t)\, dt &= u(t) + H&[3.2]\cr
-}$$/;
+}
+\]/;
$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
<!-- MATH
\begin{displaymath}
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
index 8d70120033..212b17ffbf 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
@@ -7,11 +7,11 @@
<!-- l2h_begin tex_eqalign_l2h 1 -->
\end{rawhtml}
-$$\leqalignno{
+\[\leqalignno{
\int v(t)\, dt &= u(t) + C&[3.1]\cr
\int v(t)\, dt &= u(t) + H&[3.2]\cr
}
-$$
+\]
\begin{rawhtml}
<!-- l2h_end tex_eqalign_l2h 1 -->
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm
index 975c241ba3..fd65ff3e68 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm
@@ -5,21 +5,6 @@ our %l2h_cache;
$l2h_cache_key = q/ \gdef\Desig{\buildrel \rm def \over \equiv}/;
$l2h_cache{$l2h_cache_key} = q| |;
-$l2h_cache_key = q/$$ \Desig \testmacro \otest
-$$/;
-$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
-<!-- MATH
- \begin{displaymath}
-\buildrel \rm def \over \equiv a \equiv b\sqrt{64}
-\end{displaymath}
- -->
-
-<IMG
- STYLE="height: 3.32ex; vertical-align: -0.31ex; " SRC="tex_gdef_2.svg"
- ALT="$\displaystyle \buildrel \rm def \over \equiv a \equiv b\sqrt{64}$">
-</DIV>
-|;
-
$l2h_cache_key = q/$\Desig \testmacro \otest$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$
@@ -34,4 +19,19 @@ $l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"></SPAN>|;
$l2h_cache_key = q/$\gdef\testmacro{a \equiv b} $/;
$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"></SPAN>|;
+$l2h_cache_key = q/\[ \Desig \testmacro \otest
+\]/;
+$l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
+<!-- MATH
+ \begin{displaymath}
+\buildrel \rm def \over \equiv a \equiv b\sqrt{64}
+\end{displaymath}
+ -->
+
+<IMG
+ STYLE="height: 3.32ex; vertical-align: -0.31ex; " SRC="tex_gdef_2.svg"
+ ALT="$\displaystyle \buildrel \rm def \over \equiv a \equiv b\sqrt{64}$">
+</DIV>
+|;
+
1;
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.tex
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.tex
index 4f61f5c32f..6be8581d25 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.tex
@@ -43,8 +43,8 @@ $\Desig \testmacro \otest$
<!-- l2h_begin tex_gdef_l2h 5 -->
\end{rawhtml}
-$$ \Desig \testmacro \otest
-$$
+\[ \Desig \testmacro \otest
+\]
\begin{rawhtml}
<!-- l2h_end tex_gdef_l2h 5 -->
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h_images.tex
index e889d27374..1628f01306 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h_images.tex
@@ -118,7 +118,7 @@
% !!! IMAGES START HERE !!!
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline15}%
+\lthtmlinlinemathA{tex2html_wrap_inline17}%
$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
index c36635dc58..b2f25ea32c 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
@@ -89,12 +89,12 @@ class="cmr-7">2</span></sup>
</p>
<p>Displaymath
</p>
- <div class="math-display" >
+ <div class="par-math-display" >
<img
src="tex_tex4ht_latex1x.png" alt="- - f (x) =-√1--e-
12(x-σμ)2
σ 2π
-" class="math-display" ></div>
-<!--l. 24--><p class="indent" >
+" class="par-math-display" ></div>
+<!--l. 23--><p class="nopar" >
<hr>
</div>
diff --git
a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.html
b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.html
index d86be54b6d..f02d8537ec 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.html
@@ -79,12 +79,12 @@ class="cmr-7">2</span></sup>
<!-- tex4ht_begin tex_tex4ht_latex displaymath 7 -->
- <div class="math-display" >
+ <div class="par-math-display" >
<img
src="tex_tex4ht_latex1x.png" alt="- - f (x) =-√1--e-
12(x-σμ)2
σ 2π
-" class="math-display" ></div>
-<!--l. 24--><p class="indent" >
+" class="par-math-display" ></div>
+<!--l. 23--><p class="nopar" >
<!-- tex4ht_end tex_tex4ht_latex displaymath 7 -->
diff --git
a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.tex
b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.tex
index 1235ef07fc..8b0ab50553 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.tex
+++ b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex_tex4ht_latex.tex
@@ -19,7 +19,7 @@ X &=& Y
\IgnorePar $\sum_{i} f(x)^{2}$\HCode{\Hnewline <!-- tex4ht_end
tex_tex4ht_latex math 6 -->\Hnewline \Hnewline}
\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_latex displaymath 7
-->\Hnewline}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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}
+\]
\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_latex displaymath 7 -->\Hnewline
\Hnewline}
\end{document}
diff --git a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
index 8aaaa45d4a..7bcef02395 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
@@ -101,12 +101,12 @@ class="cmr-7">2</span></sup>
</p>
<p>Displaymath
</p>
- <div class="math-display" >
+ <div class="par-math-display" >
<img
src="tex_tex4ht_latex1x.png" alt="- - f (x) =-√1--e-
12(x-σμ)2
σ 2π
-" class="math-display" ></div>
-<!--l. 24--><p class="indent" >
+" class="par-math-display" ></div>
+<!--l. 23--><p class="nopar" >
<hr>
</div>
diff --git
a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.html
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.html
index d86be54b6d..f02d8537ec 100644
---
a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.html
+++
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.html
@@ -79,12 +79,12 @@ class="cmr-7">2</span></sup>
<!-- tex4ht_begin tex_tex4ht_latex displaymath 7 -->
- <div class="math-display" >
+ <div class="par-math-display" >
<img
src="tex_tex4ht_latex1x.png" alt="- - f (x) =-√1--e-
12(x-σμ)2
σ 2π
-" class="math-display" ></div>
-<!--l. 24--><p class="indent" >
+" class="par-math-display" ></div>
+<!--l. 23--><p class="nopar" >
<!-- tex4ht_end tex_tex4ht_latex displaymath 7 -->
diff --git
a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.tex
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.tex
index 1235ef07fc..8b0ab50553 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.tex
+++ b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex_tex4ht_latex.tex
@@ -19,7 +19,7 @@ X &=& Y
\IgnorePar $\sum_{i} f(x)^{2}$\HCode{\Hnewline <!-- tex4ht_end
tex_tex4ht_latex math 6 -->\Hnewline \Hnewline}
\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_latex displaymath 7
-->\Hnewline}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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}
+\]
\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_latex displaymath 7 -->\Hnewline
\Hnewline}
\end{document}
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex-l2h_cache.pm
index d633699ebb..a6c5599e97 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex-l2h_cache.pm
@@ -2,22 +2,6 @@
use utf8;
our %l2h_cache;
-$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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
-\end{displaymath}
- -->
-
-<IMG
- STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_11.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/$\mathtt{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$\mathtt{math code} a < b$
@@ -58,6 +42,22 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_6.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
+$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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+\end{displaymath}
+ -->
+
+<IMG
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_11.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/\begin{eqnarray}
\frac{\mathit{a}^b}{\xi} &=& \mathtt{\acute{e}} \\
X &=& Y
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h.tex
b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h.tex
index 1d86270c68..fb7a7f21e8 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h.tex
@@ -64,8 +64,8 @@ $\sum_{i} f(x)^{2}$
<!-- l2h_begin tex_l2h 7 -->
\end{rawhtml}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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 7 -->
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h_images.tex
index f9cdb99af4..27e50bfa0e 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex_l2h_images.tex
@@ -148,31 +148,31 @@ $\displaystyle Y$%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline30}%
+\lthtmlinlinemathA{tex2html_wrap_inline32}%
${x^i}\over{\tan y}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline32}%
+\lthtmlinlinemathA{tex2html_wrap_inline34}%
$a \backslash{} b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline34}%
+\lthtmlinlinemathA{tex2html_wrap_inline36}%
$\mathtt{math code} a < b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline36}%
+\lthtmlinlinemathA{tex2html_wrap_inline38}%
$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline38}%
+\lthtmlinlinemathA{tex2html_wrap_inline40}%
$\sum_{i} f(x)^{2}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex-l2h_cache.pm
b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex-l2h_cache.pm
index 70b6df1eef..1ee65e85da 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex-l2h_cache.pm
@@ -31,22 +31,6 @@ $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^{-{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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
-\end{displaymath}
- -->
-
-<IMG
- STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_12.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/$\mathtt{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$\mathtt{math code} a < b$
@@ -87,6 +71,22 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_7.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
+$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^{-{1 \over 2}\left({x-\mu \over
\sigma}\right)^2}
+\end{displaymath}
+ -->
+
+<IMG
+ STYLE="height: 5.44ex; vertical-align: -2.28ex; " SRC="tex_12.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/\begin{eqnarray}
\frac{\mathit{a}^b}{\xi} &=& \mathtt{\acute{e}} \\
X &=& Y
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h.tex
b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h.tex
index 111a63ff94..60e324462d 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h.tex
@@ -86,8 +86,8 @@ $\sum_{i} f(x)^{2}$
<!-- l2h_begin tex_l2h 9 -->
\end{rawhtml}
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{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 9 -->
diff --git a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h_images.tex
b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h_images.tex
index 7a8d41fb4c..c3926003d5 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex_l2h_images.tex
@@ -156,31 +156,31 @@ $\displaystyle Y$%
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline33}%
+\lthtmlinlinemathA{tex2html_wrap_inline35}%
${x^i}\over{\tan y}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline35}%
+\lthtmlinlinemathA{tex2html_wrap_inline37}%
$a \backslash{} b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline37}%
+\lthtmlinlinemathA{tex2html_wrap_inline39}%
$\mathtt{math code} a < b$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline39}%
+\lthtmlinlinemathA{tex2html_wrap_inline41}%
$\underline{\mathtt{math \hbox{ code }}} \sum_{i}{\underline{\mathit{eff}}}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline41}%
+\lthtmlinlinemathA{tex2html_wrap_inline43}%
$\sum_{i} f(x)^{2}$%
\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}