diff options
author | Karl Berry <karl@freefriends.org> | 2012-03-30 22:55:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-03-30 22:55:29 +0000 |
commit | 47a840e48160c6b531c48bdcb667ff77676df586 (patch) | |
tree | 746ed05b9f699ada5bf1dc9846b1e92013767bc3 /Master/texmf-dist/tex/latex/mdframed | |
parent | 93c07a86f19018344711d41ae457b84cec166642 (diff) |
mdframed (30mar12)
git-svn-id: svn://tug.org/texlive/trunk@25789 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mdframed')
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 61 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf | 216 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf | 166 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf | 166 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 71 |
6 files changed, 674 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls index fda5dd42ad7..7e112c6c206 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 347 2012-03-04 13:04:28Z marco $ -%%$Rev: 347 $ +%%$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ +%%$Rev: 350 $ %%$Author: marco $ -%%$Date: 2012-03-04 14:04:28 +0100 (So, 04. Mär 2012) $ +%%$Date: 2012-03-12 19:33:59 +0100 (Mo, 12. Mär 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 347 2012-03-04 13:04:28Z marco $ ltxmdf] +\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ ltxmdf] \DeclareOption{tocdepthsec}{\def\ltxmdf@tocdepth{1}} \DeclareOption{tocdepthsub}{\def\ltxmdf@tocdepth{2}} \newif\ifltxmdf@lipsum @@ -95,7 +95,7 @@ \ifoot{#2 #3 #4-#5-#6 #7 #8} } -\ltxmdfsetifoot$Id: ltxmdf.cls 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z marco $ @@ -130,12 +130,12 @@ splitbottomskip,middlelinewidth,middlelinecolor,tikzsetting,% rightline,bottomline,innerrightmargin,style,linewidth,lem,section,% definedstyle,mdfapptodefinestyle,needspace,mdf@globalstyle@cnt,framemethod,% - ExampleText,titregris,draw,gray,thick,fill,white,shading,exersicetitle, - exersicebackground,color,green,black,exercise,exercisepoints, - text,rectangle,rounded,corners,right,minimum,height,xshift,at, - exercisestyle,settings,frametitlefont, - frametitlerule,frametitlebelowskip,frametitleaboveskip, - frametitlebackgroundcolor,frametitlerulecolor},% + ExampleText,titregris,draw,gray,thick,fill,white,shading,exersicetitle,% + exersicebackground,color,green,black,exercise,exercisepoints,% + text,rectangle,rounded,corners,right,minimum,height,xshift,at,% + exercisestyle,settings,frametitlefont,% + frametitlerule,frametitlebelowskip,frametitleaboveskip,% + frametitlebackgroundcolor,frametitlerulecolor,picins,figure},% moretexcs={newmdtheoremenv,newmdenv,theoremstyle,mdfsetup,@length,% md@putbox@single,@tempboxa,mdf@,% mdf@linewidth,mdf@leftmargin@length,interruptlength,% @@ -143,11 +143,12 @@ color,md@frame@leftline@single,mdf@innerbottommargin@length,% mdf@middlelinewidth@length,mdfboundingboxheight,% md@frame@rightline@single,mdfboundingboxwidth,% - mdf@innerrightmargin@length,mdfdefinestyle,mdfapptodefinestyle,defcounter, - tikzstyle,pgfdeclarehorizontalshading,theexercise,mdf@@exercisepoints, - define@key,renewrobustcmd,mdfcreateextratikz,node,ifdefempty, - mdf@frametitlefont,dimexpr,mdframedtitleenv,ifstrempty, - mdtheorem,surroundwithmdframed},% + mdf@innerrightmargin@length,mdfdefinestyle,mdfapptodefinestyle,defcounter,% + tikzstyle,pgfdeclarehorizontalshading,theexercise,mdf@@exercisepoints,% + define@key,renewrobustcmd,mdfcreateextratikz,node,ifdefempty,% + mdf@frametitlefont,dimexpr,mdframedtitleenv,ifstrempty,@undefined,% + mdtheorem,surroundwithmdframed,@captype,@dblarg,@newcaption,newcaption,% + },% } @@ -172,7 +173,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 347 2012-03-04 13:04:28Z marco $} +\date{\@@date$Id: ltxmdf.cls 350 2012-03-12 18:33:59Z 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 96beb5f2010..654e480785d 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 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 347 2012-03-04 13:04:28Z marco $% + [\mdf@frameOdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $% \mdversion: \mdframedOpackagename] \def\mdf@background@default{\color{\mdf@backgroundcolor}} \def\mdf@frametitlebackground@default{\color{\mdf@frametitlebackgroundcolor}} @@ -214,6 +214,17 @@ +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% +\def\mdf@frame@bottomline@first{% + \rlap{\ifbool{mdf@leftline}{\hspace*{-\mdf@middlelinewidth@length}}{}\mdf@linecolor@default% + \ifbool{mdf@bottomline}{% + \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]% + {\dimexpr\mdfboundingboxtotalwidth + \ifbool{mdf@rightline}{+\mdf@middlelinewidth@length}{}% + \ifbool{mdf@leftline}{+\mdf@middlelinewidth@length}{}\relax}% + {\mdf@middlelinewidth@length}}% + {}% + }% +}% \def\mdf@putbox@first{%%%% Ausgabe der Teilbox 1 \ifvoid\mdf@splitbox@two \else% @@ -239,6 +250,8 @@ \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \mdf@frame@leftline@first}{}% + \ifbool{mdf@everyline}% + {\mdf@frame@bottomline@first}{}% \ifbool{mdf@topline}{% \mdf@frame@topline@first}{}% \mdf@frame@background@first% @@ -305,6 +318,20 @@ {\mdfboundingboxtotalheight}% }% }% +\def\mdf@frame@topline@second{% + \rlap{\ifbool{mdf@leftline}{\hspace*{-\mdf@middlelinewidth@length}}{}\mdf@linecolor@default% + \ifbool{mdf@topline}{% + \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth% + +\mdf@innerbottommargin@length\relax]% + {\dimexpr\mdfboundingboxtotalwidth + \ifbool{mdf@rightline}{+\mdf@middlelinewidth@length}{}% + \ifbool{mdf@leftline}{+\mdf@middlelinewidth@length}{}\relax + }% + {\mdf@middlelinewidth@length}}% + {}% + }% +}% + \def\mdf@putbox@second{% \ifvoid\mdf@splitbox@one% \else @@ -328,6 +355,8 @@ \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \mdf@frame@leftline@second}{}% + \ifbool{mdf@everyline}% + {\mdf@frame@topline@second}{}% \mdf@frame@background@second% \ifbool{mdf@bottomline}{% \mdf@frame@bottomline@second}{}% @@ -384,6 +413,30 @@ {\mdfboundingboxtotalheight}% }% }% +\def\mdf@frame@topline@middle{% + \rlap{\ifbool{mdf@leftline}{\hspace*{-\mdf@middlelinewidth@length}}{}\mdf@linecolor@default% + \ifbool{mdf@topline}{% + \rule[\dimexpr\mdfboundingboxtotalheight-\mdfboundingboxdepth\relax]% + {\dimexpr\mdfboundingboxtotalwidth + \ifbool{mdf@rightline}{+\mdf@middlelinewidth@length}{}% + \ifbool{mdf@leftline}{+\mdf@middlelinewidth@length}{}\relax + }% + {\mdf@middlelinewidth@length}}% + {}% + }% +}% +\def\mdf@frame@bottomline@middle{% + \rlap{\ifbool{mdf@leftline}{\hspace*{-\mdf@middlelinewidth@length}}{}\mdf@linecolor@default% + \ifbool{mdf@bottomline}{% + \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]% + {\dimexpr\mdfboundingboxtotalwidth + \ifbool{mdf@rightline}{+\mdf@middlelinewidth@length}{}% + \ifbool{mdf@leftline}{+\mdf@middlelinewidth@length}{}\relax}% + {\mdf@middlelinewidth@length}}% + {}% + }% +}% + \def\mdf@putbox@middle{% \ifvoid\mdf@splitbox@two% \else @@ -408,7 +461,11 @@ \hspace*{\mdf@middlelinewidth@length}% \mdf@frame@leftline@middle}{}% \mdf@frame@background@middle% + \ifbool{mdf@everyline}% + {\mdf@frame@topline@middle}{}% \ifdefempty{\mdf@frametitle}{}{\mdf@frame@frametitlebackground@middle}% + \ifbool{mdf@everyline}% + {\mdf@frame@bottomline@middle}{}% \hspace*{\mdf@innerleftmargin@length}% \ifbool{mdf@rightline}{% \mdf@frame@rightline@middle}{}% 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 259bfecf2c2..fdc1fae9ba4 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 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 347 2012-03-04 13:04:28Z marco $ % + [\mdf@frameIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ % \mdversion: \mdframedIpackagename] \def\mdf@tikz@settings{% \tikzset{mdfbox/.style={anchor=south west,% @@ -271,7 +271,7 @@ \def\mdf@putbox@first{% \ifvoid\mdf@splitbox@two \else% - \mdf@makebox@out{% + \mdf@makebox@out{% \mdf@makeboxalign@left% \mdf@tikz@settings% \setlength\mdfboundingboxwidth{\wd\mdf@splitbox@two}% @@ -292,6 +292,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% %\ifdimequal{\pagegoal}{\maxdimen}{\enlargethispage{\baselineskip}}{}% ??? \ifdimgreater{\pagegoal-\maxdimen}{0pt}{}{\enlargethispage{\baselineskip}}% \mdf@makebox@in[\mdfboundingboxwidth]{% @@ -319,11 +327,67 @@ \pgfmathsetlengthmacro\mdf@Py% {\mdf@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}% }{}% +%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \pgfmathsetlengthmacro\mdf@Ay% + {\mdf@Ay+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length% + +\mdf@innerlinewidth@length}% + \pgfmathsetlengthmacro\mdf@Oy% + {\mdf@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}% + }{}% + \ifbool{mdf@topline}% + {% + \pgfmathsetlengthmacro\mdf@Py% + {\mdf@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}% + }{}% + }{}% +%% \coordinate(O)at(\mdf@Ox,\mdf@Oy);% \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow] (O) -- (O|-P) to[mdfcorners] (P) -- (P|-O) -- (O);}{}% \begin{scope}[use as bounding box] +%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \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)}}{}% + \mdf@test@trb{\mdf@tikzbox@tfl{(O|-P)--(P)--(P|-O)--(O)}}{}% + \mdf@test@ltr{\mdf@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}{}% + \mdf@test@lrb{\mdf@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}{}% + \mdf@test@lb{\mdf@tikzbox@otl{(P|-O)--(O)--(O|-P)}% + {(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}% + }{}% + \mdf@test@rb{\mdf@tikzbox@otl{(P)--(P|-O)--(O)}% + {(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}% + }{}% + \mdf@test@tr{\mdf@tikzbox@otl{(O-|P)--(P)--(P-|O)}% + {(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}% + }{}% + \mdf@test@lt{\mdf@tikzbox@otl{(O)--(O|-P)--(P)}% + {(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}% + }{}% + \mdf@test@lr{\mdf@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@tb{\mdf@tikzbox@otl{(O)--(O-|P)(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@l{\mdf@tikzbox@otl{(O)--(O|-P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@r{\mdf@tikzbox@otl{(O-|P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@t{\mdf@tikzbox@otl{(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@b{\mdf@tikzbox@otl{(O)--(O-|P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@noline{\path[mdfbackground,mdfcorners](O)rectangle(P);}{}% + }{ \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@ltr}}% {\mdf@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}% {}% @@ -347,6 +411,8 @@ {}% \mdf@test@b{\path[mdfbackground](O)rectangle(P);}{}% \mdf@test@noline{\path[mdfbackground,mdfcorners](O)--(O|-P)--(P)--(P|-O);}{}% + } +%%%%%%%%%%%% \drawbrackgroundframetitle@first \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% Ausgabebox einfuegen \end{scope} @@ -384,6 +450,23 @@ --(\mdf@Px,\mdf@Py) --(\mdf@Px,\mdf@Fy); \end{scope} }% +\def\drawbrackgroundframetitle@@middle{% + \begin{scope}%background frame title + \ifbool{mdf@leftline}{ + \pgfmathsetlengthmacro\mdf@Ox% + {\mdf@Ox+\mdf@innerlinewidth@length+0.5\mdf@middlelinewidth@length} + }{}% + \ifbool{mdf@rightline}{% + \pgfmathsetlengthmacro\mdf@Px% + {\mdf@Px-\mdf@innerlinewidth@length-0.5\mdf@middlelinewidth@length} + }{}% + \pgfmathsetlengthmacro\mdf@Fy + {\mdf@Py-\mdfframetitleboxtotalheight} + \path[mdfframetitlebackground,rounded corners=\z@] + (\mdf@Ox,\mdf@Fy) -- (\mdf@Ox,\mdf@Py)% + --(\mdf@Px,\mdf@Py) --(\mdf@Px,\mdf@Fy); + \end{scope} +}% \def\mdf@putbox@middle{% \ifvoid\mdf@splitbox@two \else% @@ -403,6 +486,18 @@ \advance\mdfboundingboxwidth by \mdf@outerlinewidth@length\relax}{}% \setlength\mdfboundingboxheight{\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax}% \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% \begin{tikzpicture}[remember picture] @@ -425,11 +520,67 @@ \pgfmathsetlengthmacro\mdf@Px% {\mdf@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}% }{}% +%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \pgfmathsetlengthmacro\mdf@Ay% + {\mdf@Ay+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length% + +\mdf@innerlinewidth@length}% + \pgfmathsetlengthmacro\mdf@Oy% + {\mdf@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}% + }{}% + \ifbool{mdf@topline}% + {% + \pgfmathsetlengthmacro\mdf@Py% + {\mdf@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}% + }{}% + }{}% +%% \coordinate(O)at(\mdf@Ox,\mdf@Oy);% \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow](O) rectangle (P);}{}% \begin{scope}[use as bounding box] +%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \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)}}{}% + \mdf@test@trb{\mdf@tikzbox@tfl{(O|-P)--(P)--(P|-O)--(O)}}{}% + \mdf@test@ltr{\mdf@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}{}% + \mdf@test@lrb{\mdf@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}{}% + \mdf@test@lb{\mdf@tikzbox@otl{(P|-O)--(O)--(O|-P)}% + {(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}% + }{}% + \mdf@test@rb{\mdf@tikzbox@otl{(P)--(P|-O)--(O)}% + {(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}% + }{}% + \mdf@test@tr{\mdf@tikzbox@otl{(O-|P)--(P)--(P-|O)}% + {(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}% + }{}% + \mdf@test@lt{\mdf@tikzbox@otl{(O)--(O|-P)--(P)}% + {(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}% + }{}% + \mdf@test@lr{\mdf@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@tb{\mdf@tikzbox@otl{(O)--(O-|P)(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@l{\mdf@tikzbox@otl{(O)--(O|-P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@r{\mdf@tikzbox@otl{(O-|P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@t{\mdf@tikzbox@otl{(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@b{\mdf@tikzbox@otl{(O)--(O-|P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@noline{\path[mdfbackground,mdfcorners](O)rectangle(P);}{}% + }{ \ifboolexpr{bool {mdf@leftline} and bool {mdf@rightline}}% {\mdf@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}{}% \ifboolexpr{bool {mdf@leftline} and not (bool {mdf@rightline})}% @@ -438,6 +589,8 @@ {\mdf@tikzbox@otl{(P)--(P|-O)}{(O)rectangle(P)}}{}% \ifboolexpr{not (bool {mdf@leftline}) and not (bool {mdf@rightline})}% {\path[mdfbackground](O)rectangle(P);}{}% + } +%%%%%%%% \drawbrackgroundframetitle@middle \node[mdfbox]at(\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@two};% Ausgabebox einfuegen \end{scope} @@ -497,6 +650,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% \begin{tikzpicture}[remember picture] @@ -527,11 +688,59 @@ \pgfmathsetlengthmacro\mdf@Oy% {\mdf@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}% }{}% +%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}% + {% + \pgfmathsetlengthmacro\mdf@Py% + {\mdf@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}% + }{}% + }{}% +%% \coordinate(O)at(\mdf@Ox,\mdf@Oy);% \coordinate(P)at(\mdf@Px,\mdf@Py);% \ifbool{mdf@shadow} {\path[mdfshadow] (O|-P) to[mdfcorners] (O) to[mdfcorners] (P|-O) -- (P) -- (O|-P);}{}% \begin{scope}[use as bounding box] +%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \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)}}{}% + \mdf@test@trb{\mdf@tikzbox@tfl{(O|-P)--(P)--(P|-O)--(O)}}{}% + \mdf@test@ltr{\mdf@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}{}% + \mdf@test@lrb{\mdf@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}{}% + \mdf@test@lb{\mdf@tikzbox@otl{(P|-O)--(O)--(O|-P)}% + {(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}% + }{}% + \mdf@test@rb{\mdf@tikzbox@otl{(P)--(P|-O)--(O)}% + {(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}% + }{}% + \mdf@test@tr{\mdf@tikzbox@otl{(O-|P)--(P)--(P-|O)}% + {(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}% + }{}% + \mdf@test@lt{\mdf@tikzbox@otl{(O)--(O|-P)--(P)}% + {(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}% + }{}% + \mdf@test@lr{\mdf@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@tb{\mdf@tikzbox@otl{(O)--(O-|P)(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@l{\mdf@tikzbox@otl{(O)--(O|-P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@r{\mdf@tikzbox@otl{(O-|P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@t{\mdf@tikzbox@otl{(O|-P)--(P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@b{\mdf@tikzbox@otl{(O)--(O-|P)}% + {(O)rectangle(P)}% + }{}% + \mdf@test@noline{\path[mdfbackground,mdfcorners](O)rectangle(P);}{}% + }{% \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@lrb}}% {\mdf@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}% {}% @@ -555,6 +764,7 @@ {}% \mdf@test@t{\path[mdfbackground,mdfcorners](O|-P)--(O)--(O-|P)--(P);}{}% \mdf@test@noline{\path[mdfbackground,mdfcorners](O|-P)--(O)--(O-|P)--(P);}{}% + }% \drawbrackgroundframetitle@second \node[mdfbox] at (\mdf@Ax,\mdf@Ay){\box\mdf@splitbox@one};% Ausgabebox einfuegen \end{scope} 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 60f37ddf674..67ac75bd577 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 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 347 2012-03-04 13:04:28Z marco $ % + [\mdf@frameIIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 } @@ -297,6 +297,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}% \expandafter\psset\expandafter{\mdf@psset@local}% \mdf@makebox@in[\mdfboundingboxwidth]{% @@ -329,6 +337,18 @@ \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} }{}% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \nodexn{(mdf@A)+(0,\mdf@outerlinewidth@length) + +(0,\mdf@middlelinewidth@length) + +(0,\mdf@innerlinewidth@length)}{mdf@A}% + \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) + +0.5(0,\mdf@middlelinewidth@length)}{mdf@O}% + }{}% + }{}% +%%%%%%%%%% \ifbool{mdf@shadow} {\pscustom[style=mdfshadow,linestyle=none]{% \psline[linejoin=2,linecap=1,](mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)% @@ -336,6 +356,37 @@ \closedshadow } }{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% %Four or Three lines \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@ltr}}% {\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}% @@ -360,6 +411,7 @@ %no line \mdf@test@b{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@first %output% @@ -427,6 +479,18 @@ \advance\mdfboundingboxwidth by \mdf@outerlinewidth@length\relax}{}% \setlength\mdfboundingboxheight{\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax}% \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{unit=1truecm}% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% @@ -454,9 +518,57 @@ -0.5(\mdf@middlelinewidth@length,0)}{mdf@P} }{}% %% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \nodexn{(mdf@A)+(0,\mdf@outerlinewidth@length) + +(0,\mdf@middlelinewidth@length) + +(0,\mdf@innerlinewidth@length)}{mdf@A}% + \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) + +0.5(0,\mdf@middlelinewidth@length)}{mdf@O}% + }{}% + \ifbool{mdf@topline}% + {% + \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) + -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} + }{}% + }{}% +%%%%%%%%%% %% \ifbool{mdf@shadow} {\psframe[style=mdfshadow](mdf@O)(mdf@P)}{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% \ifboolexpr{bool {mdf@leftline} and bool {mdf@rightline}}% {\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)}}{}% \ifboolexpr{bool {mdf@leftline} and not (bool {mdf@rightline})}% @@ -465,6 +577,7 @@ {\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{}% \ifboolexpr{not (bool {mdf@leftline}) and not (bool {mdf@rightline})}% {\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@middle %output% @@ -521,6 +634,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{unit=1truecm}% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% @@ -552,6 +673,15 @@ \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) +0.5(0,\mdf@middlelinewidth@length)}{mdf@O} }{}% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}% + {% + \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) + -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} + }{}% + }{}% +%%%%%%%%%% %% \ifbool{mdf@shadow} {\pscustom[style=mdfshadow,linestyle=none]{% @@ -560,6 +690,37 @@ \closedshadow } }{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% %Four + Three \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@lrb}}% {\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% @@ -583,6 +744,7 @@ %no line \mdf@test@t{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@second %output% 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 60f37ddf674..67ac75bd577 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 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 347 2012-03-04 13:04:28Z marco $ % + [\mdf@frameIIdate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z 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 } @@ -297,6 +297,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}% \expandafter\psset\expandafter{\mdf@psset@local}% \mdf@makebox@in[\mdfboundingboxwidth]{% @@ -329,6 +337,18 @@ \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} }{}% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \nodexn{(mdf@A)+(0,\mdf@outerlinewidth@length) + +(0,\mdf@middlelinewidth@length) + +(0,\mdf@innerlinewidth@length)}{mdf@A}% + \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) + +0.5(0,\mdf@middlelinewidth@length)}{mdf@O}% + }{}% + }{}% +%%%%%%%%%% \ifbool{mdf@shadow} {\pscustom[style=mdfshadow,linestyle=none]{% \psline[linejoin=2,linecap=1,](mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)% @@ -336,6 +356,37 @@ \closedshadow } }{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% %Four or Three lines \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@ltr}}% {\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}% @@ -360,6 +411,7 @@ %no line \mdf@test@b{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@first %output% @@ -427,6 +479,18 @@ \advance\mdfboundingboxwidth by \mdf@outerlinewidth@length\relax}{}% \setlength\mdfboundingboxheight{\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax}% \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + \ifbool{mdf@bottomline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{unit=1truecm}% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% @@ -454,9 +518,57 @@ -0.5(\mdf@middlelinewidth@length,0)}{mdf@P} }{}% %% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}% + {% + \nodexn{(mdf@A)+(0,\mdf@outerlinewidth@length) + +(0,\mdf@middlelinewidth@length) + +(0,\mdf@innerlinewidth@length)}{mdf@A}% + \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) + +0.5(0,\mdf@middlelinewidth@length)}{mdf@O}% + }{}% + \ifbool{mdf@topline}% + {% + \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) + -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} + }{}% + }{}% +%%%%%%%%%% %% \ifbool{mdf@shadow} {\psframe[style=mdfshadow](mdf@O)(mdf@P)}{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% \ifboolexpr{bool {mdf@leftline} and bool {mdf@rightline}}% {\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)}}{}% \ifboolexpr{bool {mdf@leftline} and not (bool {mdf@rightline})}% @@ -465,6 +577,7 @@ {\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{}% \ifboolexpr{not (bool {mdf@leftline}) and not (bool {mdf@rightline})}% {\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@middle %output% @@ -521,6 +634,14 @@ \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% +%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax% + \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}% + }{}% +%%%%%%%%%%%%%% \psset{unit=1truecm}% \mdf@makebox@in[\mdfboundingboxwidth]{% \null% @@ -552,6 +673,15 @@ \nodexn{(mdf@O)+(0,\mdf@outerlinewidth@length) +0.5(0,\mdf@middlelinewidth@length)}{mdf@O} }{}% +%%%%%%%%%%% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}% + {% + \nodexn{(mdf@P)-(0,\mdf@outerlinewidth@length) + -0.5(0,\mdf@middlelinewidth@length)}{mdf@P} + }{}% + }{}% +%%%%%%%%%% %% \ifbool{mdf@shadow} {\pscustom[style=mdfshadow,linestyle=none]{% @@ -560,6 +690,37 @@ \closedshadow } }{} +%%%%%%%%%%%%% + \ifbool{mdf@everyline}{% + %Four lines + \mdf@test@ltrb{\mdf@pstricksbox@fl{mdf@O}{mdf@P}}{} + %three lines + \mdf@test@ltb{\mdf@pstricksbox@tl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + \mdf@test@trb{\mdf@pstricksbox@tl{(mdf@O)(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@ltr{\mdf@pstricksbox@tl{(mdf@O)(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{}% + \mdf@test@lrb{\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% + %two lines combinded + \mdf@test@lb{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@P)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)}}{} + \mdf@test@rb{\mdf@pstricksbox@tcl{(mdf@P)(mdf@O|mdf@P)(mdf@O)}% + {(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{} + \mdf@test@tr{\mdf@pstricksbox@tcl{(mdf@P|mdf@O)(mdf@O)(mdf@O|mdf@P)}% + {(mdf@O|mdf@P)(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@lt{\mdf@pstricksbox@tcl{(mdf@O)(mdf@P|mdf@O)(mdf@P)}% + {(mdf@O)(mdf@O|mdf@P)(mdf@P)}}{} + %two lines not combinded combinded + \mdf@test@lr{\mdf@pstricksbox@tncl{(mdf@O|mdf@P)}{(mdf@P|mdf@O)} + }{} + \mdf@test@tb{\mdf@pstricksbox@tncl{(mdf@P|mdf@O)}{(mdf@O|mdf@P)} + }{} + %single line + \mdf@test@l{\mdf@pstricksbox@ol{(mdf@O)(mdf@O|mdf@P)}}{} + \mdf@test@r{\mdf@pstricksbox@ol{(mdf@P)(mdf@P|mdf@O)}}{} + \mdf@test@t{\mdf@pstricksbox@ol{(mdf@P)(mdf@O|mdf@P)}}{} + \mdf@test@b{\mdf@pstricksbox@ol{(mdf@O)(mdf@P|mdf@O)}}{} + %no line + \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }{% %Four + Three \ifboolexpr{test {\mdf@test@ltrb} or test {\mdf@test@lrb}}% {\mdf@pstricksbox@tl{(mdf@O|mdf@P)(mdf@O)(mdf@P|mdf@O)(mdf@P)}}{}% @@ -583,6 +744,7 @@ %no line \mdf@test@t{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% \mdf@test@noline{\psframe[style=mdfbackgroundstyle](mdf@O)(mdf@P)}{}% + }% %Frametitlebackground \drawbrackgroundframetitle@second %output% diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index ed201b7ec4b..2103353e87a 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -29,6 +29,7 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% +%% %% ================================================= %% Erstellung eines Rahmens, der am Seitenende keine %% horizontale Linie einfuegt @@ -47,12 +48,12 @@ %% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> %% ================================================== %% -\def\mdversion{v1.4} +\def\mdversion{v1.4d} \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 347 2012-03-04 13:04:28Z marco $% + [\mdf@maindate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $% \mdversion: \mdframedpackagename] \newcommand*\mdf@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}} \newcommand*\mdf@PackageInfo[1]{\PackageInfo{\mdframedpackagename}{#1}} @@ -243,13 +244,21 @@ {frametitleleftline==true},% {frametitlebottomline==true},% {frametitlerightline==true},% - {hidealllines==false},% {frametitlerule==false},% {nobreak==false},% {footnoteinside==true},% {usetwoside==true},% {repeatframetitle==false},%Noch nicht richtig implementiert {shadow==false},% + {everyline==false},% +} +%%special boolflag hidealllines: +\newbool{mdf@hidealllines}% +\define@key{mdf}{hidealllines}[false]{% +\setbool{mdf@hidealllines}{#1}% + \ifbool{mdf@hidealllines}{% + \setkeys{mdf}{leftline=false,topline=false,rightline=false,bottomline=false}% + }{}% } \mdf@dolist{\mdf@do@alignoption}{% {left==\mdf@leftmargin@length==\z@},% @@ -707,7 +716,7 @@ \newenvironment{mdframed}[1][]{% \color@begingroup% \mdfsetup{userdefinedwidth=\linewidth,#1}% - \mdf@hidealllines@check% +%%% \mdf@hidealllines@check% \mdf@twoside@checklength% \let\width\z@% \let\height\z@% @@ -722,7 +731,7 @@ \mdf@settings% \mdf@lrbox{\mdf@splitbox@one}% }% - {\par\unskip\nointerlineskip\hrule \@height\z@ \@width\hsize%% + {\par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%% \ifmdf@footnoteinside% \def\mdf@reserveda{% \mdf@footnoteoutput% @@ -910,6 +919,13 @@ \mdf@dolist{\mdf@advancelength@freevspace@sub}{%calculate with \dimen@ outerlinewidth,middlelinewidth,innerlinewidth,% innertopmargin,splitbottomskip}% + \ifbool{mdf@everyline}{% + \ifbool{mdf@bottomline}{% + \advance\dimen@ by -\mdf@innerlinewidth@length% + \advance\dimen@ by -\mdf@middlelinewidth@length% + \advance\dimen@ by -\mdf@outerlinewidth@length% + }{}% + }{}% \ifbool{mdf@topline}{}{% \advance\dimen@ by \mdf@innerlinewidth@length% \advance\dimen@ by \mdf@middlelinewidth@length% @@ -956,6 +972,16 @@ \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \dimen@i \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@}% + {% + \splittopskip\z@\mdf@ignorevbadness%% + \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@two% + %benoetigt um Tiefe zu haben + \hrule \@height\dp\strutbox \@width\z@ + \unvbox\mdf@splitbox@one}% + \mdf@ignorevbadness% + \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}% + }{}% \ifbool{mdf@repeatframetitle}{% \setbox\mdf@splitbox@one\vbox{% \vbox to \mdf@splittopskip@length{\hsize\z@} @@ -983,7 +1009,7 @@ \fi \ifvoid\mdf@splitbox@two%%pruefe, ob erste Box leer ist \hrule \@height\z@ \@width\hsize - \vfill\eject% + %%\vfill\eject% \def\mdf@reserved@a{\mdf@put@frame}% \else \ifdimequal{\ht\mdf@splitbox@two}{0pt}% @@ -1011,19 +1037,34 @@ \mdf@dolist{\mdf@advancelength@freevspace@add}{%used \dimen@ outerlinewidth,middlelinewidth,innerlinewidth,% innerbottommargin}%%%Addition der Linien unten + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\dimen@ by \mdf@innerlinewidth@length% + \advance\dimen@ by \mdf@middlelinewidth@length% + \advance\dimen@ by \mdf@outerlinewidth@length% + }{}% + }{}% \ifbool{mdf@bottomline}{}{% - \advance\dimen@i by \mdf@innerlinewidth@length% - \advance\dimen@i by \mdf@middlelinewidth@length% - \advance\dimen@i by \mdf@outerlinewidth@length% + \advance\dimen@ by -\mdf@innerlinewidth@length% + \advance\dimen@ by -\mdf@middlelinewidth@length% + \advance\dimen@ by -\mdf@outerlinewidth@length% \relax}% \ifdimgreater{\dimen@}{\mdf@freevspace@length}% {% - \advance\mdf@freevspace@length by -\mdf@splitbottomskip@length\relax% - \ifbool{mdf@bottomline}{}{% - \advance\dimen@i by -\mdf@innerlinewidth@length% - \advance\dimen@i by -\mdf@middlelinewidth@length% - \advance\dimen@i by -\mdf@outerlinewidth@length% - \relax}% + \advance\mdf@freevspace@length by -\mdf@splitbottomskip@length\relax% + \advance\mdf@freevspace@length by .5\ht\strutbox\relax% + \ifbool{mdf@everyline}{% + \ifbool{mdf@topline}{% + \advance\mdf@freevspace@length by -\mdf@innerlinewidth@length% + \advance\mdf@freevspace@length by -\mdf@middlelinewidth@length% + \advance\mdf@freevspace@length by -\mdf@outerlinewidth@length% + }{}% + \ifbool{mdf@bottomline}{% + \advance\mdf@freevspace@length by -\mdf@innerlinewidth@length% + \advance\mdf@freevspace@length by -\mdf@middlelinewidth@length% + \advance\mdf@freevspace@length by -\mdf@outerlinewidth@length% + \relax}{}% + }{}% \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length% \mdf@ignorevbadness% \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \mdf@freevspace@length% |