texlive[69312] Master/texmf-dist: require amsmath, allow multiple

[commits+karl at tug.org]

Revision: 69312
          https://tug.org/svn/texlive?view=revision&revision=69312
Author:   karl
Date:     2024-01-05 23:30:13 +0100 (Fri, 05 Jan 2024)
Log Message:
-----------
require amsmath, allow multiple amsmath uses, tex4ht r1433

Revision Links:
--------------
    https://tug.org/svn/texlive?view=revision&revision=1433

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-01-05 22:10:51 UTC (rev 69311)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-01-05 22:30:13 UTC (rev 69312)
@@ -1,3 +1,10 @@
+2024-01-05  Michal Hoftich  <michal.h21 at 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 at gmail.com>
 
 	* tex4ht-4ht.tex (changepage.4ht): fixed setting of empty margins.

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-01-05 22:10:51 UTC (rev 69311)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-01-05 22:30:13 UTC (rev 69312)
@@ -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 @@
 
 \<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}

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht	2024-01-05 22:10:51 UTC (rev 69311)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht	2024-01-05 22:30:13 UTC (rev 69312)
@@ -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
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2024-01-05 22:10:51 UTC (rev 69311)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2024-01-05 22:30:13 UTC (rev 69312)
@@ -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?}