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 | |
| parent | 93c07a86f19018344711d41ae457b84cec166642 (diff) | |
mdframed (30mar12)
git-svn-id: svn://tug.org/texlive/trunk@25789 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
17 files changed, 1237 insertions, 121 deletions
diff --git a/Master/texmf-dist/doc/latex/mdframed/README b/Master/texmf-dist/doc/latex/mdframed/README.txt index df8944c8a17..df8944c8a17 100644 --- a/Master/texmf-dist/doc/latex/mdframed/README +++ b/Master/texmf-dist/doc/latex/mdframed/README.txt diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf Binary files differindex 03f05e2b286..ba63fe82ea2 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex index 565cda9ce03..b4467a39c58 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -12,7 +12,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf Binary files differindex 241b159d56c..dc3f25b0980 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex index 4e7c3604b51..fc69fcae2f2 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \lstDeleteShortInline{|} \newcommand\Loadedframemethod{PSTricks} @@ -13,7 +13,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf Binary files differindex 3cbbefdd207..014cd025604 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex index c69d71276ed..bcf3160faed 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex @@ -1,8 +1,8 @@ -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt,ltxlipsum]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -13,7 +13,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf Binary files differindex ee9dc14713d..02356cb4c36 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex index e40bc39154d..ac5a5ee9c31 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -12,7 +12,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf Binary files differindex aac2611d618..fbe07f6036a 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf diff --git a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx index 71b3456ee66..58ed7a504df 100644 --- a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx +++ b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx @@ -206,11 +206,11 @@ Have fun! \fi %</internal> %<*driver> -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,11pt,]{ltxmdf} \usepackage[framemethod=TikZ]{mdframed} -\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \EnableCrossrefs \CodelineIndex @@ -221,7 +221,7 @@ Have fun! %</driver> % \fi % -% \CheckSum{5231} +% \CheckSum{5807} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -250,7 +250,7 @@ Have fun! % \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}% % \href{mailto:marco.daniel@mada-nada.de}{Elke Schubert}}} % \version{\mdversion} -% \date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +% \date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} % \introduction{The standard methods for framing text (\Cmd{fbox} % or \Cmd{fcolorbox}) require you to handle page breaks % by hand, meaning that you have to split the \Cmd{fbox} @@ -799,6 +799,9 @@ Have fun! % % \subsubsection{General options}\label{genopt} % +% +% \ExplOpt[false]{everyline} +% Allows to draw a bottom and a top line at splitted frames. % \ExplOpt[\{\}]{font} % Sets the font of the environment. % \ExplOpt[false]{ntheorem} @@ -1219,6 +1222,28 @@ Have fun! % % \begin{enumerate} % \item So far the environment isn't compatible with the package \Pack{gmverb}. +% \item If you load the package \Pack{picins} the frame will no be splitted. +% That based on a problem of the package `picins` which defines +% \Cmd{@captype} global. +% To work with the package picins you can use the following hack. +% \iffalse +%<*example> +% \fi +\begin{tltxmdfexample} +\usepackage{picins} +\makeatletter +\let\@captype\@undefined +\def\newcaption{% + \begingroup% + \def\@captype{figure}% + \refstepcounter\@captype\@dblarg{\@newcaption\@captype}% + \endgroup% +} +\makeatother +\end{tltxmdfexample} +% \iffalse +%</example> +% \fi % \end{enumerate} % % @@ -1234,6 +1259,8 @@ Have fun! % \item Improve footnotes. % \item Improve documentation and examples. % \item Create styles for \Opt{frametitle}. +% \item Create an inline version of \Env{mdframed} that's works like \Cmd{fbox} +% \item Add \Cmd{ht}\Cmd{strutbox} to file \Pack{md-frame-1.mdf} % \end{enumerate} % % \section{Acknowledgements} @@ -1408,6 +1435,17 @@ Have fun! % % \subsection{Revision history}\label{rev} % \raggedright +% \minisec{Version 1.4d submitted 30 Mar 2012} +% \begin{itemize*} +% \item fixed bug (Thanks Nicolas Roy) +% \item added approach to documentation to work with \Pack{picins} +% \item new implementation of option \Opt{hidealllines}, now you can set +% \Cmd{mdfsetup}\Opt{\{hidealllines=true,leftline=true\}} printing +% only the left line (inspired by Tobias Schwan) +% \item added option \Opt{everyline} to draw a top and bottom line at +% splitted frames +% \end{itemize*} +% % \minisec{Version 1.4 submitted 4 Mar 2012} % \begin{itemize*} % \item fixed bug in combination with \Cmd{marginpar} (Thanks Juan Carlos Trujillo Ortega) @@ -1576,14 +1614,14 @@ Have fun! % % \subsection{The Explanation of mdframed.sty} % -% %$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ -% %$Rev: 347 $ +% %$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +% %$Rev: 362 $ % %$Author: marco $ -% %$Date: 2012-03-04 14:04:28 +0100 (So, 04. Mär 2012) $ +% %$Date: 2012-03-30 08:55:35 +0200 (Fr, 30. Mär 2012) $ % \begin{macro}{mdversion,mdframedpackagename,mdf@maindate@svn} % Set package information % \begin{macrocode} -\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 } % \end{macrocode} @@ -1592,7 +1630,7 @@ Have fun! % \begin{macrocode} \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] % \end{macrocode} % @@ -1885,13 +1923,22 @@ Have fun! {frametitleleftline==true},% {frametitlebottomline==true},% {frametitlerightline==true},% - {hidealllines==false},% +% {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}% + }{}% } % \end{macrocode} % \end{macro} @@ -2582,7 +2629,7 @@ Have fun! \newenvironment{mdframed}[1][]{% \color@begingroup% \mdfsetup{userdefinedwidth=\linewidth,#1}% - \mdf@hidealllines@check% +%%% \mdf@hidealllines@check% \mdf@twoside@checklength% \let\width\z@% \let\height\z@% @@ -2597,7 +2644,7 @@ Have fun! \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% @@ -2820,6 +2867,7 @@ Have fun! % \end{macro} % % \changes{v1.0b}{2011/12/09}{removed \protect\Cmd{setbox\textbackslash mdf@splitbox@two \textbackslash vbox{\textbackslash unvbox \textbackslash mdf@splitbox@two}}} +% \changes{v1.4a}{2012/03/06}{added extra test for a wrong splitted box} % \begin{macro}{mdf@put@frame@i} % Output of the first splitted box. % \begin{macrocode} @@ -2845,6 +2893,13 @@ Have fun! \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% @@ -2892,6 +2947,16 @@ Have fun! \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@} @@ -2919,7 +2984,7 @@ Have fun! \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}% @@ -2954,19 +3019,34 @@ Have fun! \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% @@ -3131,7 +3211,7 @@ Have fun! %% 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 $ % % \end{macrocode} % @@ -3141,7 +3221,7 @@ Have fun! \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] % \end{macrocode} % \end{macro} @@ -3367,6 +3447,17 @@ Have fun! +\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% @@ -3392,6 +3483,8 @@ Have fun! \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% @@ -3465,6 +3558,20 @@ Have fun! {\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 @@ -3488,6 +3595,8 @@ Have fun! \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}{}% @@ -3551,6 +3660,30 @@ Have fun! {\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 @@ -3575,7 +3708,11 @@ Have fun! \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}{}% @@ -3611,7 +3748,7 @@ Have fun! %% 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 $ % % \end{macrocode} % \changes{v1.1beta}{2011/12/16}{added lost semicolons} @@ -3621,7 +3758,7 @@ Have fun! \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] % % \end{macrocode} @@ -3945,7 +4082,7 @@ Have fun! \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}% @@ -3959,7 +4096,6 @@ Have fun! \advance\mdfboundingboxwidth by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxwidth by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxwidth by \mdf@outerlinewidth@length\relax}{}% -% \setlength\mdfboundingboxheight{\dimexpr\ht\mdf@splitbox@two+\dp\mdf@splitbox@two\relax}% \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax% \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% @@ -3967,13 +4103,19 @@ Have fun! \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]{% \null% \begin{tikzpicture}[remember picture] -% \pgfmathsetlengthmacro\mdf@Ax{+\mdf@innerleftmargin@length}% \pgfmathsetlengthmacro\mdf@Ay{+\mdf@splitbottomskip@length}% \pgfmathsetlengthmacro\mdf@Ox{+0pt}% @@ -3996,14 +4138,67 @@ Have fun! \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)}}% {}% @@ -4026,11 +4221,10 @@ Have fun! {\mdf@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}% {}% \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} %HIER KOMMT EIN WEITERES MAKRO @@ -4075,13 +4269,29 @@ Have fun! \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% \mdf@makebox@out{% \mdf@makeboxalign@left% \mdf@tikz@settings% -% \setlength\mdfboundingboxwidth{\wd\mdf@splitbox@two}% \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% @@ -4093,10 +4303,20 @@ Have fun! \advance\mdfboundingboxwidth by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxwidth by \mdf@middlelinewidth@length\relax% \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] @@ -4119,14 +4339,67 @@ Have fun! \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})}% @@ -4135,9 +4408,9 @@ Have fun! {\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} %HIER KOMMT EIN WEITERES MAKRO @@ -4186,7 +4459,6 @@ Have fun! \mdf@makebox@out{% \mdf@makeboxalign@left% \mdf@tikz@settings% -% \setlength\mdfboundingboxwidth{\wd\mdf@splitbox@one}% \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% @@ -4198,14 +4470,20 @@ Have fun! \advance\mdfboundingboxwidth by \mdf@innerlinewidth@length\relax% \advance\mdfboundingboxwidth by \mdf@middlelinewidth@length\relax% \advance\mdfboundingboxwidth by \mdf@outerlinewidth@length\relax}{}% -% \setlength\mdfboundingboxheight{\dimexpr\ht\mdf@splitbox@one+\dp\mdf@splitbox@one\relax}% \advance\mdfboundingboxheight by \mdf@innerbottommargin@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}{}% -% +%%%%%%%%% + \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] @@ -4218,7 +4496,7 @@ Have fun! \ifbool{mdf@leftline}% {% \pgfmathsetlengthmacro\mdf@Ax% - {\mdf@Ax+\mdf@outerlinewidth@length+% + {\mdf@Ax+\mdf@outerlinewidth@length+% \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}% \pgfmathsetlengthmacro\mdf@Ox% {\mdf@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}% @@ -4236,14 +4514,59 @@ Have fun! \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)}}% {}% @@ -4266,11 +4589,9 @@ Have fun! {\mdf@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}% {}% \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} %HIER KOMMT EIN WEITERES MAKRO @@ -4306,7 +4627,7 @@ Have fun! %% 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 $ % % \end{macrocode} % @@ -4316,7 +4637,7 @@ Have fun! \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] % \end{macrocode} % \end{macro} @@ -4653,6 +4974,14 @@ Have fun! \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]{% @@ -4685,6 +5014,18 @@ Have fun! \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)% @@ -4693,6 +5034,37 @@ Have fun! } }{} % \psclip{ +%%%%%%%%%%%%% + \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)}}% @@ -4717,6 +5089,7 @@ Have fun! %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 @@ -4796,6 +5169,18 @@ Have fun! \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% @@ -4823,9 +5208,57 @@ Have fun! -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})}% @@ -4834,6 +5267,7 @@ Have fun! {\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% @@ -4900,6 +5334,14 @@ Have fun! \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% @@ -4931,6 +5373,15 @@ Have fun! \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]{% @@ -4939,6 +5390,37 @@ Have fun! \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)}}{}% @@ -4962,6 +5444,7 @@ Have fun! %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% @@ -5021,10 +5504,10 @@ Have fun! % % \begin{macrocode} %Documenation of the package mdframed -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -5035,7 +5518,7 @@ Have fun! \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} @@ -5238,10 +5721,10 @@ The example below is inspired by the following post on StackExchange \href{http: % % \begin{macrocode} %Documenation of the package mdframed -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} @@ -5253,7 +5736,7 @@ The example below is inspired by the following post on StackExchange \href{http: \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} @@ -5492,10 +5975,10 @@ color(100bp)=(black!5)} % % \begin{macrocode} %Documenation of the package mdframed -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \lstDeleteShortInline{|} \newcommand\Loadedframemethod{PSTricks} @@ -5507,7 +5990,7 @@ color(100bp)=(black!5)} \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} @@ -5634,10 +6117,10 @@ function of the independent variables alone. % \begin{macrocode} %Documenation of the package mdframed -%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt,ltxlipsum]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ \usepackage{showexpl} @@ -5649,7 +6132,7 @@ function of the independent variables alone. \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} 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% |