summaryrefslogtreecommitdiff
path: root/support/TeX4ht
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-09-15 03:15:34 +0000
committerNorbert Preining <norbert@preining.info>2022-09-15 03:15:34 +0000
commit6d44c638512eb736c41551c5887b4475a14935bf (patch)
tree2f7c144e0e682047bc8ed9a411f4ca762ba1d300 /support/TeX4ht
parent9fb667bb165065e655a81b1eaf7b61f2f03825ec (diff)
CTAN sync 202209150315
Diffstat (limited to 'support/TeX4ht')
-rw-r--r--support/TeX4ht/source/ChangeLog6
-rw-r--r--support/TeX4ht/source/mktex4ht-cnf.tex3
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex24
-rw-r--r--support/TeX4ht/source/tex4ht-mathjax.tex4
4 files changed, 33 insertions, 4 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 4290ad4865..940b038095 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,9 @@
+2022-09-14 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (usepackage.4ht, luatexja-hooks.4ht): prevent
+ luatexja and luatexja-fontspec packages from loading.
+ https://tex.stackexchange.com/a/287890/2891
+
2022-08-29 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html4.tex (html4-math.4ht),
diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex
index fc72c84269..e9e10bc987 100644
--- a/support/TeX4ht/source/mktex4ht-cnf.tex
+++ b/support/TeX4ht/source/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1184 2022-08-17 11:45:35Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1193 2022-09-14 14:21:16Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -356,6 +356,7 @@
\AddFile{9}{exam}
\AddFile{9}{ctex}
\AddFile{9}{ctexart}
+\AddFile{9}{luatexja-hooks}
\AddFile{9}{polyglossia}
\AddFile{9}{gloss-french}
\AddFile{9}{fontspec}
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 729c5d9b00..4f4a5c6ba5 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1189 2022-08-25 11:20:43Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1193 2022-09-14 14:21:16Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -4412,6 +4412,28 @@ Add dummy .4ht file. We may use it in the future.
>>> \AddFile{9}{ctexart}
%%%%%%%%%%%%%%%%%
+\Section{luatexja}
+%%%%%%%%%%%%%%%%%
+
+The LuaTeX-ja package produces fatal errors with \TeX4ht, so we need to disable it.
+The same is true also for the luatexja-fontspec package.
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{luatexja.sty}{luatexja-hooks.4ht}
+\Configure{PackageHooks}{luatexja-fontspec.sty}{luatexja-hooks.4ht}
+>>>
+
+\<luatexja-hooks.4ht\><<<
+% luatexja-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+\:dontusepackage{luatexja}
+\:dontusepackage{luatexja-fontspec}
+\endinput
+>>> \AddFile{9}{luatexja-hooks}
+
+
+%%%%%%%%%%%%%%%%%
\Section{polyglossia}
%%%%%%%%%%%%%%%%%
diff --git a/support/TeX4ht/source/tex4ht-mathjax.tex b/support/TeX4ht/source/tex4ht-mathjax.tex
index 1afcb7ecbe..0600eb10c3 100644
--- a/support/TeX4ht/source/tex4ht-mathjax.tex
+++ b/support/TeX4ht/source/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1107 2022-04-04 14:44:55Z karl $
+% $Id: tex4ht-mathjax.tex 1190 2022-08-29 10:21:19Z michal_h21 $
% compile: latex tex4ht-mathjax
%
% Copyright 2018-2022 TeX Users Group
@@ -87,7 +87,7 @@ environments. They will then keep the LaTeX code unchanged.
\long\def\AltMathOne#1${\alteqtoks{\(#1\)}$}
% this seems a bit hacky -- we need to skip some code inserted at the
% beginning of each display math
-\long\def\AltlDisplayDollars\fi#1$${\alteqtoks{\[#1\]}$$}
+\long\def\AltlDisplayDollars#1$${\alteqtoks{\[#1\]}$$}
\newcommand\VerbMathToks[2]{%
\alteqtoks{\begin{#2}