From 8fa06123182d0d5e84819a4bf9c42c42b3091170 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Aug 2011 00:07:53 +0000 Subject: mdframed 0.8 (23aug11) git-svn-id: svn://tug.org/texlive/trunk@23665 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 9 ++- .../texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 10 +-- .../texmf-dist/tex/latex/mdframed/md-frame-3.mdf | 9 ++- Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 89 ++++++++++++++++++++-- 4 files changed, 98 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mdframed') 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 88e4c87560b..a05479bb8dd 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf @@ -8,15 +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-0.mdf 161 2011-08-06 11:28:15Z marco $ -%%$Rev: 161 $ +%%$Id: md-frame-0.mdf 163 2011-08-22 19:08:00Z marco $ +%%$Rev: 163 $ %%$Author: marco $ -%%$Date: 2011-08-06 13:28:15 +0200 (Sa, 06. Aug 2011) $ +%%$Date: 2011-08-22 21:08:00 +0200 (Mo, 22. Aug 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 161 2011-08-06 11:28:15Z marco $ \mdversion: \mdframedOpackagename] +\ProvidesFile{md-frame-0.mdf}[\md@frameOdate@svn$Id: md-frame-0.mdf 163 2011-08-22 19:08:00Z 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 1359a2e7c3f..b9ce492e339 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf @@ -8,15 +8,15 @@ %% 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 161 2011-08-06 11:28:15Z marco $ -%%$Rev: 161 $ +%%$Id: md-frame-1.mdf 163 2011-08-22 19:08:00Z marco $ +%%$Rev: 163 $ %%$Author: marco $ -%%$Date: 2011-08-06 13:28:15 +0200 (Sa, 06. Aug 2011) $ +%%$Date: 2011-08-22 21:08:00 +0200 (Mo, 22. Aug 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 161 2011-08-06 11:28:15Z marco $ \mdversion: \mdframedIpackagename] +\ProvidesFile{md-frame-1.mdf}[\md@frameIdate@svn$Id: md-frame-1.mdf 163 2011-08-22 19:08:00Z marco $ \mdversion: \mdframedIpackagename] %%%% _____t_____ %%%% | | @@ -89,7 +89,7 @@ \ifdimgreater{\mdf@middlelinewidth@length}{\z@}% nur wenn middlelinewidth>0 wird mittlere Linie gezeichnet {\tikzset{mdfmiddleline/.append style={% preaction={draw=\mdf@middlelinecolor,line width=\mdf@middlelinewidth@length},% - line width=\mdf@middlelinewidth@length, + line width=\mdf@middlelinewidth@length,% tikzsetting}}% }{}% }% 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 4e26413d546..9168bc0903a 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf @@ -8,10 +8,10 @@ %% 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 161 2011-08-06 11:28:15Z marco $ -%%$Rev: 161 $ +%%$Id: md-frame-3.mdf 163 2011-08-22 19:08:00Z marco $ +%%$Rev: 163 $ %%$Author: marco $ -%%$Date: 2011-08-06 13:28:15 +0200 (Sa, 06. Aug 2011) $ +%%$Date: 2011-08-22 21:08:00 +0200 (Mo, 22. Aug 2011) $ %%Allgemeine Einstellungen fuer pstricks @@ -20,7 +20,7 @@ \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 161 2011-08-06 11:28:15Z marco $ \mdversion: \mdframedIIIpackagename] +\ProvidesFile{md-frame-3.mdf}[\md@frameIIIdate@svn$Id: md-frame-3.mdf 163 2011-08-22 19:08:00Z marco $ \mdversion: \mdframedIIIpackagename] \def\md@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div} \let\ptTps\md@ptlength@to@pscode\relax @@ -60,6 +60,7 @@ \ifboolexpr{ not (test {\md@test@ltrb} or test {\md@test@ltr} or test {\md@test@ltb} or test {\md@test@trb} or test {\md@test@lrb} or test {\md@test@lb} or test {\md@test@rb} or test {\md@test@tr} or test {\md@test@lt} ) }} + %%==================================================%% %%================single-box========================%% %%==================================================%% diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index ee5ab20348c..78f9111df6b 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 161 2011-08-06 11:28:15Z marco $ -%%$Rev: 161 $ +%%$Id: mdframed.sty 163 2011-08-22 19:08:00Z marco $ +%%$Rev: 163 $ %%$Author: marco $ -%%$Date: 2011-08-06 13:28:15 +0200 (Sa, 06. Aug 2011) $ +%%$Date: 2011-08-22 21:08:00 +0200 (Mo, 22. Aug 2011) $ %% Allgemeine Angaben -\def\mdversion{v0.7a} +\def\mdversion{v0.8} \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 161 2011-08-06 11:28:15Z marco $ \mdversion: \mdframedpackagename] +\ProvidesPackage{mdframed}[\md@maindate@svn$Id: mdframed.sty 163 2011-08-22 19:08:00Z marco $ \mdversion: \mdframedpackagename] %%==================================================%% %%=============== Benoetigte Pakete ================%% @@ -241,14 +241,91 @@ \def\md@endparenv{% \addpenalty\@endparpenalty\addvspace\mdf@skipbelow@length\@endpetrue} + + +%%==================================================%% +%%=============Umgebungdefinition===================%% +%%==================================================%% +%\newmdenv[]{} +\newrobustcmd*\newmdenv[2][]{% + \newenvironment{#2}{% + \mdfsetup{#1}% + \begin{mdframed}% + }{% + \end{mdframed}% + }% +} +%\renewmdenv[]{} +\newrobustcmd*\renewmdenv[2][]{% + \expandafter\let\csname #2\endcsname\relax% + \expandafter\let\csname end#2\endcsname\relax% + \newmdenv[#1]{#2}% + }% + +%http://tex.stackexchange.com/questions/26298/own-command-to-create-new-environment +%\newtheorem{}[]{}[] +%\newmdtheoremenv[]{}[]{}[] +%\md@tempa[] +%\md@tempb{}% +%\md@tempc[]% +%\md@tempd{}% +%\md@tempe[]% +\newrobustcmd*\newmdtheoremenv[2][]{% + \kernel@ifnextchar[%] + {\newmdtheoremenv@i}{\newmdtheoremenv@i[]}% +} +\def\newmdtheoremenv@i[#1]#2{% + \def\md@tempa{#1}% + \def\md@tempb{#2}% + \kernel@ifnextchar[%] + {\newmdtheoremenv@ii}{\newmdtheoremenv@ii[]}% +} + +\def\newmdtheoremenv@ii[#1]#2{% + \def\md@tempc{#1}% + \def\md@tempd{#2}% + \kernel@ifnextchar[%] + {\newmdtheoremenv@iii}{\newmdtheoremenv@iii[]}% +} + +\def\newmdtheoremenv@iii[#1]{% + \def\md@tempe{#1}% + \ifboolexpr{ not (test {\ifdefempty{\md@tempc}}) + and + not (test {\ifdefempty{\md@tempe}}) + }{% + \md@PackageWarning{You defined {\string\newtheorem} with ^^J + 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]}% + }% + \ifboolexpr{test {\ifdefempty{\md@tempc}} + and + test {\ifdefempty{\md@tempe}} + }{% + \newtheorem{md\md@tempb}{\md@tempd}% + }{}% + \expandafter\protected@xdef\csname\md@tempb\endcsname{\noexpand\mdfsetup{\md@tempa}% + \noexpand\begin{mdframed}[]\noexpand\begin{md\md@tempb}% + }% + \expandafter\protected@xdef\csname end\md@tempb\endcsname{% + \noexpand\end{md\md@tempb}\noexpand\end{mdframed}% + }% +} + %%==================================================%% %%=================== Frametitle ===================%% %%==================================================%% +\let\mdraggedtitle\raggedright \providecommand*\mdframedtitleenv[1]{% \@afterindentfalse {\parindent \z@ \setlength{\parfillskip}{\z@ plus 1fil}% - \raggedsection\nobreak\mdf@frametitlefont#1\relax% + \mdraggedtitle\nobreak\mdf@frametitlefont#1\relax% \par}% \@afterheading} % -- cgit v1.2.3