diff options
author | Karl Berry <karl@freefriends.org> | 2011-10-09 23:42:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-10-09 23:42:55 +0000 |
commit | 0b310accd4feabf084b43f1c0286ea6d78eceae9 (patch) | |
tree | 1369c815a2a50c8a0a493545963754475277517b /Master/texmf-dist | |
parent | 7696878459618a1226a69bb5052792495348a5d7 (diff) |
mdframed 0.9g (8oct11)
git-svn-id: svn://tug.org/texlive/trunk@24247 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/mdframed/README | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.pdf | bin | 143131 -> 144300 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.tex | 70 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf | 406 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mdframed/mdframed.sty | 74 |
5 files changed, 114 insertions, 443 deletions
diff --git a/Master/texmf-dist/doc/latex/mdframed/README b/Master/texmf-dist/doc/latex/mdframed/README index 0642e0e369c..adb1030f176 100644 --- a/Master/texmf-dist/doc/latex/mdframed/README +++ b/Master/texmf-dist/doc/latex/mdframed/README @@ -1,4 +1,4 @@ -%%$Id: README 201 2011-10-04 18:57:50Z marco $ +%%$Id: README 209 2011-10-09 11:53:45Z marco $ The standard methods for framing text (\fbox or \fcolorbox) require you to handle page breaks by hand, meaning that you @@ -11,8 +11,7 @@ Author's name: Marco Daniel and Elke Schubert (tikz) License type: lppl ---------------------------- -v0.9f -- fixes bugs (thanks to Lars Madsen) -- added option hidealllines +v0.9h - fixed documentation +- fixed bugs diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.pdf Binary files differindex 29d3c8d605d..b73167e07a2 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.tex index 94cefa6bd27..a9ea47561df 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc-en.tex @@ -1,6 +1,6 @@ %Documenation of the package mdframed -%%$Id: mdframed-doc-en.tex 201 2011-10-04 18:57:50Z marco $ -%%$Rev: 201 $ +%%$Id: mdframed-doc-en.tex 209 2011-10-09 11:53:45Z marco $ +%%$Rev: 209 $ %%$Author: marco $ %%$Dater:$ %% [latex -> ps -> pdf] @@ -8,7 +8,7 @@ \documentclass[english,11pt,]{scrartcl} %\usepackage{showframe} \usepackage[nofancy,draft,notoday]{svninfo} -\svnInfo $Id: mdframed-doc-en.tex 201 2011-10-04 18:57:50Z marco $ +\svnInfo $Id: mdframed-doc-en.tex 209 2011-10-09 11:53:45Z marco $ \usepackage{babel} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} @@ -470,26 +470,9 @@ the second one is a number (e.g. 2) which will be multiplied by \mdoption{1 defa \mdDescribeMacro[white]{backgroundcolor} Sets the color of the background of the environment. \mdDescribeMacro[black]{fontcolor} Sets the color of the contents of the environment. -\subsection{Hidden Lines} - - -\mdDescribeMacro[true]{topline} Draws a line at the top. -\mdDescribeMacro[true]{bottomline} Draws a line at the bottom. -\mdDescribeMacro[true]{leftline} Draws a line on the left. -\mdDescribeMacro[true]{rightline} Draws a line on the right. - -\subsection{Frametitle} - - -\mdDescribeMacro[none]{frametitle} The environment get a title. To set a title use \mdoption{frametitle=\{The Title of the frame\}} as an option of the environment. -\mdDescribeMacro[\mbox{} \mdcommand{bfseries}\mdcommand{large}]{frametitleformat} Sets the format of the frame title. - \subsubsection{General options}\label{genopt} - - - \mdDescribeMacro[false]{ntheorem} Before setting this boolean key, you have to load the package \mdpack{ntheorem}. With this option you set the values \mdcommand{theorempreskipamount} @@ -515,6 +498,36 @@ the second one is a number (e.g. 2) which will be multiplied by \mdoption{1 defa \mdDescribeMacro[none]{tikzsetting} With this key you can pass several options to \mdcommand{tikzset}. Some examples are listed in the next section. It is very important to put the options of \mdoption{tikzsetting} in brackets. \textbf{This works only with \mdoption{framemethod=TikZ}.} + +\subsection{Hidden Lines} + + +\mdDescribeMacro[true]{topline} Draws a line at the top. +\mdDescribeMacro[true]{bottomline} Draws a line at the bottom. +\mdDescribeMacro[true]{leftline} Draws a line on the left. +\mdDescribeMacro[true]{rightline} Draws a line on the right. + +\mdDescribeMacro[false]{rightline} With this option you can decide whether all lines should be drawn or not. + +\subsection{Frametitle} + + +\mdDescribeMacro[none]{frametitle} The environment get a title. To set a title use \mdoption{frametitle=\{The Title of the frame\}} as an option of the environment. +\mdDescribeMacro[\mbox{} \mdcommand{bfseries}\mdcommand{large}]{frametitleformat} Sets the format of the frame title. + +\subsection{Footnotes} +Inside the environment you can use the command \mdcommand{footnote} as usual. \mdname uses the syntax of environment \mdpack{minipage} with the same counter. + +Every footnote text will be collect inside a box and will be displayed at the end of the environment \mdname. + +\mdDescribeMacro[\mbox{} \mdcommand{bigskipamount}]{footnotedistance} The length is the distance between the end of the environement \mdname and the displaying of the \mdcommand{footnoterule}. + +\mdDescribeMacro[true]{footnoteinside} The position of the footnotes can be changed with the option \mdoption{footnoteinside}. The footnotes will be displayed at the end of the environment but you can decide whether the output is inside \mdname or after. + +\vskip\baselineskip +\noindent\textbf{Note}\qquad The ouput of the footnotes with the option \mdoption{footnoteinside=false} are not in a splitted frame. I think it isn't useful because the first line of a new page shouldn't be a footnote. + + \section{Examples} Now I present some examples. Of course I know that some of them are only gimmicks. To create the following examples I am using \mdoption{framemethod=TikZ}. \mdfsetup{skipabove=\baselineskip,skipbelow=\baselineskip} @@ -683,16 +696,17 @@ body you will get this warning. \begin{enumerate} \item So far the environment isn't compatible with the package \mdpack{gmverb}. - \item So far it isn't possible to combine the environment \mdcommand{begin\{multicols\}} of the package \mdpack{multicol} with \mdpack{mdframed}. - \item So far it isn't possible to use footnotes within a frame. \end{enumerate} \section{ToDo} \begin{enumerate} \item see \glqq Known Problems\grqq. + \item So far it isn't possible to combine the environment \mdcommand{begin\{multicols\}} of the package \mdpack{multicol} with \mdpack{mdframed} with the whole option list. \item Create new styles. \item Improve page breaks. + \item Improve footnotes + \item Improve documentation and create a separate pdf with examples \end{enumerate} \section{Previous versions} @@ -705,7 +719,7 @@ If you have trouble with the new version of \mdname you can load \texttt{mdframe -\textsf{Dick Nickalls;\quad Dr. Dietrich Grau;\quad Piazza Luca\quad Jobst Hoffmann}. +\textsf{Dick Nickalls;\quad Dietrich Grau;\quad Piazza Luca\quad Jobst Hoffmann}. \medskip \noindent Thanks for proofreading @@ -944,7 +958,13 @@ Text\par Text\par Text \twocolumn[\subsection{Revision history}\label{rev}] \setkomafont{subsubsection}{\normalfont\bfseries} \small\raggedright -\minisec{Version 0.9d submitted 04 Oct 2011} +\minisec{Version 0.9g submitted 08 Oct 2011} +\begin{itemize} +\item fixed documentation +\item added small footnote compatibility +\end{itemize} + +\minisec{Version 0.9f submitted 04 Oct 2011} \begin{itemize} \item fixes bugs (thanks to Lars Madsen) \item added option \mdoption{hidealllines} @@ -1044,7 +1064,7 @@ Text\par Text\par Text \minisec{Version 0.3b submitted 1 May 2010} \begin{itemize} -\item fixes some bugs -- thanks to Dr. Dietrich Grau +\item fixes some bugs -- thanks to Dietrich Grau \item added new options: \mdoption{ntheorem} \end{itemize} diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf deleted file mode 100644 index ce63d9992cc..00000000000 --- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf +++ /dev/null @@ -1,406 +0,0 @@ -%%==================================================%% -%%= Ausgabe der Box nach Vorgabe der Ausgaberoutine=%% -%%==================================================%% -%% Styledatei fuer das Paket mdframed erstellt durch -%% Marco Daniel - -%% This package may be distributed under the terms of the LaTeX Project -%% Public License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. - -%%$Id: md-frame-2.mdf 195 2011-09-10 17:58:51Z marco $ -%%$Rev: 195 $ -%%$Author: marco $ -%%$Date: 2011-09-10 19:58:51 +0200 (Sa, 10. Sep 2011) $ - -%%Allgemeine Einstellungen fuer pstricks -%%Hier nur einfacher Rahmen mit Einstellungen -\def\mdframedIIIpackagename{md-frame-3} -\def\md@frameIIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } -\ProvidesFile{md-frame-3.mdf}[\md@frameIIIdate@svn$Id: md-frame-2.mdf 195 2011-09-10 17:58:51Z marco $ \mdversion: \mdframedIIIpackagename] -% -\def\md@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div} -\let\ptTps\md@ptlength@to@pscode\relax -%%%% _____t_____ -%%%% | | -%%%% | | -%%%% | | -%%%% l| |r -%%%% | | -%%%% | | -%%%% |___________| -%%%% b -%zusammenhaenge abfragen: -\newrobustcmd*\md@test@ltrb{\ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and (bool {mdf@rightline})}} -%3-set -\newrobustcmd*\md@test@ltr{\ifboolexpr{ (bool {mdf@topline}) and not (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and (bool {mdf@rightline})}} -\newrobustcmd*\md@test@ltb{\ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and not (bool {mdf@rightline})}} -\newrobustcmd*\md@test@trb{\ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline}) - and not (bool {mdf@leftline}) and (bool {mdf@rightline})}} -\newrobustcmd*\md@test@lrb{\ifboolexpr{ not (bool {mdf@topline}) and (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and (bool {mdf@rightline})}} -%2-set -\newrobustcmd*\md@test@lb{\ifboolexpr{ not (bool {mdf@topline}) and (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and not (bool {mdf@rightline})}} -\newrobustcmd*\md@test@rb{\ifboolexpr{ not (bool {mdf@topline}) and (bool {mdf@bottomline}) - and not (bool {mdf@leftline}) and (bool {mdf@rightline})}} -\newrobustcmd*\md@test@tr{\ifboolexpr{ (bool {mdf@topline}) and not (bool {mdf@bottomline}) - and not (bool {mdf@leftline}) and (bool {mdf@rightline})}} -\newrobustcmd*\md@test@lt{\ifboolexpr{ (bool {mdf@topline}) and not (bool {mdf@bottomline}) - and (bool {mdf@leftline}) and not (bool {mdf@rightline})}} -%Einzellinien -\newrobustcmd*\md@test@single{% - \ifboolexpr{ not (test {\md@test@ltrb} or test {\md@test@ltr} or test {\md@test@ltb} - or test {\md@test@trb} or test {\md@test@lrb} or test {\md@test@lb} - or test {\md@test@rb} or test {\md@test@tr} or test {\md@test@lt} ) }} - -%%==================================================%% -%%================single-box========================%% -%%==================================================%% -\def\md@putbox@single{% - \leftline{\null\hspace*{\mdf@leftmargin@length}%% - \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}% - \setlength\mdfboundingboxwidth{\wd\@tempboxa}% - \setlength\mdfboundingboxheight{\ht\@tempboxa+\dp\@tempboxa}% - \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax% - \advance\mdfboundingboxheight by \mdf@innerbottommargin@length\relax% - \ifbool{mdf@topline}{\advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax}{}% - \ifbool{mdf@bottomline}{\advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax}{}% - \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% - \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% - \psset{linearc=\mdf@roundcorner@length,cornersize=absolut,}% - \expandafter\psset\expandafter{\mdf@psset@local}% - \psset{unit=1truecm}% - \begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight) - \md@test@ltrb{% - \psframe[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdf@middlelinewidth@length} 0.5 mul)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add) - }{} - \md@test@ltr{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - 0) - }{} - \md@test@ltb{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdf@middlelinewidth@length} 0.5 mul)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - }{} - \md@test@trb{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdf@middlelinewidth@length} 0.5 mul) - (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul) - }{} - \md@test@lrb{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdfboundingboxheight})% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight}) - }{} - \md@test@lb{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdfboundingboxheight})% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - }{} - \md@test@rb{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight}) - }{} - \md@test@tr{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - 0) - }{} - \md@test@lt{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - }{} - \md@test@single{}{% - \ifbool{mdf@bottomline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - }{}% - \ifbool{mdf@topline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add)% - (! \ptTps{\mdfboundingboxwidth} - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add) - }{}% - \ifbool{mdf@leftline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdfboundingboxheight} )% - }{}% - \ifbool{mdf@rightline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add 0)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add - \ptTps{\mdfboundingboxheight} )% - }{}% - }{}% - %Hintergrund - \psframe[linecolor=\mdf@backgroundcolor,fillstyle=solid,% - fillcolor=\mdf@backgroundcolor,linestyle=solid, - linewidth=\mdf@middlelinewidth@length,dimen=outer]% - (!0 \ifbool{mdf@bottomline}{\ptTps{\mdf@middlelinewidth@length}}{0}) - (! \ptTps{\mdfboundingboxwidth} % - \ptTps{\mdfboundingboxheight} \ifbool{mdf@topline}{\ptTps{\mdf@middlelinewidth@length} sub}{}) - %Ausgabe - \rput[b](!\ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate - \ptTps{\mdf@innerbottommargin@length} - \ifbool{mdf@bottomline}{\ptTps{\mdf@middlelinewidth@length} add}{} - ){\box\@tempboxa} - \end{pspicture}% - }% -} -%%==================================================%% -%%================first-box=========================%% -%%==================================================%% - -\def\md@putbox@first{% - \leftline{\null\hspace*{\mdf@leftmargin@length}%% - \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}% - \setlength\mdfboundingboxwidth{\wd\tw@}% - \setlength\mdfboundingboxheight{\ht\tw@+\dp\tw@}% - \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax - \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% - \ifbool{mdf@topline}{\advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax}{}% - \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% - \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% - \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}% - \expandafter\psset\expandafter{\mdf@psset@local}% - \psset{unit=1truecm}% - \ifdimgreater{\mdfboundingboxheight}{\vsize} - {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\vsize)} - {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)} - %Hintergrund - \psline[linecolor=\mdf@backgroundcolor,fillstyle=solid,linestyle=solid, - linearc={\dimexpr\mdf@roundcorner@length-\mdf@middlelinewidth@length\relax}, - fillcolor=\mdf@backgroundcolor,linewidth=\mdf@middlelinewidth@length]% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul - \ptTps{\mdfboundingboxheight} \ifbool{mdf@topline}% - {\ptTps{\mdf@middlelinewidth@length} neg 1.5 mul add}% - {\ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add} )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add %X - \ptTps{\mdfboundingboxheight} \ifbool{mdf@topline}% - {\ptTps{\mdf@middlelinewidth@length} neg 1.5 mul add}% - {\ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add} )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add %X - 0) - \ifboolexpr{ test {\md@test@ltrb} or test {\md@test@ltr}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - 0) - }{} - \ifboolexpr{ test {\md@test@tr} or test {\md@test@trb}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - 0) - }{} - \ifboolexpr{ test {\md@test@ltb} or test {\md@test@lt}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@roundcorner@length} neg add %X - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)% - }{} - \ifboolexpr{ test {\md@test@single} or test {\md@test@rb} or test {\md@test@lrb} or test {\md@test@lb}}{% - \ifbool{mdf@topline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add)% - (! \ptTps{\mdfboundingboxwidth} - \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add) - }{}% - \ifbool{mdf@leftline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdfboundingboxheight} )% - }{}% - \ifbool{mdf@rightline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add 0)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add - \ptTps{\mdfboundingboxheight} )% - }{}% - }{}% - %Ausgabe - \rput[b](!\ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate - \ptTps{\mdf@splitbottomskip@length}){\box\tw@} - \end{pspicture}% - }% -} - -%%==================================================%% -%%================middle-box========================%% -%%==================================================%% - -\def\md@putbox@middle{% - \leftline{\null\hspace*{\mdf@leftmargin@length}%% - \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}% - \setlength\mdfboundingboxwidth{\wd\tw@}% - \setlength\mdfboundingboxheight{\ht\tw@+\dp\tw@}% - \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax% - \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% - \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% - \expandafter\psset\expandafter{\mdf@psset@local}% - \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}% - \psset{unit=1truecm}% - \ifdimgreater{\mdfboundingboxheight}{\vsize} - {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\vsize)} - {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)} - \ifbool{mdf@leftline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdfboundingboxheight} )% - }{}% - \ifbool{mdf@rightline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add 0)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add - \ptTps{\mdfboundingboxheight} )% - }{}% - %Hintergrund - \psframe[linecolor=\mdf@backgroundcolor,fillstyle=solid,% - fillcolor=\mdf@backgroundcolor,linestyle=solid, - linewidth=\mdf@middlelinewidth@length,dimen=outer,% - linearc=\z@]% - (!0 0) - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdfboundingboxheight}) - %Ausgabe - \rput[b](!\ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate - \ptTps{\mdf@splitbottomskip@length} ){\box\tw@} - \end{pspicture}% - }% -} -%%==================================================%% -%%=================last-box=========================%% -%%==================================================%% -\def\md@putbox@second{ - \leftline{\null\hspace*{\mdf@leftmargin@length}%% - \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}% - \setlength\mdfboundingboxwidth{\wd\@tempboxa}% - \setlength\mdfboundingboxheight{\ht\@tempboxa+\dp\@tempboxa}% - \advance\mdfboundingboxheight by \mdf@innerbottommargin@length\relax% - \ifbool{mdf@bottomline}{\advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax}{}% - \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax% - \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax% - \expandafter\psset\expandafter{\mdf@psset@local} - \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}% - \psset{unit=1truecm}% - \begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight) - %Hintergrund - \psline[linecolor=\mdf@backgroundcolor,fillstyle=solid,linestyle=solid, - linearc={\dimexpr\mdf@roundcorner@length-\mdf@middlelinewidth@length\relax}, - fillcolor=\mdf@backgroundcolor,linewidth=\mdf@middlelinewidth@length]%% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul \ptTps{\mdfboundingboxheight} )% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul - \ifbool{mdf@bottomline}% - {\ptTps{\mdf@middlelinewidth@length} neg 1.5 mul neg}% - {\ptTps{\mdf@middlelinewidth@length} neg 0.5 mul neg} )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add - \ifbool{mdf@bottomline}% - {\ptTps{\mdf@middlelinewidth@length} neg 1.5 mul neg}% - {\ptTps{\mdf@middlelinewidth@length} neg 0.5 mul neg} )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg add - \ptTps{\mdfboundingboxheight} ) - %%%%%%%%%%%% - \ifboolexpr{ test {\md@test@ltrb} or test {\md@test@lrb}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdfboundingboxheight})% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight}) - }{} - \ifboolexpr{ test {\md@test@ltb} or test {\md@test@lb}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdfboundingboxheight})% - (! \ptTps{\mdf@middlelinewidth@length} 0.5 mul neg \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - }{} - \ifboolexpr{ test {\md@test@trb} or test {\md@test@rb}}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add %X - \ptTps{\mdfboundingboxheight}) - }{} - \ifboolexpr{ test {\md@test@single} or test {\md@test@ltr} or test {\md@test@tr} or test {\md@test@lt}}{% - \ifbool{mdf@bottomline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul ) - }{}% - \ifbool{mdf@leftline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)% - (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul \ptTps{\mdfboundingboxheight} )% - }{}% - \ifbool{mdf@rightline}{% - \psline[linewidth=\mdf@middlelinewidth@length,linecolor=\mdf@linecolor,fillstyle=none,dimen=middle]% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add 0)% - (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdf@middlelinewidth@length} 0.5 mul add - \ptTps{\mdfboundingboxheight} )% - }{}% - }{}% - %Ausgabe - \rput[b](!\ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate - \ptTps{\mdf@innerbottommargin@length} - \ifbool{mdf@bottomline}{\ptTps{\mdf@middlelinewidth@length} add}{} - ){\box\@tempboxa} - \end{pspicture}% - }% -} - -\endinput -%eof - diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty index e923466e5d7..98da4a03325 100644 --- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty +++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty @@ -32,17 +32,17 @@ %% %% %%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>%% -%%$Id: mdframed.sty 201 2011-10-04 18:57:50Z marco $ -%%$Rev: 201 $ +%%$Id: mdframed.sty 209 2011-10-09 11:53:45Z marco $ +%%$Rev: 209 $ %%$Author: marco $ -%%$Date: 2011-10-04 20:57:50 +0200 (Di, 04. Okt 2011) $ +%%$Date: 2011-10-09 13:53:45 +0200 (So, 09. Okt 2011) $ %% Allgemeine Angaben -\def\mdversion{v0.9f} +\def\mdversion{v0.9h} \def\mdframedpackagename{mdframed} \def\md@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space } \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mdframed}[\md@maindate@svn$Id: mdframed.sty 201 2011-10-04 18:57:50Z marco $ \mdversion: \mdframedpackagename] +\ProvidesPackage{mdframed}[\md@maindate@svn$Id: mdframed.sty 209 2011-10-09 11:53:45Z marco $ \mdversion: \mdframedpackagename] %%==================================================%% %%=============== Benoetigte Pakete ================%% %%==================================================%% @@ -188,6 +188,7 @@ {middlelinewidth==\expandafter\mdf@linewidth@length},% {outerlinewidth==\z@},% {roundcorner==\z@},% + {footenotedistance==\medskipamount} } %Unterstuetzung der Optionen fuer tikz @@ -258,6 +259,9 @@ %Werte none,info,warning \DeclareStringOption[none]{printheight} +%Fussnotenposition: +\DeclareBoolOption[true]{footnoteinside} + \ProcessKeyvalOptions*\relax @@ -481,6 +485,49 @@ }% }{}% } + + +%%==================================================%% +%%=================== Fussnoten ====================%% +%%==================================================%% +\newrobustcmd*\md@footnoterule{% + \kern0\p@% + \hrule \@width 1in \kern 2.6\p@} + + +\newrobustcmd*\md@footnoteoutput{% + \ifvoid\@mpfootins\else + \nobreak% + \vskip\mdf@footenotedistance@length% + \normalcolor% + \md@footnoterule + \unvbox\@mpfootins + \fi% +} + +\newrobustcmd*\md@footnoteinput{% + \def\@mpfn{mpfootnote}% + \def\thempfn{\thempfootnote}% + \c@mpfootnote\z@% + \let\@footnotetext\@mpfootnotetext% +} + +\def\thempfootnote{{\itshape\@alph\c@mpfootnote}} +\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} +\long\def\@mpfootnotetext#1{% + \global\setbox\@mpfootins\vbox{% + \unvbox\@mpfootins + \reset@font\footnotesize + \hsize\columnwidth + \@parboxrestore + \protected@edef\@currentlabel + {\csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}} + + %%==================================================%% %%======= Laden der gewuenschten Style-Datei =======%% %%==================================================%% @@ -611,13 +658,24 @@ \md@checkntheorem% \md@styledefinition% \md@horizontalmargin@equation% + \md@footnoteinput% \begin{md@lrbox}{\@tempboxa}% }% \def\endmdframed{% - \end{md@lrbox}% -% \md@put@frame% - \detected@md@put@frame + \ifmdf@footnoteinside% + \def\md@reserveda{% + \md@footnoteoutput% + \end{md@lrbox}% + \detected@md@put@frame}% + \else% + \def\md@reserveda{% + \end{md@lrbox} + \detected@md@put@frame% + \md@footnoteoutput% + }% + \fi% + \md@reserveda% \end{md@trivlist}% \hrule \@height\z@ \@width\hsize \endgroup\@endparenv% |