summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-12-26 21:08:33 +0000
committerKarl Berry <karl@freefriends.org>2022-12-26 21:08:33 +0000
commit56b77016f53109f00f4ec059b2f64e38ed1f7fba (patch)
tree9e52259a34e44f5bad027c2d9e7c67d48c04fa4c /Master/texmf-dist
parentb5c58f1b712acb8b4aa97b6c9b6aef1e17ea601d (diff)
begin/end as robust, tex4ht r1277; mdframed to picture error, tex4ht r1278
git-svn-id: svn://tug.org/texlive/trunk@65368 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog11
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/latex.4ht12
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht8
4 files changed, 30 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index b7ad95ba12b..d951439fd67 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,14 @@
+2022-12-26 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (mdframed.4ht): prevent compilation error when we
+ convert mdframed environment to picture and amsthm package is
+ loaded.
+ https://tex.stackexchange.com/a/669526/2891
+
+ * tex4ht-4ht.tex (latex.4ht): declared \begin and \end as robust
+ commands.
+ https://tex.stackexchange.com/a/669675/2891
+
2022-12-24 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (mdframed.4ht): fixed support for Mdframed used
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 2e301d2010a..d57d1e294c0 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 1276 2022-12-24 12:44:15Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1278 2022-12-26 19:24:35Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -6953,7 +6953,7 @@ and the command \`'\end{xxx}' referes to the meaning of \`'\endxxx'.
\pend:defI\begin{\let\chk:pic|=\EndPicture }
\let\o:begin:|=\begin
\let\choose:begin\@firstoftwo
-\def\begin#1{\csname @begin:#1\endcsname
+\DeclareRobustCommand\begin[1]{\csname @begin:#1\endcsname
\choose:begin
{\let\choose:begin\@firstoftwo |<revised begin|>}%
{\o:begin:{#1}}}
@@ -7029,7 +7029,7 @@ are initiated within \''\begin{...}'. For instance, in eqnarray there
\<latex ltmiscen\><<<
\let\o:end:|=\end
-\def\end#1{\choose:begin
+\DeclareRobustCommand\end[1]{\choose:begin
{|<revised end|>}%
{\o:end:{#1}}}
>>>
@@ -28019,6 +28019,10 @@ We need to use dvips driver with XeLaTeX
\append:def\mdf@@ignorelastdescenders{\let\orig:unskip\unskip\def\unskip{\let\unskip\orig:unskip}}%
\HLet\mdf@lrbox\:gobble
\HLet\endmdf@lrbox\relax
+% disable compilation error caused by Mdframed's patch for Amsthm:
+\AtBeginDocument{%
+ \let\mdf@patchamsthm\relax%
+}
\Hinput{mdframed}
\endinput
>>> \AddFile{9}{mdframed}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index 6c61af9d9c4..2caf4fd028c 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 (2022-10-17-13:57), generated from tex4ht-4ht.tex
+% latex.4ht (2022-12-26-13:00), generated from tex4ht-4ht.tex
% Copyright 1997-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-10-17-13:57}
+\immediate\write-1{version 2022-12-26-13:00}
\ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
@@ -592,7 +592,7 @@
\pend:defI\begin{\let\chk:pic\EndPicture }
\let\o:begin:\begin
\let\choose:begin\@firstoftwo
-\def\begin#1{\csname @begin:#1\endcsname
+\DeclareRobustCommand\begin[1]{\csname @begin:#1\endcsname
\choose:begin
{\let\choose:begin\@firstoftwo \ifx \EndPicture\:Undef
\PushStack\envn:list\n:list \SaveEverypar
@@ -640,7 +640,7 @@
\expandafter\ifx\csname @begin:#1\endcsname\relax\fi
\expandafter\concat:config\csname @begin:#1\endcsname{#2}}
\let\o:end:\end
-\def\end#1{\choose:begin
+\DeclareRobustCommand\end[1]{\choose:begin
{%\IgnoreIndent
\ifvmode \ifx \EndPicture\:UnDef
\def\:temp{\def\:temp{%
@@ -2323,7 +2323,7 @@ $\vcenter
\expandafter\:temp\usepackage!*?:
\def\:tempa{\@latex@e@error}
\ifx \:temp\:tempa
- % latex209.4ht (2022-10-17-13:57), generated from tex4ht-4ht.tex
+ % latex209.4ht (2022-12-26-13:00), generated from tex4ht-4ht.tex
% Copyright 1997-2009 Eitan M. Gurari
% Copyright 2009-2022 TeX Users Group
%
@@ -2342,7 +2342,7 @@ $\vcenter
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-10-17-13:57}
+\immediate\write-1{version 2022-12-26-13:00}
\let\:fnsymbol\@fnsymbol
\def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht b/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
index f79b094f600..3b2e4fd77b1 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
@@ -1,4 +1,4 @@
-% mdframed.4ht (2022-12-24-12:36), generated from tex4ht-4ht.tex
+% mdframed.4ht (2022-12-26-13:00), generated from tex4ht-4ht.tex
% Copyright 2017-2022 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-12-24-12:36}
+\immediate\write-1{version 2022-12-26-13:00}
\NewConfigure{mdframed}{2}
@@ -38,6 +38,10 @@
\append:def\mdf@@ignorelastdescenders{\let\orig:unskip\unskip\def\unskip{\let\unskip\orig:unskip}}%
\HLet\mdf@lrbox\:gobble
\HLet\endmdf@lrbox\relax
+% disable compilation error caused by Mdframed's patch for Amsthm:
+\AtBeginDocument{%
+ \let\mdf@patchamsthm\relax%
+}
\Hinput{mdframed}
\endinput