From 2116b098967c4ac8c5c341b24ece64007d46d45f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Sep 2012 22:30:34 +0000 Subject: mdframed (21sep12) git-svn-id: svn://tug.org/texlive/trunk@27762 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls | 22 ++++--- .../texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 5 +- .../texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 52 ++++++++++++++-- .../texmf-dist/tex/latex/mdframed/md-frame-2.mdf | 7 +-- .../texmf-dist/tex/latex/mdframed/md-frame-3.mdf | 7 +-- Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 72 ++++++++++++++-------- 6 files changed, 114 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mdframed') diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls index 967dc754c9a..4c1185ff42d 100644 --- a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls +++ b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls @@ -9,13 +9,13 @@ %% Either version 1.0 or, at your option, any later version. -%%$Id: ltxmdf.cls 421 2012-05-31 15:51:38Z marco $ -%%$Rev: 421 $ +%%$Id: ltxmdf.cls 431 2012-06-20 16:40:42Z marco $ +%%$Rev: 431 $ %%$Author: marco $ -%%$Date: 2012-05-31 17:51:38 +0200 (Do, 31 Mai 2012) $ +%%$Date: 2012-06-20 18:40:42 +0200 (Mi, 20 Jun 2012) $ \RequirePackage{expl3} -\GetIdInfo$Id: ltxmdf.cls 421 2012-05-31 15:51:38Z marco $ +\GetIdInfo$Id: ltxmdf.cls 431 2012-06-20 16:40:42Z marco $ {documentation class for Marco Daniel} \ProvidesExplClass{\ExplFileName} @@ -36,6 +36,7 @@ \ProcessKeysOptions { ltxmdf } \LoadClassWithOptions { scrartcl } +\cs_set_eq:NN \c_keys_code_root_tl \c__keys_code_root_tl \RequirePackage{ifxetex,ifluatex} @@ -107,7 +108,9 @@ \ihead{\rightmark} \ohead{\leftmark} \ofoot{\pagemark} -\ifoot{{\ExplFileDate}\qquad SVN~version:~{\ExplFileVersion}\qquad{\ExplFileName}} +\providecommand\mdfmaindate{2012/09/20} +\providecommand\mdfrevision{1} +\ifoot{{\mdfmaindate}\qquad revision:~{\mdfrevision}\qquad{\jobname}} @@ -153,7 +156,10 @@ innerleftmargin,frametitlerule,frametitlebelowskip, frametitleaboveskip,frametitlebackgroundcolor, frametitlerulecolor,picins,figure,hidealllines,fontcolor, - firstextra,secondextra,middleextra,singleextra,overlay,node}, + firstextra,secondextra,middleextra,singleextra,overlay,node, + pstricksappsetting,apptotikzsetting,frametitlerulewidth, + userdefinedwidth,mdfbackground,append,mdfframetitlebackground, + left,shade,align,exampledefault}, moretexcs={newmdtheoremenv,newmdenv,theoremstyle,mdfsetup,@length, md@putbox@single,@tempboxa,mdf@,mdf@linewidth, mdf@leftmargin@length,interruptlength,setlength,newrobustcmd, @@ -167,7 +173,8 @@ define@key,renewrobustcmd,mdfcreateextratikz,node,ifdefempty, mdf@frametitlefont,dimexpr,mdframedtitleenv,ifstrempty, @undefined,mdtheorem,surroundwithmdframed,@captype,@dblarg, - @newcaption,newcaption,mdflength,tikzset,path,p1,p2% + @newcaption,newcaption,mdflength,tikzset,path,p1,p2, + IfFileExists,includegraphics% },% } @@ -493,5 +500,6 @@ %%%% + \tex_endinput:D 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 9173d48a003..ae92366d67b 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf @@ -4,12 +4,9 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -%% -%%$Id: mdframed.dtx 426 2012-06-02 12:18:56Z 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 426 2012-06-02 12:18:56Z marco $% + [\mdfmaindate\ % \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 8a1c2910a40..77ad630c594 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf @@ -1,17 +1,15 @@ -%% Style file for mdframed for package option `framemethod=default` +%% Style file for mdframed for package option `framemethod=tikz` %% %% This package may be distributed under the terms of the LaTeX Project %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -%% -%%$Id: mdframed.dtx 426 2012-06-02 12:18:56Z 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 426 2012-06-02 12:18:56Z marco $ % + [\mdfmaindate\ % \mdversion: \mdframedIpackagename] \def\mdf@tikz@settings{% + \mdf@testdraftmode% \tikzset{mdfbox/.style={anchor=south west,% inner sep=0pt,% outer sep=0pt,% @@ -76,6 +74,50 @@ \path[mdfinnerline,mdfcorners]#1;% \end{scope}% \path[mdfmiddleline,mdfcorners]#1;}% +\newrobustcmd*\mdf@testdraftmode{% + \ifbool{mdf@draft}% + {% + \renewrobustcmd*\mdf@tikzbox@tfl[1]{%three or four borders + \path(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);% + \begin{scope}[mdfcorners]% + \clip[preaction=mdfouterline]% + [postaction=mdfbackground]% + [postaction=mdfinnerline]##1;% + \end{scope}% + \path[mdfmiddleline,mdfcorners]##1; + }% + \renewrobustcmd*\mdf@tikzbox@otl[2]{%one or two borders + \path(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);% + \begin{scope} + \path[mdfouterline,mdfcorners]##1;% + \clip[postaction=mdfbackground]##2;% + \path[mdfinnerline,mdfcorners]##1;% + \end{scope}% + \path[mdfmiddleline,mdfcorners]##1;% + }% + }{% + \ifdimgreater{\overfullrule}{0pt}{% + \renewrobustcmd*\mdf@tikzbox@tfl[1]{%three or four borders + \path(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);% + \begin{scope}[mdfcorners]% + \clip[preaction=mdfouterline]% + [postaction=mdfbackground]% + [postaction=mdfinnerline]##1;% + \end{scope}% + \path[mdfmiddleline,mdfcorners]##1; + }% + \renewrobustcmd*\mdf@tikzbox@otl[2]{%one or two borders + \path(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);% + \begin{scope} + \path[mdfouterline,mdfcorners]##1;% + \clip[postaction=mdfbackground]##2;% + \path[mdfinnerline,mdfcorners]##1;% + \end{scope}% + \path[mdfmiddleline,mdfcorners]##1;% + }% + }{}% + }% +} \tikzset{mdfframetitlerule/.style={% draw=none, fill=\mdf@frametitlerulecolor, 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 7609c34e420..52eb36485a6 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf @@ -1,15 +1,12 @@ -%% Style file for mdframed for package option `framemethod=default` +%% Style file for mdframed for package option `framemethod=pstricks` %% %% This package may be distributed under the terms of the LaTeX Project %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -%% -%%$Id: mdframed.dtx 426 2012-06-02 12:18:56Z 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 426 2012-06-02 12:18:56Z marco $ % + [\mdfmaindate\ % \mdversion: \mdframedIIpackagename] \def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div } \def\mdf@ptlength@to@pscode@length#1{% 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 7609c34e420..52eb36485a6 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf @@ -1,15 +1,12 @@ -%% Style file for mdframed for package option `framemethod=default` +%% Style file for mdframed for package option `framemethod=pstricks` %% %% This package may be distributed under the terms of the LaTeX Project %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -%% -%%$Id: mdframed.dtx 426 2012-06-02 12:18:56Z 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 426 2012-06-02 12:18:56Z marco $ % + [\mdfmaindate\ % \mdversion: \mdframedIIpackagename] \def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div } \def\mdf@ptlength@to@pscode@length#1{% diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index acc8315d123..1c00a5a2a12 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -48,12 +48,13 @@ %% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> %% ================================================== %% -\def\mdversion{v1.6b} +\def\mdversion{1.6d} \def\mdframedpackagename{mdframed} -\def\mdf@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } +\def\mdfmaindate{2012/09/21} +\def\mdfrevision{162}% Done by github: git rev-list HEAD | wc -l \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mdframed}% - [\mdf@maindate@svn$Id: mdframed.dtx 426 2012-06-02 12:18:56Z marco $% + [\mdfmaindate\ % \mdversion: \mdframedpackagename] \newcommand*\mdf@PackageError[1]{\PackageError{\mdframedpackagename}{#1}} \newcommand*\mdf@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}} @@ -279,6 +280,7 @@ {subtitlebelowline==false}, {subsubtitleaboveline==false}, {subsubtitlebelowline==false}, + {draft==false}, } %%special boolflag hidealllines: \newbool{mdf@hidealllines}% @@ -460,7 +462,7 @@ {% \newrobustcmd\mdf@patchamsthm{% \let\mdf@deferred@thm@head\deferred@thm@head - \patchcmd{\deferred@thm@head}{\indent}{}% + \pretocmd{\deferred@thm@head}{\@inlabelfalse}% {\mdf@PackageInfo{mdframed detected package amsthm ^^J changed the theoerem header of amsthm\MessageBreak}% }{% @@ -667,9 +669,9 @@ \newrobustcmd*\mdf@@frametitle@use{% \parskip\z@\relax% \parindent\z@\relax% - \offinterlineskip\relax% \mdf@ignorevbadness% \setbox\mdf@splitbox@one=\vbox{% + \offinterlineskip\relax% \unvcopy\mdf@frametitlebox\relax% \mdf@@frametitlerule\relax% \unvbox\mdf@splitbox@one\relax% @@ -766,6 +768,10 @@ \let\width\z@% \let\height\z@% \mdf@checkntheorem% + \ifbool{mdf@draft}% + {% + \ifdimgreater{\overfullrule}{0pt}{}{\setlength\overfullrule{5pt}}% + }{}% \mdf@styledefinition% \mdf@footnoteinput% \color{\mdf@fontcolor}% @@ -1016,7 +1022,8 @@ \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}% \ifdimgreater{\ht\mdf@splitbox@two+\dp\mdf@splitbox@two}{\dimen@}% {%splitted wrong - \mdf@PackageInfo{Box was splittet wrong^^M starting loop to iterate + \mdf@PackageInfo{Box was splittet wrong^^J + starting loop to iterate the splitting point\MessageBreak}% \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% \dimen@i=\dimen@%\relax @@ -1025,26 +1032,31 @@ \ifdim\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax>\dimen@ \advance\dimen@i by -\p@\relax \advance\@tempcnta by \@ne\relax - \ifnum\@tempcnta>100 - \let\iterate\relax - \mdf@PackageWarning{correct box splittet fails^^M - It seems you are using a non splittable - contents\MessageBreak} - \fi +%% \immediate\typeout{***mdframed \string\@tempcnta=\the\@tempcnta***} +%% \immediate \typeout{***mdframed \string\dimen@i=\the\dimen@i***} \mdf@ignorevbadness% - \setbox\mdf@splitbox@one=\vbox{\break\unvcopy\mdf@splitbox@save}% + \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length% \mdf@ignorevbadness% \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \dimen@i\relax% \setbox\mdf@splitbox@two\vbox{\unvbox\mdf@splitbox@two}% \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}% + \ifnum\@tempcnta>100 + \let\iterate\relax + \mdf@PackageWarning{correct box splittet fails^^J + It seems you are using a non splittable + contents\MessageBreak} + \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% + \setbox\mdf@splitbox@two=\vbox{}% + \def\mdf@reserved@a{\mdf@put@frame}% + \fi \repeat% }{}% \ifvoid\mdf@splitbox@one\relax% \mdf@PackageWarning{You got a bad break because the splittet box - is empty^^M - You have to change the page settings^^M - like enlargethispage or something else^^M + is empty^^J + You have to change the page settings^^J + like enlargethispage or something else^^J the package increases do \enlargethispage{\baselineskip}\MessageBreak}% \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save} @@ -1053,11 +1065,11 @@ \fi% \ifdim\wd\mdf@splitbox@two=\wd\mdf@splitbox@one\relax \else% - \mdf@PackageInfo{You first box width is to small^^M + \mdf@PackageInfo{You first box width is to small^^J mdframed fixed it\MessageBreak}% \setbox\mdf@splitbox@two=\vbox% {% - \hrule \@height\z@ \@width\wd\mdf@splitbox@one\relax + \hrule \@height\z@ \@width\mdfboundingboxwidth\relax \unvcopy\mdf@splitbox@two% }% \fi% @@ -1148,9 +1160,11 @@ \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \mdf@freevspace@length \setbox\mdf@splitbox@two\vbox{\unvbox\mdf@splitbox@two} \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one} - \ifdimgreater{\ht\mdf@splitbox@two+\dp\mdf@splitbox@two}{\dimen@}% + \ifdimgreater{\ht\mdf@splitbox@two+\dp\mdf@splitbox@two}% + {\mdf@freevspace@length}% {%splitted wrong - \mdf@PackageInfo{Box was splittet wrong^^M starting loop to iterate + \mdf@PackageInfo{Box was splittet wrong^^J + starting loop to iterate the splitting point\MessageBreak}% \dimen@i=\mdf@freevspace@length%\relax \@tempcnta=\z@\relax @@ -1159,13 +1173,16 @@ \mdf@freevspace@length\relax \advance\dimen@i by -\p@\relax% \advance\@tempcnta by \@ne\relax% +%% \immediate\typeout{***mdframed \string\@tempcnta=\the\@tempcnta***} +%% \immediate \typeout{***mdframed \string\dimen@i=\the\dimen@i***} \ifnum\@tempcnta>100 \let\iterate\relax% - \mdf@PackageWarning{correct box splittet fails^^M + \mdf@PackageWarning{correct box splittet fails^^J It seems you are using a non splittable contents\MessageBreak}% \fi - \setbox\mdf@splitbox@one=\vbox{\break\unvcopy\mdf@splitbox@save}% + \mdf@ignorevbadness% + \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length% \mdf@ignorevbadness% \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \dimen@i\relax% @@ -1175,15 +1192,20 @@ }{}% \ifvoid\mdf@splitbox@one\relax% \mdf@PackageWarning{You got a bad break because the splittet box is - empty^^M - You have to change the page settings^^M - like enlargethispage or something else^^M + empty^^J + You have to change the page settings^^J + like enlargethispage or something else^^J the package increases do \enlargethispage{\baselineskip}\MessageBreak}% \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% \enlargethispage{\baselineskip}% \def\mdf@reserved@a{\mdf@put@frame@ii}% \else + \setbox\mdf@splitbox@two=\vbox% + {% + \hrule \@height\z@ \@width\mdfboundingboxwidth\relax + \unvcopy\mdf@splitbox@two% + }% \begingroup\mdf@@setzref\mdf@putbox@middle\endgroup% \hrule \@height\z@ \@width\hsize% \vfill\eject% -- cgit v1.2.3