From 5508320ba1a6332a67f2e5d2840c6eba080715b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Sep 2011 23:26:19 +0000 Subject: mdframed 0.9b (7sep11) git-svn-id: svn://tug.org/texlive/trunk@23855 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 10 ++-- .../texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 8 ++-- .../texmf-dist/tex/latex/mdframed/md-frame-3.mdf | 8 ++-- Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 55 +++++++++++++++++----- 4 files changed, 55 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf index b01992e0138..e083a8abce1 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf @@ -8,14 +8,14 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. -%%$Id: md-frame-0.mdf 172 2011-09-04 16:13:47Z marco $ -%%$Rev: 172 $ +%%$Id: md-frame-0.mdf 188 2011-09-07 10:32:16Z marco $ +%%$Rev: 188 $ %%$Author: marco $ -%%$Date: 2011-09-04 18:13:47 +0200 (So, 04. Sep 2011) $ - +%%$Date: 2011-09-07 12:32:16 +0200 (Mi, 07. Sep 2011) $ \def\mdframedOpackagename{md-frame-0} \def\md@frameOdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } -\ProvidesFile{md-frame-0.mdf}[\md@frameOdate@svn$Id: md-frame-0.mdf 172 2011-09-04 16:13:47Z marco $ \mdversion: \mdframedOpackagename] +\ProvidesFile{md-frame-0.mdf}[\md@frameOdate@svn$Id: md-frame-0.mdf 188 2011-09-07 10:32:16Z marco $ \mdversion: \mdframedOpackagename] + %%==================================================%% %%================single-box========================%% %%==================================================%% diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf index 572f50c8582..7d397b2b5f6 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf @@ -8,14 +8,14 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. -%%$Id: md-frame-1.mdf 172 2011-09-04 16:13:47Z marco $ -%%$Rev: 172 $ +%%$Id: md-frame-1.mdf 188 2011-09-07 10:32:16Z marco $ +%%$Rev: 188 $ %%$Author: marco $ -%%$Date: 2011-09-04 18:13:47 +0200 (So, 04. Sep 2011) $ +%%$Date: 2011-09-07 12:32:16 +0200 (Mi, 07. Sep 2011) $ \def\mdframedIpackagename{md-frame-1} \def\md@frameIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } -\ProvidesFile{md-frame-1.mdf}[\md@frameIdate@svn$Id: md-frame-1.mdf 172 2011-09-04 16:13:47Z marco $ \mdversion: \mdframedIpackagename] +\ProvidesFile{md-frame-1.mdf}[\md@frameIdate@svn$Id: md-frame-1.mdf 188 2011-09-07 10:32:16Z marco $ \mdversion: \mdframedIpackagename] %%%% _____t_____ %%%% | | %%%% | | diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf index 494dcee2c6a..7c4410faa8a 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf @@ -8,16 +8,16 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. -%%$Id: md-frame-3.mdf 172 2011-09-04 16:13:47Z marco $ -%%$Rev: 172 $ +%%$Id: md-frame-3.mdf 188 2011-09-07 10:32:16Z marco $ +%%$Rev: 188 $ %%$Author: marco $ -%%$Date: 2011-09-04 18:13:47 +0200 (So, 04. Sep 2011) $ +%%$Date: 2011-09-07 12:32:16 +0200 (Mi, 07. Sep 2011) $ %%Allgemeine Einstellungen fuer pstricks %%Hier nur einfacher Rahmen mit Einstellungen \def\mdframedIIIpackagename{md-frame-3} \def\md@frameIIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } -\ProvidesFile{md-frame-3.mdf}[\md@frameIIIdate@svn$Id: md-frame-3.mdf 172 2011-09-04 16:13:47Z marco $ \mdversion: \mdframedIIIpackagename] +\ProvidesFile{md-frame-3.mdf}[\md@frameIIIdate@svn$Id: md-frame-3.mdf 188 2011-09-07 10:32:16Z marco $ \mdversion: \mdframedIIIpackagename] % \def\md@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div} \let\ptTps\md@ptlength@to@pscode\relax diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index e42bebf4277..fe5c8b60e92 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -32,17 +32,17 @@ %% %% %%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>%% -%%$Id: mdframed.sty 172 2011-09-04 16:13:47Z marco $ -%%$Rev: 172 $ +%%$Id: mdframed.sty 188 2011-09-07 10:32:16Z marco $ +%%$Rev: 188 $ %%$Author: marco $ -%%$Date: 2011-09-04 18:13:47 +0200 (So, 04. Sep 2011) $ +%%$Date: 2011-09-07 12:32:16 +0200 (Mi, 07. Sep 2011) $ %% Allgemeine Angaben -\def\mdversion{v0.9} +\def\mdversion{v0.9b} \def\mdframedpackagename{mdframed} \def\md@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mdframed}[\md@maindate@svn$Id: mdframed.sty 172 2011-09-04 16:13:47Z marco $ \mdversion: \mdframedpackagename] +\ProvidesPackage{mdframed}[\md@maindate@svn$Id: mdframed.sty 188 2011-09-07 10:32:16Z marco $ \mdversion: \mdframedpackagename] %%==================================================%% %%=============== Benoetigte Pakete ================%% %%==================================================%% @@ -323,6 +323,14 @@ \def\newmdtheoremenv@ii[#1]#2{% \def\md@tempc{#1}% + \ifboolexpr{ test {\ifcsundef{c@\md@tempc}} and test {\ifcsundef{c@md@@\md@tempc}} and not (test {\ifdefempty{\md@tempc}}) }% + {\md@PackageWarning{No Counter \md@tempc defined\MessageBreak}% + \edef\md@reserved@a{}}% + {\ifcsundef{c@\md@tempc}% + {\ifdefempty{\md@tempc}{\edef\md@reserved@a{}}{\edef\md@reserved@a{md@@\md@tempc}}}% + {\edef\md@reserved@a{\md@tempc}}% + } + \edef\md@tempc{\md@reserved@a} \def\md@tempd{#2}% \kernel@ifnextchar[%] {\newmdtheoremenv@iii}{\newmdtheoremenv@iii[]}% @@ -330,6 +338,14 @@ \def\newmdtheoremenv@iii[#1]{% \def\md@tempe{#1}% + \ifboolexpr{ test {\ifcsundef{c@\md@tempe}} and test {\ifcsundef{c@md@@\md@tempe}} and not (test {\ifdefempty{\md@tempe}}) }% + {\md@PackageWarning{No Counter \md@tempe defined\MessageBreak}% + \edef\md@reserved@a{}}% + {\ifcsundef{c@\md@tempe}% + {\ifdefempty{\md@tempe}{\edef\md@reserved@a{}}{\edef\md@reserved@a{md@@\md@tempe}}}% + {\edef\md@reserved@a{\md@tempe}}% + } + \edef\md@tempe{\md@reserved@a} \ifboolexpr{ not (test {\ifdefempty{\md@tempc}}) and not (test {\ifdefempty{\md@tempe}}) @@ -338,22 +354,33 @@ both optional arguments^^J and . This isn't allowed^^J \mdframedpackagename will use \MessageBreak}% - \newtheorem{\csname md\md@tempb \endcsname}[\md@tempc]{\md@tempd}% - }% - {\ifdefempty{\md@tempc}{}{\newtheorem{md@@\md@tempb}[\md@tempc]{\md@tempd}}% - \ifdefempty{\md@tempe}{}{\newtheorem{md@@\md@tempb}{\md@tempd}[\md@tempe]}% + \begingroup\edef\md@reserved@a{% + \endgroup\noexpand\newtheorem{md@@\md@tempb}[\md@tempc]{\md@tempd}}% }% + {\ifdefempty{\md@tempc}{}{% + \begingroup% + \edef\md@reserved@a{\endgroup% + \noexpand\newtheorem{md@@\md@tempb}[\md@tempc]{\md@tempd}}}% + \ifdefempty{\md@tempe}{}{% + \begingroup% + \edef\md@reserved@a{\endgroup% + \noexpand\newtheorem{md@@\md@tempb}{\md@tempd}[\md@tempe]}}% + } \ifboolexpr{test {\ifdefempty{\md@tempc}} and test {\ifdefempty{\md@tempe}} }{% - \newtheorem{md@@\md@tempb}{\md@tempd}% + \begingroup% + \edef\md@reserved@a{\endgroup% + \noexpand\newtheorem{md@@\md@tempb}{\md@tempd}% + } }{}% + \md@reserved@a% \protected@csxdef{\md@tempb}{\noexpand\mdfsetup{\md@tempa}% - \noexpand\begin{mdframed}\noexpand\begin{md@@\md@tempb} % + \noexpand\begin{mdframed}[]\noexpand\begin{md@@\md@tempb}% }% \protected@csxdef{end\md@tempb}{% - \noexpand\end{md@@\md@tempb}\noexpand\end{mdframed}% + \noexpand\end{md@@\md@tempb}\noexpand\end{mdframed}% }% } @@ -496,8 +523,10 @@ \mdf@settings% \let\width\z@% \let\height\z@% - \let\partopsep\z@ \setlength{\topsep}{\mdf@skipabove@length}% + \begingroup% + \let\partopsep\z@% + \expandafter\endgroup% \begin{md@trivlist}\item\relax% \md@checkntheorem% \md@styledefinition% -- cgit v1.2.3