summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-09-14 20:38:43 +0000
committerKarl Berry <karl@freefriends.org>2022-09-14 20:38:43 +0000
commit52dc9bcf5fe84e8106039130f5176955ebc1c796 (patch)
tree39c3754cb0fc402873402f8b42b6aa147089d951
parent3a713bb64ca48f58c12e5a9cdabd1b6a3669bd94 (diff)
do not load luatexja or luatexja-fontspec
git-svn-id: svn://tug.org/texlive/trunk@64394 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex3
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex24
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht6
5 files changed, 37 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 4290ad48654..940b0380953 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index fc72c842699..e9e10bc9877 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 729c5d9b00b..4f4a5c6ba5a 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
index 1afcb7ecbe1..0600eb10c38 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 875049a4296..b6086edf938 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2022-08-21-00:00), generated from tex4ht-4ht.tex
+% usepackage.4ht (2022-09-14-13:33), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2022 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-08-21-00:00}
+\immediate\write-1{version 2022-09-14-13:33}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -59,6 +59,8 @@
\Configure{PackageHooks}{unicode-math.sty}{unicode-math-hooks.4ht}
\Configure{PackageHooks}{ctex.sty}{ctex-hooks.4ht}
\AddToHook{class/ctexart/before}{\input{ctexart-hooks.4ht}}
+\Configure{PackageHooks}{luatexja.sty}{luatexja-hooks.4ht}
+\Configure{PackageHooks}{luatexja-fontspec.sty}{luatexja-hooks.4ht}
\Configure{PackageHooks}{polyglossia.sty}{polyglossia-hooks.4ht}
\Configure{PackageHooks}{fontspec.sty}{fontspec-hooks.4ht}
\Configure{PackageHooks}{tikz.sty}{tikz-hooks.4ht}