summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-05 22:30:13 +0000
committerKarl Berry <karl@freefriends.org>2024-01-05 22:30:13 +0000
commita5d4e5810f9f8f87069f691f6e934e144ce654d2 (patch)
tree39d7fb2dabb413db2ffd278c0b4b859d3bafa835
parentf064b882fefee1809d3b20723ab4ae69c2a52e8b (diff)
require amsmath, allow multiple amsmath uses, tex4ht r1433
git-svn-id: svn://tug.org/texlive/trunk@69312 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog7
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex11
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht11
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht6
4 files changed, 22 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index af7cdeaa0d7..24993d32133 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,10 @@
+2024-01-05 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (unicode-math-hooks.4ht): require Amsmath from
+ Unicode-math. Declare commands to prevent errors in multiple uses of
+ Unicode-math.
+ https://fosstodon.org/@alerque@mastodon.social/111701555810243494
+
2024-01-04 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (changepage.4ht): fixed setting of empty margins.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index de73e208c4f..523c7c93640 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,7 +1,7 @@
-% $Id: tex4ht-4ht.tex 1432 2024-01-04 21:04:24Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1434 2024-01-05 22:29:16Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
% Copyright 1996-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -4364,14 +4364,15 @@ document.
\<unicode-math-hooks.4ht\><<<
% unicode-math-hooks.4ht (|version), generated from |jobname.tex
-% Copyright 2021-2022 TeX Users Group
+% Copyright 2021-2024 TeX Users Group
|<TeX4ht license text|>
\:dontusepackage{unicode-math}
\TivhTcats% we need to reset catcodes for : and @ before \RequirePackage
\@ifpackageloaded{fontspec}{}
{\RequirePackage{fontspec}} % it is loaded by unicode-math
-\NewDocumentCommand \setmathfont { O{} m O{} }{}
-\NewDocumentCommand \unimathsetup {m} {}
+\RequirePackage{amsmath}
+\DeclareDocumentCommand \setmathfont { O{} m O{} }{}
+\DeclareDocumentCommand \unimathsetup {m} {}
\catcode`\:=11\makeatletter
\endinput
>>> \AddFile{9}{unicode-math-hooks}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
index fcf66160e44..d87e031eadb 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
@@ -1,5 +1,5 @@
-% unicode-math-hooks.4ht (2022-09-16-14:11), generated from tex4ht-4ht.tex
-% Copyright 2021-2022 TeX Users Group
+% unicode-math-hooks.4ht (2024-01-05-14:29), generated from tex4ht-4ht.tex
+% Copyright 2021-2024 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,14 +16,15 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-09-16-14:11}
+\immediate\write-1{version 2024-01-05-14:29}
\:dontusepackage{unicode-math}
\TivhTcats% we need to reset catcodes for : and @ before \RequirePackage
\@ifpackageloaded{fontspec}{}
{\RequirePackage{fontspec}} % it is loaded by unicode-math
-\NewDocumentCommand \setmathfont { O{} m O{} }{}
-\NewDocumentCommand \unimathsetup {m} {}
+\RequirePackage{amsmath}
+\DeclareDocumentCommand \setmathfont { O{} m O{} }{}
+\DeclareDocumentCommand \unimathsetup {m} {}
\catcode`\:=11\makeatletter
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 4a8cd383d41..a42fe990ac2 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,6 +1,6 @@
-% usepackage.4ht (2023-11-10-14:22), generated from tex4ht-4ht.tex
+% usepackage.4ht (2024-01-05-14:29), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-11-10-14:22}
+\immediate\write-1{version 2024-01-05-14:29}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}