diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 102 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 40 |
3 files changed, 83 insertions, 67 deletions
diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls index 4c1185ff42d..d5d59e938fb 100644 --- a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls +++ b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls @@ -113,7 +113,6 @@ \ifoot{{\mdfmaindate}\qquad revision:~{\mdfrevision}\qquad{\jobname}} - %Tikz und Farbe %tikzlibrary needs special handling \ExplSyntaxOff @@ -128,10 +127,10 @@ basicstyle=\small,% xleftmargin=20pt,% xrightmargin=20pt,% - frame=single,% + frame=none,% rulecolor=\color{ltxmdfblue},% framesep=5pt,% - framerule=1pt,% + framerule=1.2pt,% texcsstyle=*\color{red!50!black}\bfseries, moretexcs=intertext, keywordstyle=\color{blue!60!black}\bfseries,% @@ -174,7 +173,7 @@ mdf@frametitlefont,dimexpr,mdframedtitleenv,ifstrempty, @undefined,mdtheorem,surroundwithmdframed,@captype,@dblarg, @newcaption,newcaption,mdflength,tikzset,path,p1,p2, - IfFileExists,includegraphics% + IfFileExists,includegraphics,mdfsubtitle,% },% } @@ -183,7 +182,6 @@ {\lstset{style=lstltxmdf,#1}}% {} - %%Maketitle angepasst: \prop_new:N \l_ltxmdf_maketitleinformation_prop \cs_set:Npn \title #1 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 77ad630c594..ec948c974a0 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf @@ -9,7 +9,7 @@ [\mdfmaindate\ % \mdversion: \mdframedIpackagename] \def\mdf@tikz@settings{% - \mdf@testdraftmode% +%% \mdf@testdraftmode% \tikzset{mdfbox/.style={anchor=south west,% inner sep=0pt,% outer sep=0pt,% @@ -74,50 +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;% - }% - }{}% - }% -} +%%\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, @@ -353,6 +353,7 @@ \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow,mdfcorners](O) rectangle (P);}{}% + \begin{scope} \begin{scope}[use as bounding box] \mdf@test@ltrb{\mdf@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)--cycle}}{}% \mdf@test@ltb{\mdf@tikzbox@tfl{(P|-O)--(O)--(O|-P)--(P)}}{}% @@ -392,6 +393,7 @@ \mdf@test@noline{\path[mdfbackground,mdfcorners](O)rectangle(P);}{}% %Frametitlebackground \drawbrackgroundframetitle@single + \end{scope} \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@one};%output \end{scope} %HIER KOMMT EIN WEITERES MAKRO @@ -472,8 +474,8 @@ -0.5\mdf@middlelinewidth@length% +\mdf@frametitlebelowskip@length +\mdf@splitbottomskip@length - +\mdf@splittopskip@length - +\dp\strutbox% +%% +\mdf@splittopskip@length + -\dp\strutbox% }% }% }% @@ -577,6 +579,7 @@ \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow] (O) -- (O|-P) to[mdfcorners] (P) -- (P|-O) -- (O);}{}% + \begin{scope} \begin{scope}[use as bounding box] %%%%%%%%%%%% \ifbool{mdf@everyline}{% @@ -650,6 +653,7 @@ } %%%%%%%%%%%% \drawbrackgroundframetitle@first + \end{scope} \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% \end{scope} %HIER KOMMT EIN WEITERES MAKRO @@ -810,6 +814,7 @@ \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow](O) rectangle (P);}{}% + \begin{scope} \begin{scope}[use as bounding box] %%%%%%%%%%%% \ifbool{mdf@everyline}{% @@ -861,6 +866,7 @@ } %%%%%%%% \drawbrackgroundframetitle@middle + \end{scope} \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% \end{scope} \mdf@middleextra @@ -1006,6 +1012,7 @@ \path[mdfshadow] (O|-P) to[mdfcorners] (O) to[mdfcorners] (P|-O) -- (P) -- (O|-P);% }{}% + \begin{scope} \begin{scope}[use as bounding box] %%%%%%%%%%%% \ifbool{mdf@everyline}{% @@ -1079,6 +1086,7 @@ {}% }% \drawbrackgroundframetitle@second + \end{scope} \node[mdfbox] at (\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@one};% \end{scope} \mdf@secondextra diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index 1c00a5a2a12..36295b6ca84 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -48,10 +48,10 @@ %% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> %% ================================================== %% -\def\mdversion{1.6d} +\def\mdversion{1.8} \def\mdframedpackagename{mdframed} -\def\mdfmaindate{2012/09/21} -\def\mdfrevision{162}% Done by github: git rev-list HEAD | wc -l +\def\mdfmaindate{2013/03/09} +\def\mdfrevision{ 172}% Done by github: git rev-list HEAD | wc -l \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mdframed}% [\mdfmaindate\ % @@ -281,6 +281,7 @@ {subsubtitleaboveline==false}, {subsubtitlebelowline==false}, {draft==false}, + {suppressfirstparskip==true}, } %%special boolflag hidealllines: \newbool{mdf@hidealllines}% @@ -464,15 +465,16 @@ \let\mdf@deferred@thm@head\deferred@thm@head \pretocmd{\deferred@thm@head}{\@inlabelfalse}% {\mdf@PackageInfo{mdframed detected package amsthm ^^J - changed the theoerem header of amsthm\MessageBreak}% + changed the theorem header of amsthm\MessageBreak}% }{% \mdf@PackageError{mdframed detected package amsthm ^^J - changed the theoerem header of amsthm + changed the theorem header of amsthm failed\MessageBreak}% }% }% }{\let\mdf@patchamsthm\relax}% \def\mdf@trivlist#1{% + \edef\x{\topsep=\the\topsep\relax\partopsep=\the\partopsep\relax\parsep=\the\parsep\relax} \setlength{\topsep}{#1}% \partopsep\z@% \parsep\z@% @@ -483,17 +485,17 @@ \itemindent\z@% \let\@itemlabel\@empty% \def\makelabel##1{##1}% -%% \item\leavevmode\hrule \@height\z@ \@width\linewidth\relax% + \item\relax\x\relax\leavevmode\hrule \@height\z@ \@width\linewidth\relax% %% \item\mbox{}\relax% second version - \item\relax% first Version +%% \item\relax\x% first Version } \let\endmdf@trivlist\endtrivlist \patchcmd\endmdf@trivlist\@endparenv\mdf@endparenv{% - \immediate\typeout{^^J****** mdframed patching \string\endmdf@trivlist}% - \immediate\typeout{^^J****** -- success******^^J}% + \wlog{^^J****** mdframed patching \string\endmdf@trivlist}% + \wlog{^^J****** -- success******^^J}% }{% - \immediate\typeout{^^J****** mdframed patching \string\endmdf@trivlist}% - \immediate\typeout{^^J****** -- failed******^^J}% + \wlog{^^J****** mdframed patching \string\endmdf@trivlist}% + \wlog{^^J****** -- failed******^^J}% } \def\mdf@endparenv{% \addpenalty\@endparpenalty\addvspace\mdf@skipbelow@length\@endpetrue} @@ -761,6 +763,9 @@ \fi% \mdf@reserved@a% } +\newcount\mdf@envdepth \mdf@envdepth=0 +\@definecounter{mdf@env@i} +\@definecounter{mdf@env@ii} \newenvironment{mdframed}[1][]{% \color@begingroup% \mdfsetup{userdefinedwidth=\linewidth,#1}% @@ -772,6 +777,10 @@ {% \ifdimgreater{\overfullrule}{0pt}{}{\setlength\overfullrule{5pt}}% }{}% + \ifnum\mdf@envdepth >\tw@\@toodeep\else + \advance\mdf@envdepth\@ne + \edef\mdf@depthctr{mdf@env@\romannumeral\the\mdf@envdepth}% + \fi \mdf@styledefinition% \mdf@footnoteinput% \color{\mdf@fontcolor}% @@ -780,6 +789,7 @@ \mdf@trivlist{\mdf@skipabove@length}%% \ifdefempty{\mdf@frametitle}{}{\mdf@@frametitle}% \mdf@settings% + \ifbool{mdf@suppressfirstparskip}{\addtolength{\mdf@innertopmargin@length}{-\parskip}}{}% \mdf@lrbox{\mdf@splitbox@one}% }% {% @@ -1032,8 +1042,8 @@ \ifdim\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax>\dimen@ \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***} +%% \wlog{***mdframed \string\@tempcnta=\the\@tempcnta***} +%% \wlog{***mdframed \string\dimen@i=\the\dimen@i***} \mdf@ignorevbadness% \setbox\mdf@splitbox@one=\vbox{\unvcopy\mdf@splitbox@save}% \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length% @@ -1173,8 +1183,8 @@ \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***} +%% \wlog{***mdframed \string\@tempcnta=\the\@tempcnta***} +%% \wlog{***mdframed \string\dimen@i=\the\dimen@i***} \ifnum\@tempcnta>100 \let\iterate\relax% \mdf@PackageWarning{correct box splittet fails^^J |