From 7e8d5077cc44657bb237d8e86fc50a9d84d7336c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Nov 2011 23:44:42 +0000 Subject: mdframed 1.0 (14nov11) git-svn-id: svn://tug.org/texlive/trunk@24594 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mdframed/md-frame-0.mdf | 240 +++++++++++++-------- 1 file changed, 146 insertions(+), 94 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf') 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 fa8693bfa0e..ccad5636f2e 100644 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf +++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf @@ -8,70 +8,87 @@ %% 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 201 2011-10-04 18:57:50Z marco $ -%%$Rev: 201 $ +%%$Id: md-frame-0.mdf 219 2011-11-13 14:17:56Z marco $ +%%$Rev: 219 $ %%$Author: marco $ -%%$Date: 2011-10-04 20:57:50 +0200 (Di, 04. Okt 2011) $ +%%$Date: 2011-11-13 15:17:56 +0100 (So, 13. Nov 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 201 2011-10-04 18:57:50Z marco $ \mdversion: \mdframedOpackagename] +\ProvidesFile{md-frame-0.mdf}[\md@frameOdate@svn$Id: md-frame-0.mdf 219 2011-11-13 14:17:56Z marco $ \mdversion: \mdframedOpackagename] + +%Hilfparameter +\def\mdf@background@default{\color{\mdf@backgroundcolor}} +\def\mdf@linecolor@default{\color{\mdf@middlelinecolor}} + %%==================================================%% %%================single-box========================%% %%==================================================%% \def\md@frame@background@single{% - \rlap{\color{\mdf@backgroundcolor}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length]{\mdfboundingboxwidth% - +\mdf@innerleftmargin@length+\mdf@innerrightmargin@length% - }{\mdfboundingboxheight}% + \rlap{\mdf@background@default% + \rule[-\mdfboundingboxdepth]% + {\mdfboundingboxtotalwidth}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@frame@topandbottomline@single{% - \rlap{\color{\mdf@middlelinecolor}% - \ifbool{mdf@topline}{\rule[\ht\@tempboxa+\mdf@innertopmargin@length] - {\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% - {\mdf@middlelinewidth@length}}{}% - }% - \rlap{\color{\mdf@middlelinecolor}% - \ifbool{mdf@bottomline}{\rule[-\dp\@tempboxa-\mdf@innerbottommargin@length% - -\mdf@middlelinewidth@length]{\mdfboundingboxwidth+% - \mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% - {\mdf@middlelinewidth@length}}{}% - }% + \rlap{\mdf@linecolor@default% + \ifbool{mdf@topline}{% + \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth+\mdf@innerbottommargin@length+\mdf@innertopmargin@length\relax] + {\mdfboundingboxtotalwidth}% + {\mdf@middlelinewidth@length}}% + {}% + }% + \rlap{\mdf@linecolor@default% + \ifbool{mdf@bottomline}{% + \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]% + {\mdfboundingboxtotalwidth}% + {\mdf@middlelinewidth@length}}% + {}% + }% } % \def\md@frame@leftline@single{% - \llap{\color{\mdf@middlelinecolor}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length% - \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}]% - {\mdf@middlelinewidth@length}{\mdfboundingboxheight% + \llap{\mdf@linecolor@default% + \rule[\dimexpr-\mdfboundingboxdepth% + \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]% + {\mdf@middlelinewidth@length}% + {\dimexpr\mdfboundingboxtotalheight% +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt} - +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}}% + +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@frame@rightline@single{% - \rlap{\color{\mdf@middlelinecolor}% + \rlap{\mdf@linecolor@default% \hspace*{\mdfboundingboxwidth}% \hspace*{\mdf@innerrightmargin@length}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length% - \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}]% - {\mdf@middlelinewidth@length}{\mdfboundingboxheight% + \rule[\dimexpr-\mdfboundingboxdepth% + \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]% + {\mdf@middlelinewidth@length}% + {\dimexpr\mdfboundingboxtotalheight% +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}% - +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}}% + +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@putbox@single{%%%%% Ausgabe der ungesplitteten Gesamtbox \ifvoid\@tempboxa - \else - \leftline{% - \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}% - \setlength{\mdfboundingboxheight}{\ht\@tempboxa+\dp\@tempboxa}% - \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax% - \advance\mdfboundingboxheight by \mdf@innerbottommargin@length\relax% - \null\hspace*{\mdf@leftmargin@length}% + \else% + \mdf@makebox[\linewidth]{% + \mdf@makeboxalign@left% + \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}% + \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}% + \setlength{\mdfboundingboxheight}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}% + \setlength{\mdfboundingboxdepth}{\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}% + \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length+\mdf@innerbottommargin@length\relax}% + \noindent% + \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth% + +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}% + +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}% + \mdf@makebox[\@tempdima]{% + \null% \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \md@frame@leftline@single% @@ -83,51 +100,63 @@ \md@frame@rightline@single% }{}% {\box\@tempboxa}% - }% - \fi + }% + \mdf@makeboxalign@right% + }% + \fi% } %%==================================================%% %%================first-box=========================%% %%==================================================%% % \def\md@frame@background@first{% - \rlap{\color{\mdf@backgroundcolor}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% - {\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% - {\mdfboundingboxheight}% + \rlap{\mdf@background@default% + \rule[-\mdfboundingboxdepth]% + {\mdfboundingboxtotalwidth}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@frame@leftline@first{% - \llap{\color{\mdf@middlelinecolor}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% + \llap{\mdf@linecolor@default% + \rule[-\mdfboundingboxdepth]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}}% + {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@frame@topline@first{% - \rlap{\color{\mdf@middlelinecolor}% - \rule[\ht\tw@+\mdf@innertopmargin@length] - {\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% + \rlap{\mdf@linecolor@default% + \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth+\mdf@splitbottomskip@length+\mdf@innertopmargin@length\relax] + {\mdfboundingboxtotalwidth}% {\mdf@middlelinewidth@length}% }% } % \def\md@frame@rightline@first{% - \rlap{\color{\mdf@middlelinecolor}\hspace*{\mdfboundingboxwidth}% + \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}% \hspace*{\mdf@innerrightmargin@length}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% + \rule[-\mdfboundingboxdepth]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}}% + {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@putbox@first{%%%% Ausgabe der Teilbox 1 - \leftline{% - \setlength{\mdfboundingboxwidth}{\wd\tw@}% - \setlength{\mdfboundingboxheight}{\ht\tw@+\dp\tw@+\mdf@innertopmargin@length+\mdf@splitbottomskip@length}% - \null\hspace*{\mdf@leftmargin@length}% + \ifvoid\@tempboxa + \else% + \mdf@makebox[\linewidth]{% + \mdf@makeboxalign@left% + \setlength{\mdfboundingboxwidth}{\wd\tw@}% + \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}% + \setlength{\mdfboundingboxheight}{\dimexpr\ht\tw@+\dp\tw@\relax}% + \setlength{\mdfboundingboxdepth}{\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}% + \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length+\mdf@splitbottomskip@length\relax}% + \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth% + +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}% + +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}% + \mdf@makebox[\@tempdima]{% + \null% \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \md@frame@leftline@first}{}% @@ -138,55 +167,64 @@ \ifbool{mdf@rightline}{% \md@frame@rightline@first}{}% {\box\tw@}% - }% + }% + \mdf@makeboxalign@right% + }% + \fi% } %%==================================================%% %%=================last-box=========================%% %%==================================================%% \def\md@frame@background@second{% - \rlap{\color{\mdf@backgroundcolor}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length]% - {\mdfboundingboxwidth+\mdf@innerleftmargin@length% - +\mdf@innerrightmargin@length}% - {\mdfboundingboxheight}% + \rlap{\mdf@background@default% + \rule[-\mdfboundingboxdepth]% + {\mdfboundingboxtotalwidth}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@frame@leftline@second{% - \llap{\color{\mdf@middlelinecolor}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length% - -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}]% + \llap{\mdf@linecolor@default% + \rule[\dimexpr-\mdfboundingboxdepth% + -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}}% + {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@frame@bottomline@second{% - \rlap{\color{\mdf@middlelinecolor}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length-\mdf@middlelinewidth@length] - {\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% + \rlap{\mdf@linecolor@default% + \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax] + {\mdfboundingboxtotalwidth}% {\mdf@middlelinewidth@length}% }% }% % \def\md@frame@rightline@second{% - \rlap{\color{\mdf@middlelinecolor}\hspace*{\mdfboundingboxwidth}% + \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}% \hspace*{\mdf@innerrightmargin@length}% - \rule[-\dp\@tempboxa-\mdf@innerbottommargin@length% - -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}]% + \rule[\dimexpr-\mdfboundingboxdepth% + -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}}% + {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}% }% }% % \def\md@putbox@second{% \ifvoid\@tempboxa% \else - \leftline{% - \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}% - \setlength{\mdfboundingboxheight}{\ht\@tempboxa+\dp\@tempboxa}% - \advance\mdfboundingboxheight by \mdf@innerbottommargin@length\relax% - \null\hspace*{\mdf@leftmargin@length}% + \mdf@makebox[\linewidth]{% + \mdf@makeboxalign@left% + \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}% + \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}% + \setlength{\mdfboundingboxheight}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}% + \setlength{\mdfboundingboxdepth}{\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}% + \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innerbottommargin@length\relax}% + \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth% + +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}% + +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}% + \mdf@makebox[\@tempdima]{% + \null% \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \md@frame@leftline@second}{}% @@ -197,43 +235,54 @@ \ifbool{mdf@rightline}{% \md@frame@rightline@second}{}% {\box\@tempboxa}% - }% + }% + \mdf@makeboxalign@right% + }% \fi% }% %%==================================================%% %%================middle-box========================%% %%==================================================%% \def\md@frame@background@middle{% - \rlap{\color{\mdf@backgroundcolor}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% - {\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length}% - {\mdfboundingboxheight}% + \rlap{\mdf@background@default% + \rule[-\mdfboundingboxdepth]% + {\mdfboundingboxtotalwidth}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@frame@leftline@middle{% - \llap{\color{\mdf@middlelinecolor}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% + \llap{\mdf@linecolor@default% + \rule[-\mdfboundingboxdepth]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@frame@rightline@middle{% - \rlap{\color{\mdf@middlelinecolor}\hspace*{\mdfboundingboxwidth}% + \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}% \hspace*{\mdf@innerrightmargin@length}% - \rule[-\dp\tw@-\mdf@splitbottomskip@length]% + \rule[-\mdfboundingboxdepth]% {\mdf@middlelinewidth@length}% - {\mdfboundingboxheight}% + {\mdfboundingboxtotalheight}% }% }% % \def\md@putbox@middle{% - \leftline{% - \setlength{\mdfboundingboxwidth}{\wd\tw@}% - \setlength{\mdfboundingboxheight}{\ht\tw@+\dp\tw@}% - \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% - \null\hspace*{\mdf@leftmargin@length}% + \ifvoid\@tempboxa% + \else + \mdf@makebox[\linewidth]{% + \mdf@makeboxalign@left% + \setlength{\mdfboundingboxwidth}{\wd\tw@}% + \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}% + \setlength{\mdfboundingboxheight}{\dimexpr\ht\tw@+\dp\tw@\relax}% + \setlength{\mdfboundingboxdepth}{\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}% + \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@splitbottomskip@length\relax}% + \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth% + +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}% + +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}% + \mdf@makebox[\@tempdima]{% + \null% \ifbool{mdf@leftline}{% \hspace*{\mdf@middlelinewidth@length}% \md@frame@leftline@middle}{}% @@ -242,5 +291,8 @@ \ifbool{mdf@rightline}{% \md@frame@rightline@middle}{} {\box\tw@}% - }% + }% + \mdf@makeboxalign@right% + }% + \fi% } -- cgit v1.2.3