summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-21 19:59:22 +0000
committerKarl Berry <karl@freefriends.org>2022-08-21 19:59:22 +0000
commit231590ac054d62d9ae566b9602bae29ec52bc062 (patch)
tree3f2e8ec717144ae30b8eeb686a2dfcc6803c0e14 /Master/texmf-dist
parent4b10a311aa024ed685e4543a5213e6a6c349fa38 (diff)
usepackage, mathml source sync
git-svn-id: svn://tug.org/texlive/trunk@64160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/Makefile2
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex2
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex19
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht17
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht5
5 files changed, 32 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile
index 825444558f8..4c80ac5662c 100644
--- a/Master/texmf-dist/source/generic/tex4ht/Makefile
+++ b/Master/texmf-dist/source/generic/tex4ht/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1173 2022-07-07 13:29:07Z michal_h21 $
+# $Id: Makefile 1186 2022-08-17 21:26:24Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 07e8f85b210..c5db34f7880 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 1184 2022-08-17 11:45:35Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1186 2022-08-17 21:26:24Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
index f16d7c5f960..b2e07b052e6 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathml.tex 1180 2022-07-26 08:09:24Z michal_h21 $$
+% $Id: tex4ht-mathml.tex 1183 2022-08-17 10:03:42Z michal_h21 $$
% compile 3 times: latex tex4ht-mathltx
% or xhlatex tex4ht-mathltx "html,3,sections+"
%
@@ -102,6 +102,7 @@
\<amsmath html-mml pre 2000\><<<
+% pre 2000
\Configure{equation}
{\ifvmode \IgnorePar\fi \EndP
\HCode{<table class="equation"><tr><td>}%
@@ -123,6 +124,7 @@
\<amsmath html-mml jan 2000\><<<
+% jan 2000
\Configure{equation}
{\ifvmode \IgnorePar\fi \EndP
\HCode{<table class="equation"><tr><td>}%
@@ -148,11 +150,14 @@
\<amsmath html-mml july 2000\><<<
+% and here it should be
+|<alt mathopen for eq|>
\Configure{equation}
{\ifvmode \IgnorePar\fi\EndP
\HCode{<table class="equation"><tr><td>}%
|<amsmath equation july 2000|>%
|<math display in equation|>%
+ |<mathopen in equation|>
}
{\ifvmode \IgnorePar\fi\EndP
\HCode{</td><td class="eq-no">}%
@@ -176,11 +181,23 @@
+
\<amsmath equation jan 2000\><<<
|<amsmath equation july 2000|>%
>>>
+Current AMSMath uses empty mathopen at the beginning of an equation,
+which results in missing markup for subsequent numbers and characters.
+
+We check for empty parameter, and don't execute configurations when it is empty.
+\<alt mathopen for eq\><<<
+\def\eq:mathopen#1{\ifx\relax#1\relax\else\a:mathopen\fi\o:mathopen:{#1}}
+>>>
+
+\<mathopen in equation\><<<
+\let\mathopen\eq:mathopen%
+>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 95b07a721e2..0089ab14797 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,4 +1,4 @@
-% mathml.4ht (2022-07-26-13:09), generated from tex4ht-mathml.tex
+% mathml.4ht (2022-08-17-14:11), generated from tex4ht-mathml.tex
% Copyright 2009-2022 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-07-26-13:09}
+\immediate\write-1{version 2022-08-17-14:11}
\exit:ifnot{Preamble,%
accents,%
@@ -2354,7 +2354,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3188,7 +3187,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsopn}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3256,6 +3254,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{array}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3334,8 +3333,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amscd}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3432,6 +3429,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amssymb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3719,6 +3717,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3756,6 +3755,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{dcolumn}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3964,6 +3965,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{accents}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4136,7 +4139,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ulem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4167,7 +4169,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{cancel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index c97ffdbe462..875049a4296 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-07-07-14:08), generated from tex4ht-4ht.tex
+% usepackage.4ht (2022-08-21-00:00), 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-07-07-14:08}
+\immediate\write-1{version 2022-08-21-00:00}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -68,6 +68,7 @@
\Configure{PackageHooks}{hyperref.sty}{hyperref-hooks.4ht}
\Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht}
\Configure{PackageHooks}{caption.sty}{caption-hooks.4ht}
+\Configure{PackageHooks}{babel.sty}{babel-sty-hooks.4ht}
\Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht}
\Configure{PackageHooks}{graphics.sty}{graphics-hooks.4ht}
\Configure{PackageHooks}{graphbox.sty}{graphbox-hooks.4ht}