summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-23 23:00:11 +0000
committerKarl Berry <karl@freefriends.org>2021-11-23 23:00:11 +0000
commite586226bb3398254247e7894dbcad004a1ea1e58 (patch)
tree206b8b13acc0075875a9bce21301655bda90dab9 /Master/texmf-dist
parent192f4c66a71d440fb0b417aeddadc3d90b6fae38 (diff)
protect \( \), tex4ht r1014; tcolorbox \label dest, tex4ht r1013
git-svn-id: svn://tug.org/texlive/trunk@61135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex19
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/latex.4ht32
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht7
4 files changed, 45 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 1a0fda78849..61d53293b0d 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2021-11-23 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (tcolorbox.4ht): add destinations for \label to Tcolorbox
+ environments.
+ https://tex.stackexchange.com/a/623697/2891
+ * tex4ht-4ht.tex (latex.4ht): protect redefinitions of \( and \), so they
+ work correctly in sectioning commands with MathML.
+ https://github.com/michal-h21/make4ht/issues/52#issuecomment-976835368
+
2021-11-19 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): use LaTeX 3 commands in
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index b929a455825..7336248518a 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 1009 2021-11-05 17:09:29Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1014 2021-11-23 16:46:25Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -7487,8 +7487,8 @@ $$
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%55
\<latex,sty math del\><<<
- \def\({\leavevmode\st:math}
- \def\){\ed:math}
+ \protected\def\({\leavevmode\st:math}
+ \protected\def\){\ed:math}
\NewConfigure{()}[2]{\def\st:math{#1}\def\ed:math{#2}}
\def\[{\st:Math}
\def\]{\ed:Math}
@@ -7524,9 +7524,13 @@ $$
>>>
\<protect (...) math\><<<
-\pend:def\({\bgroup\let\a:mth|=\empty
- \let\b:mth|=\empty \let\c:mth|=\empty }%
-\append:def\){\egroup}%
+\let\orig:smath\(
+\let\orig:emath\)
+\protected\def\:tempa{\bgroup\let\a:mth\empty
+ \let\b:mth\empty \let\c:mth\empty\orig:smath}
+\let\(\:tempa
+\protected\def\:tempa{\orig:emath\egroup}
+\let\)\:tempa
>>>
\<protect [...] math\><<<
@@ -26728,7 +26732,7 @@ We need to use dvips driver with XeLaTeX
%%%%%%%%%%%%%%%%%%%%%%%
\<tcolorbox.4ht\><<<
% tcolorbox.4ht (|version), generated from |jobname.tex
-% Copyright 2020 TeX Users Group
+% Copyright 2020-2021 TeX Users Group
|<TeX4ht license text|>
% use custom counter that increments for every \tcolorbox
@@ -26748,6 +26752,7 @@ We need to use dvips driver with XeLaTeX
\a:tcolorbox%
% save label, if it is set
\ifdefined\tcolorbox:label:key%
+ \AnchorLabel% save cross-ref destination
\label{\tcolorbox:label:key}%
\fi%
% open title
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index e80baf2be86..fce7166a9ac 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
@@ -1,4 +1,4 @@
-% latex.4ht (2021-06-25-13:51), generated from tex4ht-4ht.tex
+% latex.4ht (2021-11-23-14:54), generated from tex4ht-4ht.tex
% Copyright 1997-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-25-13:51}
+\immediate\write-1{version 2021-11-23-14:54}
\ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
@@ -1762,8 +1762,8 @@ $\vcenter
- \def\({\leavevmode\st:math}
- \def\){\ed:math}
+ \protected\def\({\leavevmode\st:math}
+ \protected\def\){\ed:math}
\NewConfigure{()}[2]{\def\st:math{#1}\def\ed:math{#2}}
\def\[{\st:Math}
\def\]{\ed:Math}
@@ -1773,17 +1773,25 @@ $\vcenter
\ifx \a:mth\:UnDef
\expandafter\pend:defIII\csname c:$:\endcsname{%
- \ifx \a:mth\:UnDef \pend:def\({\bgroup\let\a:mth\empty
- \let\b:mth\empty \let\c:mth\empty }%
-\append:def\){\egroup}%
+ \ifx \a:mth\:UnDef \let\orig:smath\(
+\let\orig:emath\)
+\protected\def\:tempa{\bgroup\let\a:mth\empty
+ \let\b:mth\empty \let\c:mth\empty\orig:smath}
+\let\(\:tempa
+\protected\def\:tempa{\orig:emath\egroup}
+\let\)\:tempa
\fi
\def\:@tabular:{\expandafter\everymath
\expandafter{\expandafter \everymath \expandafter{\the\everymath}}}%
}
\else
- \pend:def\({\bgroup\let\a:mth\empty
- \let\b:mth\empty \let\c:mth\empty }%
-\append:def\){\egroup}%
+ \let\orig:smath\(
+\let\orig:emath\)
+\protected\def\:tempa{\bgroup\let\a:mth\empty
+ \let\b:mth\empty \let\c:mth\empty\orig:smath}
+\let\(\:tempa
+\protected\def\:tempa{\orig:emath\egroup}
+\let\)\:tempa
\def\:@tabular:{\expandafter\everymath
\expandafter{\expandafter \everymath \expandafter{\the\everymath}}}%
@@ -2290,7 +2298,7 @@ $\vcenter
\expandafter\:temp\usepackage!*?:
\def\:tempa{\@latex@e@error}
\ifx \:temp\:tempa
- % latex209.4ht (2021-06-25-13:51), generated from tex4ht-4ht.tex
+ % latex209.4ht (2021-11-23-14:54), generated from tex4ht-4ht.tex
% Copyright 1997-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -2309,7 +2317,7 @@ $\vcenter
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-25-13:51}
+\immediate\write-1{version 2021-11-23-14:54}
\let\:fnsymbol\@fnsymbol
\def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
index f539f983db1..87c43ea789a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
@@ -1,5 +1,5 @@
-% tcolorbox.4ht (2020-12-03-13:56), generated from tex4ht-4ht.tex
-% Copyright 2020 TeX Users Group
+% tcolorbox.4ht (2021-11-23-14:59), generated from tex4ht-4ht.tex
+% Copyright 2020-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-12-03-13:56}
+\immediate\write-1{version 2021-11-23-14:59}
% use custom counter that increments for every \tcolorbox
@@ -36,6 +36,7 @@
\a:tcolorbox%
% save label, if it is set
\ifdefined\tcolorbox:label:key%
+ \AnchorLabel% save cross-ref destination
\label{\tcolorbox:label:key}%
\fi%
% open title