branch master updated: Add test with TeX/LaTeX macros with MathJax and enhance test

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 528f2d0  Add test with TeX/LaTeX macros with MathJax and enhance test
528f2d0 is described below

commit 528f2d0e5749ad53979d092a61803b6666a62059
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 17 21:14:48 2021 +0200

    Add test with TeX/LaTeX macros with MathJax and enhance test
---
 tp/tests/test_scripts/tex_html_tex_gdef_mathjax.sh | 25 +++++++++++++++++++
 tp/tests/tex_html/list-of-tests                    |  1 +
 .../res_parser/tex_gdef_httex/tex_gdef.html        |  2 ++
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex |  2 +-
 .../tex_gdef_httex/tex_gdef_tex4ht_math.tex        |  6 ++++-
 .../res_parser/tex_gdef_l2h/tex_gdef-l2h_cache.pm  | 22 ++++++++++-------
 .../tex_html/res_parser/tex_gdef_l2h/tex_gdef.html | 16 ++++++++-----
 .../res_parser/tex_gdef_l2h/tex_gdef_l2h.html      | 28 +++++++++++++++-------
 .../res_parser/tex_gdef_l2h/tex_gdef_l2h.tex       | 24 ++++++++++++++++---
 .../tex_gdef_l2h/tex_gdef_l2h_images.tex           |  8 +++----
 .../res_parser/tex_gdef_mathjax/tex_gdef.html      |  8 +++++--
 tp/tests/tex_html/tex_gdef.texi                    | 11 +++++++--
 12 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/tp/tests/test_scripts/tex_html_tex_gdef_mathjax.sh 
b/tp/tests/test_scripts/tex_html_tex_gdef_mathjax.sh
new file mode 100755
index 0000000..35bc729
--- /dev/null
+++ b/tp/tests/test_scripts/tex_html_tex_gdef_mathjax.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+# This file generated by maintain/regenerate_cmd_tests.sh
+
+if test z"$srcdir" = "z"; then
+  srcdir=.
+fi
+
+one_test_logs_dir=test_log
+
+
+
+if test "z$TEX_HTML_TESTS" != z"yes"; then
+  echo "Skipping HTML TeX tests that are not easily reproducible"
+  exit 77
+fi
+
+dir=tex_html
+name='tex_gdef_mathjax'
+mkdir -p $dir
+
+"$srcdir"/run_parser_all.sh -dir $dir $name
+exit_status=$?
+cat $dir/$one_test_logs_dir/$name.log
+exit $exit_status
+
diff --git a/tp/tests/tex_html/list-of-tests b/tp/tests/tex_html/list-of-tests
index 8818609..694fc09 100644
--- a/tp/tests/tex_html/list-of-tests
+++ b/tp/tests/tex_html/list-of-tests
@@ -8,6 +8,7 @@ tex_accents_httex tex_accents.texi --init tex4ht.pm --iftex
 tex_accents_l2h tex_accents.texi -c 'L2H 1' --iftex
 tex_gdef_httex tex_gdef.texi --init tex4ht.pm --iftex
 tex_gdef_l2h tex_gdef.texi -c 'L2H 1' --iftex
+tex_gdef_mathjax tex_gdef.texi -c HTML_MATH=mathjax --iftex
 # No mediawki tests for now
 #tex_mediawiki tex.texi --init mediawiki.pm --iftex
 #tex_httex_mediawiki tex.texi --html --init tex4ht.pm --init mediawiki.pm 
--iftex
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
index fc54fe6..738d387 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
@@ -47,6 +47,8 @@ ul.no-bullet {list-style: none}
 
 
 
+
+
 <hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex
index 6ced5f8..819ceea 100644
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex
+++ 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex
@@ -2,7 +2,7 @@
 \csname tex4ht\endcsname
 \HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_displaymath 
displaymath 1 -->\Hnewline}
 
-$$ \Desig
+$$ \Desig \testmacro \otest
 $$
 \HCode{\Hnewline <!-- tex4ht_end tex_gdef_tex4ht_displaymath displaymath 1 
-->\Hnewline \Hnewline}
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex
index a8d01f3..8a16795 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex
@@ -1,6 +1,10 @@
 % Automatically generated
 \csname tex4ht\endcsname
 \HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar $\Desig$\HCode{\Hnewline <!-- tex4ht_end tex_gdef_tex4ht_math math 
1 -->\Hnewline \Hnewline}
+\IgnorePar $\def\otest{\sqrt{64}} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 1 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 2 
-->\Hnewline}
+\IgnorePar $\gdef\testmacro{a \equiv b} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 3 
-->\Hnewline}
+\IgnorePar $\Desig \testmacro \otest$\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 3 -->\Hnewline \Hnewline}
 
 \bye
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 7985abd..fdbee0d 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
@@ -2,27 +2,33 @@
 $l2h_cache_key = q/  \gdef\Desig{\buildrel \rm def \over \equiv}/;
 $l2h_cache{$l2h_cache_key} = q|  |;
 
-$l2h_cache_key = q/$$ \Desig
+$l2h_cache_key = q/$$ \Desig \testmacro \otest
 $$/;
 $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
-\buildrel \rm def \over \equiv
+\buildrel \rm def \over \equiv a \equiv b\sqrt{64}
 \end{displaymath}
  -->
 
 <IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_2.svg"
- ALT="$\displaystyle \buildrel \rm def \over \equiv
+ 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$/;
+$l2h_cache_key = q/$\Desig \testmacro \otest$/;
 $l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $\buildrel \rm def \over \equiv$
+ $\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_1.svg"
- ALT="$\buildrel \rm def \over \equiv $"></SPAN>|;
+ STYLE="height: 3.43ex; vertical-align: -0.42ex; " SRC="tex_gdef_1.svg"
+ ALT="$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$"></SPAN>|;
+
+$l2h_cache_key = q/$\def\otest{\sqrt{64}} $/;
+$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>|;
 1;
\ No newline at end of file
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
index edf912d..8abf5ce 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
@@ -41,23 +41,27 @@ ul.no-bullet {list-style: none}
 
   
 
+<p><SPAN CLASS="MATH"></SPAN>
+</p>
+<p><SPAN CLASS="MATH"></SPAN>
+</p>
 <p><!-- MATH
- $\buildrel \rm def \over \equiv$
+ $\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_1.svg"
- ALT="$\buildrel \rm def \over \equiv $"></SPAN>
+ STYLE="height: 3.43ex; vertical-align: -0.42ex; " SRC="tex_gdef_1.svg"
+ ALT="$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$"></SPAN>
 </p>
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
-\buildrel \rm def \over \equiv
+\buildrel \rm def \over \equiv a \equiv b\sqrt{64}
 \end{displaymath}
  -->
 
 <IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_2.svg"
- ALT="$\displaystyle \buildrel \rm def \over \equiv
+ 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>
 
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.html 
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.html
index 24601a7..59b1512 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef_l2h.html
@@ -25,31 +25,41 @@
 <!-- l2h_end tex_gdef_l2h 1 -->
 
 <!-- l2h_begin tex_gdef_l2h 2 -->
+<SPAN CLASS="MATH"></SPAN>
+
+<!-- l2h_end tex_gdef_l2h 2 -->
+
+<!-- l2h_begin tex_gdef_l2h 3 -->
+<SPAN CLASS="MATH"></SPAN>
+
+<!-- l2h_end tex_gdef_l2h 3 -->
+
+<!-- l2h_begin tex_gdef_l2h 4 -->
 <!-- MATH
- $\buildrel \rm def \over \equiv$
+ $\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_l2h_img1.svg"
- ALT="$\buildrel \rm def \over \equiv $"></SPAN>
+ STYLE="height: 3.43ex; vertical-align: -0.42ex; " SRC="tex_gdef_l2h_img1.svg"
+ ALT="$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$"></SPAN>
 
-<!-- l2h_end tex_gdef_l2h 2 -->
+<!-- l2h_end tex_gdef_l2h 4 -->
 
-<!-- l2h_begin tex_gdef_l2h 3 -->
+<!-- l2h_begin tex_gdef_l2h 5 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
-\buildrel \rm def \over \equiv
+\buildrel \rm def \over \equiv a \equiv b\sqrt{64}
 \end{displaymath}
  -->
 
 <IMG
- STYLE="height: 3.12ex; vertical-align: -0.12ex; " SRC="tex_gdef_l2h_img2.svg"
- ALT="$\displaystyle \buildrel \rm def \over \equiv
+ STYLE="height: 3.32ex; vertical-align: -0.31ex; " SRC="tex_gdef_l2h_img2.svg"
+ ALT="$\displaystyle \buildrel \rm def \over \equiv a \equiv b\sqrt{64}
 $">
 </DIV>
 
 
-<!-- l2h_end tex_gdef_l2h 3 -->
+<!-- l2h_end tex_gdef_l2h 5 -->
 <BR>
 <HR>
 </BODY>
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 0047891..8e1f858 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
@@ -16,7 +16,7 @@
 
 <!-- l2h_begin tex_gdef_l2h 2 -->
 \end{rawhtml}
-$\Desig$
+$\def\otest{\sqrt{64}} $
 \begin{rawhtml}
 <!-- l2h_end tex_gdef_l2h 2 -->
 
@@ -25,10 +25,28 @@ $\Desig$
 
 <!-- l2h_begin tex_gdef_l2h 3 -->
 \end{rawhtml}
-$$ \Desig
-$$
+$\gdef\testmacro{a \equiv b} $
 \begin{rawhtml}
 <!-- l2h_end tex_gdef_l2h 3 -->
 
 \end{rawhtml}
+\begin{rawhtml}
+
+<!-- l2h_begin tex_gdef_l2h 4 -->
+\end{rawhtml}
+$\Desig \testmacro \otest$
+\begin{rawhtml}
+<!-- l2h_end tex_gdef_l2h 4 -->
+
+\end{rawhtml}
+\begin{rawhtml}
+
+<!-- l2h_begin tex_gdef_l2h 5 -->
+\end{rawhtml}
+$$ \Desig \testmacro \otest
+$$
+\begin{rawhtml}
+<!-- l2h_end tex_gdef_l2h 5 -->
+
+\end{rawhtml}
 \end{document}
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 726f1c9..a18fda0 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,14 +118,14 @@
 % !!! IMAGES START HERE !!!
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline6}%
-$\buildrel \rm def \over \equiv $%
+\lthtmlinlinemathA{tex2html_wrap_inline15}%
+$\buildrel \rm def \over \equiv a \equiv b\sqrt{64}$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay16}%
-$\displaystyle \buildrel \rm def \over \equiv 
+\lthtmlinlinemathA{tex2html_wrap_indisplay27}%
+$\displaystyle \buildrel \rm def \over \equiv a \equiv b\sqrt{64}
 $%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
index 00ef774..08136ea 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
@@ -51,9 +51,13 @@ MathJax = {
 
   \gdef\Desig{\buildrel \rm def \over \equiv}
 
-<p><em class='tex2jax_process'>\(\Desig\)</em>
+<p><em class='tex2jax_process'>\(\def\otest{\sqrt{64}} \)</em>
 </p>
-<div class="displaymath"><em class="tex2jax_process">\[ \Desig
+<p><em class='tex2jax_process'>\(\gdef\testmacro{a \equiv b} \)</em>
+</p>
+<p><em class='tex2jax_process'>\(\Desig \testmacro \otest\)</em>
+</p>
+<div class="displaymath"><em class="tex2jax_process">\[ \Desig \testmacro 
\otest
 \]</em></div>
 <hr></div>
 <p><font size="-1">
diff --git a/tp/tests/tex_html/tex_gdef.texi b/tp/tests/tex_html/tex_gdef.texi
index 2f41d5a..9a31367 100644
--- a/tp/tests/tex_html/tex_gdef.texi
+++ b/tp/tests/tex_html/tex_gdef.texi
@@ -7,10 +7,17 @@
   \gdef\Desig{\buildrel \rm def \over \equiv}
 @end tex
 
-@math{\Desig}
+@c MathJax process LaTeX commands in math environments
+@c trailing space is needed for latex2html
+@math{\def\otest{\sqrt{64}} }
+
+@c MathJax doesn't get \gdef
+@math{\gdef\testmacro{a \equiv b} }
+
+@math{\Desig \testmacro \otest}
 
 @displaymath
- \Desig
+ \Desig \testmacro \otest
 @end displaymath
 
 @bye