From 2527a7b311b3d39a759e168a763718e6e5c22eaa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2012 16:29:36 +0000 Subject: mdframed (8apr12) git-svn-id: svn://tug.org/texlive/trunk@25884 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls | 16 ++++++++----- .../texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 4 ++-- .../texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 8 +++++-- .../texmf-dist/tex/latex/mdframed/md-frame-2.mdf | 8 +++++-- .../texmf-dist/tex/latex/mdframed/md-frame-3.mdf | 8 +++++-- Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 28 ++++++++++++++-------- 6 files changed, 48 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls index 7e112c6c206..6790bafe75d 100644 --- a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls +++ b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls @@ -9,16 +9,16 @@ %% Either version 1.0 or, at your option, any later version. -%%$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ -%%$Rev: 350 $ +%%$Id: ltxmdf.cls 374 2012-04-08 10:47:37Z marco $ +%%$Rev: 374 $ %%$Author: marco $ -%%$Date: 2012-03-12 19:33:59 +0100 (Mo, 12. Mär 2012) $ +%%$Date: 2012-04-08 12:47:37 +0200 (So, 08. Apr 2012) $ %% Allgemeine Angaben \def\ltxmdf@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ ltxmdf] +\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 374 2012-04-08 10:47:37Z marco $ ltxmdf] \DeclareOption{tocdepthsec}{\def\ltxmdf@tocdepth{1}} \DeclareOption{tocdepthsub}{\def\ltxmdf@tocdepth{2}} \newif\ifltxmdf@lipsum @@ -70,6 +70,9 @@ \RequirePackage{graphicx} \RequirePackage[numbered]{hypdoc} +%set columns of index +\c@IndexColumns = 2 + \hypersetup{% breaklinks=true, pdftitle={Documenation of mdframed},% @@ -95,7 +98,7 @@ \ifoot{#2 #3 #4-#5-#6 #7 #8} } -\ltxmdfsetifoot$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ +\ltxmdfsetifoot$Id: ltxmdf.cls 374 2012-04-08 10:47:37Z marco $ @@ -148,6 +151,7 @@ define@key,renewrobustcmd,mdfcreateextratikz,node,ifdefempty,% mdf@frametitlefont,dimexpr,mdframedtitleenv,ifstrempty,@undefined,% mdtheorem,surroundwithmdframed,@captype,@dblarg,@newcaption,newcaption,% + mdflength,% },% } @@ -173,7 +177,7 @@ \def\version#1{\def\@version{#1}} \def\date#1{\def\@date{#1}} \def\@@date$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6} -\date{\@@date$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $} +\date{\@@date$Id: ltxmdf.cls 374 2012-04-08 10:47:37Z marco $} \let\mdfdateID\@@date 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 654e480785d..d3d6da57411 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf @@ -5,11 +5,11 @@ %% Either version 1.0 or, at your option, any later version. %% %% -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \def\mdframedOpackagename{md-frame-0} \def\mdf@frameOdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \ProvidesFile{md-frame-0.mdf}% - [\mdf@frameOdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $% + [\mdf@frameOdate@svn$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $% \mdversion: \mdframedOpackagename] \def\mdf@background@default{\color{\mdf@backgroundcolor}} \def\mdf@frametitlebackground@default{\color{\mdf@frametitlebackgroundcolor}} 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 fdc1fae9ba4..cc13eab36cc 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf @@ -5,11 +5,11 @@ %% Either version 1.0 or, at your option, any later version. %% %% -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \def\mdframedIpackagename{md-frame-1} \def\mdf@frameIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \ProvidesFile{md-frame-1.mdf}% - [\mdf@frameIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ % + [\mdf@frameIdate@svn$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ % \mdversion: \mdframedIpackagename] \def\mdf@tikz@settings{% \tikzset{mdfbox/.style={anchor=south west,% @@ -196,6 +196,7 @@ \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@one};% Ausgabebox einfuegen \end{scope} %HIER KOMMT EIN WEITERES MAKRO + \mdf@singleextra \mdfcreateextratikz \end{tikzpicture}% }% @@ -417,6 +418,7 @@ \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% Ausgabebox einfuegen \end{scope} %HIER KOMMT EIN WEITERES MAKRO + \mdf@firstextra \mdfcreateextratikz% \end{tikzpicture}% }% @@ -594,6 +596,7 @@ \drawbrackgroundframetitle@middle \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% Ausgabebox einfuegen \end{scope} + \mdf@middleextra %HIER KOMMT EIN WEITERES MAKRO \mdfcreateextratikz \end{tikzpicture}% @@ -768,6 +771,7 @@ \drawbrackgroundframetitle@second \node[mdfbox] at (\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@one};% Ausgabebox einfuegen \end{scope} + \mdf@secondextra %HIER KOMMT EIN WEITERES MAKRO \mdfcreateextratikz \end{tikzpicture}% diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf index 67ac75bd577..3afbb9a71d4 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf @@ -5,11 +5,11 @@ %% Either version 1.0 or, at your option, any later version. %% %% -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \def\mdframedIIpackagename{md-frame-2} \def\mdf@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \ProvidesFile{md-frame-2.mdf}% - [\mdf@frameIIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ % + [\mdf@frameIIdate@svn$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ % \mdversion: \mdframedIIpackagename] \def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div } \def\mdf@ptlength@to@pscode@length#1{\pst@number{\csname mdf@#1@length\endcsname} \pst@number\psxunit div } @@ -243,6 +243,7 @@ \drawbrackgroundframetitle@single %output% \rput[bl](mdf@A){\box\mdf@splitbox@one} + \mdf@singleextra \end{pspicture}% }% \mdf@makeboxalign@right% @@ -416,6 +417,7 @@ \drawbrackgroundframetitle@first %output% \rput[bl](mdf@A){\box\mdf@splitbox@two} + \mdf@firstextra \end{pspicture} }% \mdf@makeboxalign@right% @@ -582,6 +584,7 @@ \drawbrackgroundframetitle@middle %output% \rput[bl](mdf@A){\box\mdf@splitbox@two} + \mdf@middleextra \end{pspicture}% }% \mdf@makeboxalign@right% @@ -749,6 +752,7 @@ \drawbrackgroundframetitle@second %output% \rput[bl](mdf@A){\box\mdf@splitbox@one} + \mdf@secondextra \end{pspicture}% }% \mdf@makeboxalign@right% 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 67ac75bd577..3afbb9a71d4 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf @@ -5,11 +5,11 @@ %% Either version 1.0 or, at your option, any later version. %% %% -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \def\mdframedIIpackagename{md-frame-2} \def\mdf@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \ProvidesFile{md-frame-2.mdf}% - [\mdf@frameIIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ % + [\mdf@frameIIdate@svn$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ % \mdversion: \mdframedIIpackagename] \def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div } \def\mdf@ptlength@to@pscode@length#1{\pst@number{\csname mdf@#1@length\endcsname} \pst@number\psxunit div } @@ -243,6 +243,7 @@ \drawbrackgroundframetitle@single %output% \rput[bl](mdf@A){\box\mdf@splitbox@one} + \mdf@singleextra \end{pspicture}% }% \mdf@makeboxalign@right% @@ -416,6 +417,7 @@ \drawbrackgroundframetitle@first %output% \rput[bl](mdf@A){\box\mdf@splitbox@two} + \mdf@firstextra \end{pspicture} }% \mdf@makeboxalign@right% @@ -582,6 +584,7 @@ \drawbrackgroundframetitle@middle %output% \rput[bl](mdf@A){\box\mdf@splitbox@two} + \mdf@middleextra \end{pspicture}% }% \mdf@makeboxalign@right% @@ -749,6 +752,7 @@ \drawbrackgroundframetitle@second %output% \rput[bl](mdf@A){\box\mdf@splitbox@one} + \mdf@secondextra \end{pspicture}% }% \mdf@makeboxalign@right% diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index 2103353e87a..00974904192 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -48,12 +48,12 @@ %% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> %% ================================================== %% -\def\mdversion{v1.4d} +\def\mdversion{v1.5} \def\mdframedpackagename{mdframed} \def\mdf@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mdframed}% - [\mdf@maindate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $% + [\mdf@maindate@svn$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $% \mdversion: \mdframedpackagename] \newcommand*\mdf@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}} \newcommand*\mdf@PackageInfo[1]{\PackageInfo{\mdframedpackagename}{#1}} @@ -233,6 +233,10 @@ {theoremcountersep=={.}},% {theoremtitlefont=={}},% {theoremspace=={\space}},% + {singleextra=={}}, + {firstextra=={}}, + {middleextra=={}}, + {secondextra=={}}, } \mdf@dolist{\mdf@do@booloption}{% {ntheorem==false},% @@ -419,7 +423,13 @@ \@ifpackageloaded{amsthm}{% \newrobustcmd\mdf@patchamsthm{% \let\mdf@deferred@thm@head\deferred@thm@head - \patchcmd{\deferred@thm@head}{\indent}{}{}{} + \patchcmd{\deferred@thm@head}{\indent}{}% + {\mdf@PackageInfo{mdframed detected package amsthm ^^J + changed the theoerem header of amsthm\MessageBreak}% + }{% + \mdf@PackageInfo{mdframed detected package amsthm ^^J + changed the theoerem header of amsthm failed\MessageBreak}% + }% }% }{\let\mdf@patchamsthm\relax}% \def\mdf@trivlist#1{% @@ -999,18 +1009,16 @@ because the splittet box is empty\MessageBreak You have to change the page settings\MessageBreak like enlargethispage or something else}% - \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@two% - %benoetigt um Tiefe zu haben - \hrule \@height\dp\strutbox \@width\z@ - \unvbox\mdf@splitbox@one}% + \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@two}% \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}% \enlargethispage{\baselineskip}% \def\mdf@reserved@a{\mdf@put@frame}% \fi \ifvoid\mdf@splitbox@two%%pruefe, ob erste Box leer ist - \hrule \@height\z@ \@width\hsize - %%\vfill\eject% - \def\mdf@reserved@a{\mdf@put@frame}% + {\hrule \@height\f@size pt \@width\z@% + \hrule \@height\z@ \@width\hsize}% + % + \def\mdf@reserved@a{\mdf@put@frame}% \else \ifdimequal{\ht\mdf@splitbox@two}{0pt}% {\hrule \@height\z@ \@width\hsize% -- cgit v1.2.3