[no subject]

[Patrice Dumas]

branch: master
commit 3b9092876662822de3ea9c7b1bc34491f0cd2bad
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jul 30 16:57:56 2022 +0200

    Allow tex4ht to be called with -c 'HTML_MATH t4h' in tests
---
 tp/tests/run_parser_all.sh      | 19 ++++++++++++++-----
 tp/tests/tex_html/list-of-tests |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index e29a89ee1f..8128084c3e 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -44,12 +44,21 @@ check_latex2html_and_tex4ht ()
          fi
       fi
       l2h_flags="-c L2H_CLEAN=0 -c 'L2H_TMP $tmp_dir' -c 
L2H_FILE=$srcdir/../t/init/l2h.init"
-    elif echo "$remaining" | grep '[-]init tex4ht.pm' >/dev/null; then
-      if test "$no_tex4ht" = 'yes' ; then
-        echo "S: (no tex4ht) $current"
-        return 1
+    else
+      maybe_use_tex4ht=no
+      if echo "$remaining" | grep '[-]init tex4ht.pm' >/dev/null; then
+        maybe_use_tex4ht=yes
+      fi
+      if echo "$remaining" | grep 'HTML_MATH t4h' >/dev/null; then
+        maybe_use_tex4ht=yes
+      fi
+      if [ $maybe_use_tex4ht = 'yes' ]; then
+        if test "$no_tex4ht" = 'yes' ; then
+          echo "S: (no tex4ht) $current"
+          return 1
+        fi
+        use_tex4ht=yes
       fi
-      use_tex4ht=yes
     fi
     if test $use_tex4ht = 'yes' || test $use_latex2html = 'yes' ; then
       if echo "$remaining" | grep '[-]init mediawiki.pm' >/dev/null; then
diff --git a/tp/tests/tex_html/list-of-tests b/tp/tests/tex_html/list-of-tests
index 1223c1fe5c..4d81e75263 100644
--- a/tp/tests/tex_html/list-of-tests
+++ b/tp/tests/tex_html/list-of-tests
@@ -15,7 +15,7 @@ tex_gdef_mathjax tex_gdef.texi -c HTML_MATH=mathjax --iftex
 #tex_l2h_mediawiki tex.texi --html -c 'HTML_MATH l2h' --iftex --init 
mediawiki.pm
 tex_complex_httex tex_complex.texi --init tex4ht.pm --iftex
 tex_complex_l2h tex_complex.texi -c 'HTML_MATH l2h' --iftex
-tex_eqalign_httex tex_eqalign.texi --init tex4ht.pm --iftex
+tex_eqalign_httex tex_eqalign.texi -c 'HTML_MATH t4h' --iftex
 tex_eqalign_l2h tex_eqalign.texi -c 'HTML_MATH l2h' --iftex
 math_not_closed math_not_closed.texi -c 'HTML_MATH l2h' --iftex
 tex_not_closed tex_not_closed.texi -c 'HTML_MATH l2h' --iftex