mdframed (9dec11)

git-svn-id: svn://tug.org/texlive/trunk@24808 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 1353 insertions, 1646 deletions

diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
index d52123efd05..63f4474a06f 100644
--- a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
+++ b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
@@ -8,23 +8,47 @@
 %% Public License, as described in lppl.txt in the base LaTeX distribution.
 %% Either version 1.0 or, at your option, any later version.
 
-%%$Id: ltxmdf.cls 220 2011-11-13 17:39:13Z marco $
-%%$Rev: 220 $
+%%$Id: ltxmdf.cls 269 2011-12-09 12:14:02Z marco $
+%%$Rev: 269 $
 %%$Author: marco $
-%%$Date: 2011-11-13 18:39:13 +0100 (So, 13. Nov 2011) $
+%%$Date: 2011-12-09 13:14:02 +0100 (Fr, 09. Dez 2011) $
 
 %% Allgemeine Angaben
-\def\md@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
+\def\ltxmdf@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltxmdf}[\md@maindate@svn$Id: ltxmdf.cls 220 2011-11-13 17:39:13Z marco $ ltxmdf]
+\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 269 2011-12-09 12:14:02Z marco $ ltxmdf]
+\DeclareOption{tocdepthsec}{\def\ltxmdf@tocdepth{1}}
+\DeclareOption{tocdepthsub}{\def\ltxmdf@tocdepth{2}}
+\newif\ifltxmdf@lipsum
+\ltxmdf@lipsumfalse
+\DeclareOption{ltxlipsum}{\ltxmdf@lipsumtrue}
+\newif\ifltxmdf@showframe
+\ltxmdf@showframefalse
+\DeclareOption{ltxshowframe}{\ltxmdf@showframetrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\ExecuteOptions{tocdepthsub}
 \ProcessOptions\relax
 \LoadClass{scrartcl}
+\RequirePackage{selinput}
+\SelectInputMappings{
+  adieresis={ä},
+  germandbls={ß},
+  Euro={€},
+}
+
 \RequirePackage{etoolbox}
 %Required Packages no font / no language
-\RequirePackage[nofancy,draft,notoday]{svninfo}
+%\RequirePackage[nofancy,draft,notoday]{svninfo}
 \RequirePackage[left=2.5cm,right=2.5cm,top=3cm,bottom=3cm]{geometry}
+\ifltxmdf@showframe
+  \RequirePackage{showframe}
+\fi
+\ifltxmdf@lipsum
+  \RequirePackage{lipsum}
+\fi
 \RequirePackage[T1]{fontenc}
+\RequirePackage[scaled=0.82]{beramono}
 \RequirePackage{microtype}
 \RequirePackage[french=quotes]{csquotes}
 \RequirePackage{xspace}
@@ -42,18 +66,18 @@
 \RequirePackage{array,booktabs}
 \RequirePackage{xcolor,tikz}
 \RequirePackage{graphicx}
-\AtEndPreamble{%
-  \RequirePackage{hyperref}
+
+\RequirePackage[numbered]{hypdoc}
     \hypersetup{%
         breaklinks=true,
         pdftitle={Documenation of mdframed},%
         pdfauthor={Marco Daniel},%
         colorlinks=true,%
-        linkcolor=titleblue,
+        linkcolor=ltxmdfblue,
         urlcolor=cyan,
-        bookmarksdepth=4,
+        bookmarksdepth=\ltxmdf@tocdepth,
     }
-}
+
 
 %Kopf- und Fusszeilen
 \clearscrheadfoot
@@ -63,23 +87,27 @@
 \renewcommand{\subsectionmark}[1]{\markright{\subsectionmarkformat #1}} %nur Titel ohne Nr.
 \ihead{\rightmark}
 \ohead{\leftmark}
-\ofoot{\pagemark} 
-\ifoot{\svnId}
+\ofoot{\pagemark}
+
+\def\ltxmdfsetifoot$#1: #2 #3 #4-#5-#6 #7 #8${%
+  \ifoot{#2 #3 #4-#5-#6 #7 #8}
+}
+\ltxmdfsetifoot$Id: ltxmdf.cls 269 2011-12-09 12:14:02Z marco $
 
 
 %Tikz und Farbe
 \usetikzlibrary{calc,backgrounds,arrows,matrix}
-\colorlet{titleblue}{blue!30!black}
+\colorlet{ltxmdfblue}{blue!30!black}
 
 \lstset{keywordstyle=\bfseries}
-\lstdefinestyle{lstmdframed}{%
+\lstdefinestyle{lstltxmdf}{%
      basicstyle=\small\ttfamily,
      language={[LaTeX]TeX},
      basicstyle=\small,%
      xleftmargin=20pt,%
      xrightmargin=20pt,%
      frame=single,%
-     rulecolor=\color{titleblue},%
+     rulecolor=\color{ltxmdfblue},%
      framesep=5pt,%
      framerule=1pt,%
      texcsstyle=*\color{red!50!black}\bfseries,
@@ -116,49 +144,29 @@
 }
 
 
-\lstnewenvironment{mdexample}[1][]
-  {\lstset{style=lstmdframed,#1}}%
+\lstnewenvironment{tltxmdfexample}[1][]
+  {\lstset{style=lstltxmdf,#1}}%
   {}
 
+\lstMakeShortInline[basicstyle=\small\ttfamily\color{blue!60!black}]{|}
+
 %table of contens anpassen:
 \renewcommand\tableofcontents{%
-\setcounter{tocdepth}{2}%
- \begin{multicols}{2}[\centering\textbf{\sffamily\Large\contentsname}]
+  \setcounter{tocdepth}{\ltxmdf@tocdepth}%
+  \begin{multicols}{2}[\centering\textbf{\sffamily\Large\contentsname}]
         \@starttoc{toc}
- \end{multicols}
+  \end{multicols}
 }
 
-
-%Anweisung zur Darstellung
-\newcommand*\mdoption[1]{\textsf{\color{titleblue}#1}}
-\newcommand*\mdname{\textsf{mdframed}\xspace}
-\newcommand*\mdpack[1]{\texttt{#1}\xspace}
-\newcommand*\mdsetting[1]{\textsf{#1}\xspace}
-\newcommand*\mdcommand[1]{\texttt{\textbackslash #1}\xspace}
-
-\newcommand*\mdDescribeMacro[2][]{\par\kern\baselineskip%
-                                   \noindent\makebox[0pt][l]{\kern-2em%
-                                   \textsf{\bfseries\color{titleblue}#2}%
-                                   }\hfill\mbox{\mdDefault{#1}}\par\kern.5ex\noindent\ignorespaces}
-\newcommand*{\mdDefault}[1]{%
- \ifx\relax#1\relax\else{\small\mdsetting{default=#1}}\fi}
-
-\newcommand*\mdDescribeCmd[2][]{\par\kern\baselineskip%
-                                   \noindent\makebox[0pt][l]{\kern-2em%
-                                   \textsf{\bfseries\color{titleblue}\textbackslash #2}%
-                                   }{#1}\hfill\mbox{\mdDefault{#1}}\par\kern.5ex\noindent\ignorespaces}
-
-
-\newcommand\NOTE{\minisec{Note}}
-
-\newcommand\limitation[1][TikZ]{\newline{\small This works only with \mdoption{framemethod=#1}.}}
-
 %%Maketitle angepasst:
 \def\title#1{\def\@title{#1}}
 \def\subtitle#1{\def\@subtitle{#1}}
 \def\author#1{\def\@author{#1}}
 \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 269 2011-12-09 12:14:02Z marco $}
+
 \long\def\introduction#1{\def\@introduction{#1}}
 
 \def\maketitle{%
@@ -168,7 +176,7 @@
   \begingroup
     \parindent\z@
     \centering
-     \color{titleblue}\Large\bfseries\sffamily\@title
+     \color{ltxmdfblue}\Large\bfseries\sffamily\@title
      \par\kern.5\baselineskip
      \normalfont\large\normalcolor\@subtitle
      \par\kern.5\baselineskip
@@ -184,5 +192,231 @@
  \endgroup
 }
 
+%Own Appendix
+\def\ltxmdfappendix{%
+ \clearpage
+ %\newgeometry{left=5.5cm,}%
+} 
+%Modifkation of code
+\preto\theCodelineNo{\color{gray}}
+\setlength\MacroTopsep{10pt}
+\appto\MacroFont{\color{ltxmdfblue}}
+
+
+\DoNotIndex{\@captype,\@endparenv,\@endparpenalty,\@endpetrue,\@floatpenalty,\@footnotetext,\@ifnextchar,\@undefined,\@tempboxa} 
+\DoNotIndex{\@M,\@empty,\@height,\@mpfn,\@mpfootins,\@mpfootnotetext,\@nil,\@plus,\@width}
+
+\DoNotIndex{\@captype,\@endparenv,\@endparpenalty,\@endpetrue,\@floatpenalty}
+\DoNotIndex{\@footnotetext,\@ifnextchar,\@undefined,\@tempboxa} 
+\DoNotIndex{\@M,\@empty,\@height,\@mpfn,\@mpfootins,\@mpfootnotetext,\@nil,\@plus,\@width}
+\DoNotIndex{\@afterheading,\@afterindentfalse,\@firstoftwo,\@gobble,\@ifpackageloaded}
+\DoNotIndex{\@nobreaktrue,\@nobreakfalse,\@secondoftwo,\@tempa,\@tempdima}
+
+\DoNotIndex{\addpenalty,\addvspace,\advance,\afterassignment,\AfterEndEnvironment,\appto}
+
+\DoNotIndex{\baselineskip,\begin,\boolfalse,\begingroup,\box}
+\DoNotIndex{\BeforeBeginEnvironment,\bfseries,\bgroup,\boxmaxdepth}
+
+\DoNotIndex{\color@endgroup,\color@setgroup,\columnwidth,\csdef,\c@mpfootnote,\csname}
+\DoNotIndex{\clip,\color,\color@begingroup,\coordinate,\csappta,\csuse,\csxdef,\Currentoption}
+
+\DoNotIndex{\dimexpr,\DeclareBoolOption,\DeclareListParser,\def,\define@key,\dimen@,\dimen@i,\dp,\deflength}
+\DoNotIndex{\DeclareDefaultOption,\defcounter,\DisableKeyvaloption}
+
+\DoNotIndex{\eject,\end,\endtrivlist,\edef,\else,\endcsname,\endinput,\expandafter,\endgroup\egroup,\enlargethispage}
+
+\DoNotIndex{\fwd@reserved@a,\fwd@reserveda,\fi,\fill,\forcsvlist}
+
+\DoNotIndex{\gdef}
+
+\DoNotIndex{\hbox,\height,\hrule,\hsize,\hspace,\ht,\hb@xt@,\hss}
+
+\DoNotIndex{\if@minipage,\if@twocolumn,\if@twoside,\ifbool,\ifdim,\ifdimequal}
+\DoNotIndex{\ifdimgreater,\ifdimless,\iffwd@footnoteinside,\ifinner,\ifnum,\ifodd}
+\DoNotIndex{\ifblank,\ifboolexpr,\ifcase,\ifcsundef,\IfFileExists,\ifnumequal,\ifstrequal}
+\DoNotIndex{\iftoggle,\ifundef,\input,\kernel@ifnextchar,\ifvoid,\ifx,\item}
+
+\DoNotIndex{\kern}
+
+\DoNotIndex{\leftline,\let,\linewidth,\lrbox,\large,\letcs,\listadd,\llap,\lowercase}
+
+\DoNotIndex{\maxdimen,\medskipamount,\MessageBreak,\makebox}
+
+\DoNotIndex{\NeedsTeXFormat,\newcounter,\newlength,\newrobustcmd,\nobreak,\normalcolor,\number}
+\DoNotIndex{\newbool,\newcommand,\newenvironment,\newtheorem,\newtoggle,\node,\noindent}
+\DoNotIndex{\notblank,\notbool,\null,\newpsstyle}
+\DoNotIndex{\next}
+
+\DoNotIndex{\or}
+
+\DoNotIndex{\p@,\PackageInfo,\PackageWarning,\pagegoal,\pagetotal,\partopsep,\patchcmd,\penalty}
+\DoNotIndex{\ProcessKeyvalOptions,\ProvidesPackage,\providecommand,\path}
+\DoNotIndex{\protected@edef,\ProvidesFile,\psframe,\psline,\psset,\pst@number,\psxunit}
+\DoNotIndex{\par,\parfillskip,\parindent,\PassOptionsToPackage,\pgfmathsetlengthmacro}
+
+\DoNotIndex{\relax,\RequirePackage,\raggedright,\renewcommand,\rlap,\rput,\rule}
+
+\DoNotIndex{\setbox,\setkeys,\setlength,\SetupKeyvalOptions,\splitmaxdepth,\splittopskip,\stepcounter,\strutbox}
+\DoNotIndex{\setbool,\settoggle,\space,\string}
+
+\DoNotIndex{\textwidth,\the,\thempfn,\thempfootnote,\topsep,\trivlist,\tw@,\tikzset}
+
+\DoNotIndex{\unskip,\unvbox}
+
+\DoNotIndex{\value,\vbox,\vfill,\vsize,\vskip,\vsplit}
+
+\DoNotIndex{\width,\wd}
+
+\DoNotIndex{\xifinlist}
+
+\DoNotIndex{\z@,\z@skip,\zref@addprop,\zref@extract,\zref@label,\zref@newprop,\zref@refused,\ZREF@mainlist}
+
+\IndexPrologue{\section*{Index}%
+                 \markboth{Index}{Index}The index only collect package relevant words.}
+%\DoNotIndex{\newrobustcmd,\DeclareBoolOption,\DeclareListParser,\deflength}
+%\DoNotIndex{\z@,\@ne,\@M}
+%\DoNotIndex{\define@key}
+%\DoNotIndex{\@nil,\dimen@,\dimen@i}
+%\DoNotIndex{\@mpfn,\@mpfootins,\@mpfootnotetext,\c@mpfootnote}
+%\DoNotIndex{\advance,\begingroup,\ifx,\fi,\else,\@plus,\@height,\@width,\dp,\ht,\wd}
+%\DoNotIndex{\closeout,\day,\def,\edef,\else,\empty,\endgroup,\csname,\endcsname,\endinput}
+%\DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
+%\DoNotIndex{\if,\ifnum,\ifdim,\ifcat,\ifmmode,\ifvmode,\ifhmode,%
+%            \iftrue,\iffalse,\ifvoid,\ifx,\ifeof,\ifcase,\else,\or,\fi}
+%\DoNotIndex{\box,\copy,\setbox,\unvbox,\unhbox,\hbox,%
+%            \vbox,\vtop,\vcenter}
+%\DoNotIndex{\@empty,\immediate,\write}
+%\DoNotIndex{\egroup,\bgroup,\expandafter,\begingroup,\endgroup}
+%\DoNotIndex{\divide,\advance,\multiply,\count,\dimen}
+%\DoNotIndex{\relax,\space,\string}
+%\DoNotIndex{\csname,\endcsname,\@spaces,\openin,\openout,%
+%            \closein,\closeout}
+%\DoNotIndex{\catcode,\endinput}
+%\DoNotIndex{\jobname,\message,\read,\the,\m@ne,\noexpand}
+%\DoNotIndex{\hsize,\vsize,\hskip,\vskip,\kern,\hfil,\hfill,\hss}
+%\DoNotIndex{\m@ne,\z@,\z@skip,\@ne,\tw@,\p@}
+%\DoNotIndex{\dp,\wd,\ht,\vss,\unskip}
+
+\def\macro#1{%
+     \MakePrivateLetters
+   \topsep\MacroTopsep \trivlist
+   \edef\saved@macroname{#1}%
+   \def\makelabel##1{\makebox[0pt][l]{\kern-2em ##1}}%
+   \if@inlabel
+    \let\@tempa\@empty \count@\macro@cnt
+    \loop \ifnum\count@>\z@
+      \edef\@tempa{\@tempa\hbox{\strut}}\advance\count@\m@ne \repeat
+    \edef\makelabel##1{\llap{\vtop to\baselineskip
+                               {\@tempa\hbox{##1}\vss}}}%
+    \advance \macro@cnt \@ne
+   \else  \macro@cnt\@ne  \fi
+    \toks@={\@gobble}%
+    \@for\next:=#1\do
+      {\toks@=\expandafter{\the\expandafter\toks@%
+                           \expandafter\\%
+                           \expandafter\PrintMacroName\expandafter{\next}}}%
+   \item[\fbox{\begin{tabular}{@{\textbackslash}>{}l}
+                \the\toks@
+               \end{tabular}}]%
+   \leavevmode\par\kern\MacroTopsep\noindent\ignorespaces
+   \global\advance\c@CodelineNo\@ne
+   \@for\next:=#1\do
+       {%
+       \expandafter\SpecialMainIndex\expandafter{\next}\nobreak
+       \expandafter\DoNotIndex\expandafter{\next}}%
+  \global\advance\c@CodelineNo\m@ne
+  \ignorespaces}
+
+
+
+%Anweisung zur Darstellung
+\newcommand*\Opt[1]{{\MacroFont #1}\xspace}
+\newcommand*\Env[1]{{\MacroFont #1}\xspace}
+\newcommand*\Cmd[1]{{\MacroFont \string #1}\xspace}
+\newcommand*\Pack[1]{\texttt{#1}\xspace}
+
+\newcommand*\ExplCmd[2][]{%
+    \par\kern\baselineskip%
+    \noindent\makebox[0pt][l]{\kern-2em%
+                              \@bsphack
+                              \MacroFont\textbackslash #2%
+                              \SpecialUsageIndex{#2}%
+                              \@esphack
+                            }%
+    \hfill\mbox{%
+        \ifx\relax#1\relax
+           \space
+        \else
+         {\small default=\ttfamily #1}
+        \fi
+      }%
+    \par\kern.5ex\noindent\ignorespaces
+   }
+\newcommand*\ExplEnv[2][]{%
+    \par\kern\baselineskip%
+    \noindent\makebox[0pt][l]{\kern-2em%
+                              \@bsphack
+                              \MacroFont #2%
+                              \SpecialEnvIndex{#2}%
+                              \@esphack
+                            }%
+    \hfill\mbox{%
+        \ifx\relax#1\relax
+           \space
+        \else
+         {\small default=\ttfamily #1}
+        \fi
+      }%
+    \par\kern.5ex\noindent\ignorespaces
+   }
+
+\def\SpecialOptIndex#1{\@bsphack
+    \index{#1\actualchar{\protect\ttfamily#1}
+           (option)\encapchar usage}%
+    \index{options:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
+           usage}\@esphack}
+\newcommand*\ExplOpt[2][]{%
+    \par\kern\baselineskip%
+    \noindent\makebox[0pt][l]{\kern-2em%
+                              \@bsphack
+                              \MacroFont #2%
+                              \SpecialOptIndex{#2}%
+                              \@esphack
+                            }%
+    \hfill\mbox{%
+        \ifx\relax#1\relax
+           \space
+        \else
+         {\small default=\ttfamily #1}
+        \fi
+      }%
+    \par\kern.5ex\noindent\ignorespaces
+   }
+
+% % \newcommand*\mdoption[1]{\textsf{\color{ltxmdfblue}#1}}
+% % \newcommand*\mdname{\textsf{mdframed}\xspace}
+% % \newcommand*\mdpack[1]{\texttt{#1}\xspace}
+% % \newcommand*\mdsetting[1]{\textsf{#1}\xspace}
+% % \newcommand*\mdcommand[1]{\texttt{\textbackslash #1}\xspace}
+% % 
+% % \newcommand*\mdDescribeMacro[2][]{\par\kern\baselineskip%
+% %                                    \noindent\makebox[0pt][l]{\kern-2em%
+% %                                    \textsf{\bfseries\color{ltxmdfblue}#2}%
+% %                                    }\hfill\mbox{\mdDefault{#1}}\par\kern.5ex\noindent\ignorespaces}
+% % \newcommand*{\mdDefault}[1]{%
+% %  \ifx\relax#1\relax\else{\small\mdsetting{default=#1}}\fi}
+% % 
+% % \newcommand*\mdDescribeCmd[2][]{\par\kern\baselineskip%
+% %                                    \noindent\makebox[0pt][l]{\kern-2em%
+% %                                    \textsf{\bfseries\color{ltxmdfblue}\textbackslash #2}%
+% %                                    }{#1}\hfill\mbox{\mdDefault{#1}}\par\kern.5ex\noindent\ignorespaces}
+
+
+\newcommand\NOTE{\minisec{Note}}
+
+\newcommand\limitation[1][TikZ]{\newline{\small This works only with \Opt{framemethod=#1}.}}
+
+
+
 
 
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 ccad5636f2e..058c9ef5a02 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf
@@ -1,99 +1,94 @@
-%%==================================================%%
-%%= Ausgabe der Box nach Vorgabe der Ausgaberoutine=%%
-%%==================================================%%
-%% Styledatei fuer das Paket mdframed erstellt durch
-%% Marco Daniel und Elke Schubert
-%% 
+%% Style file for mdframed for package option `framemethod=default`
+%%
 %% 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-0.mdf 219 2011-11-13 14:17:56Z marco $
-%%$Rev: 219 $
-%%$Author: marco $
-%%$Date: 2011-11-13 15:17:56 +0100 (So, 13. Nov 2011) $
-
+%%$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $
 \def\mdframedOpackagename{md-frame-0}
 \def\md@frameOdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{md-frame-0.mdf}[\md@frameOdate@svn$Id: md-frame-0.mdf 219 2011-11-13 14:17:56Z marco $ \mdversion: \mdframedOpackagename]
+\ProvidesFile{md-frame-0.mdf}%
+    [\md@frameOdate@svn$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $%
+     \mdversion: \mdframedOpackagename]
 
-%Hilfparameter
 \def\mdf@background@default{\color{\mdf@backgroundcolor}}
 \def\mdf@linecolor@default{\color{\mdf@middlelinecolor}}
-
-%%==================================================%%
-%%================single-box========================%%
-%%==================================================%%
 \def\md@frame@background@single{%
-        \rlap{\mdf@background@default%
-              \rule[-\mdfboundingboxdepth]%
-                   {\mdfboundingboxtotalwidth}%
-                   {\mdfboundingboxtotalheight}%
-              }%
+  \rlap{\mdf@background@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdfboundingboxtotalheight}%
+  }%
 }%
-%
 \def\md@frame@topandbottomline@single{%
-           \rlap{\mdf@linecolor@default%
-               \ifbool{mdf@topline}{%
-                   \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth+\mdf@innerbottommargin@length+\mdf@innertopmargin@length\relax]
-                        {\mdfboundingboxtotalwidth}%
-                        {\mdf@middlelinewidth@length}}%
-                  {}%
-                }%
-           \rlap{\mdf@linecolor@default%
-               \ifbool{mdf@bottomline}{%
-                   \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]%
-                        {\mdfboundingboxtotalwidth}%
-                        {\mdf@middlelinewidth@length}}%
-                  {}%
-                }% 
+  \rlap{\mdf@linecolor@default%
+     \ifbool{mdf@topline}{%
+          \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth%
+                       +\mdf@innerbottommargin@length+\mdf@innertopmargin@length\relax]%
+               {\mdfboundingboxtotalwidth}%
+               {\mdf@middlelinewidth@length}}%
+         {}%
+  }%
+  \rlap{\mdf@linecolor@default%
+     \ifbool{mdf@bottomline}{%
+         \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]%
+              {\mdfboundingboxtotalwidth}%
+              {\mdf@middlelinewidth@length}}%
+         {}%
+  }%
 }
-%
 \def\md@frame@leftline@single{%
-           \llap{\mdf@linecolor@default%
-                   \rule[\dimexpr-\mdfboundingboxdepth%
-                         \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]%
-                        {\mdf@middlelinewidth@length}%
-                        {\dimexpr\mdfboundingboxtotalheight%
-                         +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}
-                         +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-                  }% 
+  \llap{\mdf@linecolor@default%
+     \rule[\dimexpr-\mdfboundingboxdepth%
+           \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+           +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}%
+           +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
 }%
-%
 \def\md@frame@rightline@single{%
-         \rlap{\mdf@linecolor@default%
-               \hspace*{\mdfboundingboxwidth}%
-               \hspace*{\mdf@innerrightmargin@length}%
-               \rule[\dimexpr-\mdfboundingboxdepth%
-                        \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]%
-                    {\mdf@middlelinewidth@length}%
-                    {\dimexpr\mdfboundingboxtotalheight%
-                         +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}%
-                         +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-              }%
+  \rlap{\mdf@linecolor@default%
+     \hspace*{\mdfboundingboxwidth}%
+     \hspace*{\mdf@innerrightmargin@length}%
+     \rule[\dimexpr-\mdfboundingboxdepth%
+           \ifbool{mdf@bottomline}{-\mdf@middlelinewidth@length}{}\relax]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+           +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}%
+           +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
 }%
-%
 \def\md@putbox@single{%%%%% Ausgabe der ungesplitteten Gesamtbox
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+    \mdf@makebox@out{%
       \mdf@makeboxalign@left%
-      \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}%
-      \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}%
-      \setlength{\mdfboundingboxheight}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-      \setlength{\mdfboundingboxdepth}{\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}%
-      \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length+\mdf@innerbottommargin@length\relax}%
+      \setlength{\mdfboundingboxwidth}%
+                   {\wd\@tempboxa}%
+      \setlength{\mdfboundingboxtotalwidth}%
+                   {\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length%
+                    +\mdf@innerrightmargin@length\relax}%
+      \setlength{\mdfboundingboxheight}%
+                   {\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
+      \setlength{\mdfboundingboxdepth}%
+                   {\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}%
+      \setlength{\mdfboundingboxtotalheight}%
+                   {\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length%
+                    +\mdf@innerbottommargin@length\relax}%
       \noindent%
       \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth%
-                             +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}%
-                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}%
-      \mdf@makebox[\@tempdima]{%
+                             +\ifbool{mdf@leftline}%
+                                     {\mdf@middlelinewidth@length}{\z@}%
+                             +\ifbool{mdf@rightline}%
+                                     {\mdf@middlelinewidth@length}{\z@}\relax}%
+      \mdf@makebox@in[\@tempdima]{%
         \null%
         \ifbool{mdf@leftline}{%
            \hspace*{\mdf@middlelinewidth@length}%
            \md@frame@leftline@single%
             }{}%
-        \md@frame@topandbottomline@single
+        \md@frame@topandbottomline@single%
         \md@frame@background@single%
         \hspace*{\mdf@innerleftmargin@length}%
         \ifbool{mdf@rightline}{%
@@ -105,57 +100,59 @@
   }%
   \fi%
 }
-%%==================================================%%
-%%================first-box=========================%%
-%%==================================================%%
-%
 \def\md@frame@background@first{%
-       \rlap{\mdf@background@default%
-              \rule[-\mdfboundingboxdepth]%
-                   {\mdfboundingboxtotalwidth}%
-                   {\mdfboundingboxtotalheight}%
-              }%
+  \rlap{\mdf@background@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdfboundingboxtotalheight}%
+  }%
 }%
-%
 \def\md@frame@leftline@first{%
-       \llap{\mdf@linecolor@default%
-             \rule[-\mdfboundingboxdepth]%
-                  {\mdf@middlelinewidth@length}%
-                  {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-       }%
+  \llap{\mdf@linecolor@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+            +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
 }%
-%
 \def\md@frame@topline@first{%
-      \rlap{\mdf@linecolor@default%
-             \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth+\mdf@splitbottomskip@length+\mdf@innertopmargin@length\relax]
-                  {\mdfboundingboxtotalwidth}%
-                  {\mdf@middlelinewidth@length}%
-      }%
+  \rlap{\mdf@linecolor@default%
+     \rule[\dimexpr\mdfboundingboxheight-\mdfboundingboxdepth+%
+            \mdf@splitbottomskip@length+\mdf@innertopmargin@length\relax]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdf@middlelinewidth@length}%
+  }%
 }
-%
 \def\md@frame@rightline@first{%
-       \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
-            \hspace*{\mdf@innerrightmargin@length}%
-             \rule[-\mdfboundingboxdepth]%
-                  {\mdf@middlelinewidth@length}%
-                  {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-       }%
+  \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
+     \hspace*{\mdf@innerrightmargin@length}%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+            +\ifbool{mdf@topline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
 }%
-%
 \def\md@putbox@first{%%%% Ausgabe der Teilbox 1
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+    \mdf@makebox@out[\linewidth]{%
       \mdf@makeboxalign@left%
       \setlength{\mdfboundingboxwidth}{\wd\tw@}%
-      \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}%
+      \setlength{\mdfboundingboxtotalwidth}%
+                   {\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length%
+                            +\mdf@innerrightmargin@length\relax}%
       \setlength{\mdfboundingboxheight}{\dimexpr\ht\tw@+\dp\tw@\relax}%
-      \setlength{\mdfboundingboxdepth}{\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}%
-      \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length+\mdf@splitbottomskip@length\relax}%
-      \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth%
-                             +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}%
-                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}%
-      \mdf@makebox[\@tempdima]{%
+      \setlength{\mdfboundingboxdepth}%
+                   {\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}%
+      \setlength{\mdfboundingboxtotalheight}%
+                   {\dimexpr\mdfboundingboxheight+\mdf@innertopmargin@length%
+                           +\mdf@splitbottomskip@length\relax}%
+      \setlength{\@tempdima}%
+                   {\dimexpr\mdfboundingboxtotalwidth%
+                           +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}%
+                           +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}%
+                    \relax}%
+      \mdf@makebox@in[\@tempdima]{%
         \null%
         \ifbool{mdf@leftline}{%
            \hspace*{\mdf@middlelinewidth@length}%
@@ -169,61 +166,61 @@
         {\box\tw@}%
     }%
     \mdf@makeboxalign@right%
-    }%
+  }%
  \fi%
 }
-%%==================================================%%
-%%=================last-box=========================%%
-%%==================================================%%
 \def\md@frame@background@second{%
-        \rlap{\mdf@background@default%
-               \rule[-\mdfboundingboxdepth]%
-                    {\mdfboundingboxtotalwidth}%
-                   {\mdfboundingboxtotalheight}%
-               }%
+  \rlap{\mdf@background@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdfboundingboxtotalheight}%
+  }%
 }%
-%
 \def\md@frame@leftline@second{%
-       \llap{\mdf@linecolor@default%
-             \rule[\dimexpr-\mdfboundingboxdepth%
-                   -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]%
-                  {\mdf@middlelinewidth@length}%
-                  {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-       }%     
+  \llap{\mdf@linecolor@default%
+     \rule[\dimexpr-\mdfboundingboxdepth%
+            -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+              +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
 }%
-%
 \def\md@frame@bottomline@second{%
-      \rlap{\mdf@linecolor@default%
-             \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]
-                  {\mdfboundingboxtotalwidth}%
-                  {\mdf@middlelinewidth@length}%
-      }%
+  \rlap{\mdf@linecolor@default%
+     \rule[\dimexpr-\mdfboundingboxdepth-\mdf@middlelinewidth@length\relax]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdf@middlelinewidth@length}%
+  }%
 }%
-%
 \def\md@frame@rightline@second{%
-       \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
-            \hspace*{\mdf@innerrightmargin@length}%
-             \rule[\dimexpr-\mdfboundingboxdepth%
-                   -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]%
-                  {\mdf@middlelinewidth@length}%
-                  {\dimexpr\mdfboundingboxtotalheight+\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}%
-       }%
-}% 
-%
+  \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
+     \hspace*{\mdf@innerrightmargin@length}%
+     \rule[\dimexpr-\mdfboundingboxdepth%
+            -\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax]%
+          {\mdf@middlelinewidth@length}%
+          {\dimexpr\mdfboundingboxtotalheight%
+              +\ifbool{mdf@bottomline}{\mdf@middlelinewidth@length}{0pt}\relax}%
+  }%
+}%
 \def\md@putbox@second{%
   \ifvoid\@tempboxa%
   \else
-   \mdf@makebox[\linewidth]{%
+   \mdf@makebox@out{%
       \mdf@makeboxalign@left%
       \setlength{\mdfboundingboxwidth}{\wd\@tempboxa}%
-      \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}%
+      \setlength{\mdfboundingboxtotalwidth}%
+                   {\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length%
+                        +\mdf@innerrightmargin@length\relax}%
       \setlength{\mdfboundingboxheight}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-      \setlength{\mdfboundingboxdepth}{\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}%
-      \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@innerbottommargin@length\relax}%
+      \setlength{\mdfboundingboxdepth}%
+                   {\dimexpr\dp\@tempboxa+\mdf@innerbottommargin@length\relax}%
+      \setlength{\mdfboundingboxtotalheight}%
+                   {\dimexpr\mdfboundingboxheight+\mdf@innerbottommargin@length\relax}%
       \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth%
                              +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}%
-                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}%
-      \mdf@makebox[\@tempdima]{%
+                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}%
+                            \relax}%
+      \mdf@makebox@in[\@tempdima]{%
       \null%
         \ifbool{mdf@leftline}{%
            \hspace*{\mdf@middlelinewidth@length}%
@@ -237,51 +234,50 @@
         {\box\@tempboxa}%
     }%
     \mdf@makeboxalign@right%
-    }%
+  }%
   \fi%
 }%
-%%==================================================%%
-%%================middle-box========================%%
-%%==================================================%%
 \def\md@frame@background@middle{%
-        \rlap{\mdf@background@default%
-              \rule[-\mdfboundingboxdepth]%
-                    {\mdfboundingboxtotalwidth}%
-                    {\mdfboundingboxtotalheight}%
-              }%
+  \rlap{\mdf@background@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdfboundingboxtotalwidth}%
+          {\mdfboundingboxtotalheight}%
+  }%
 }%
-% 
 \def\md@frame@leftline@middle{%
-       \llap{\mdf@linecolor@default%
-             \rule[-\mdfboundingboxdepth]%
-                  {\mdf@middlelinewidth@length}%
-                  {\mdfboundingboxtotalheight}%
-       }%     
+  \llap{\mdf@linecolor@default%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdf@middlelinewidth@length}%
+          {\mdfboundingboxtotalheight}%
+  }%
 }%
-%
 \def\md@frame@rightline@middle{%
-       \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
-            \hspace*{\mdf@innerrightmargin@length}%
-             \rule[-\mdfboundingboxdepth]%
-                  {\mdf@middlelinewidth@length}%
-                  {\mdfboundingboxtotalheight}%
-       }%
-}% 
-%
+  \rlap{\mdf@linecolor@default\hspace*{\mdfboundingboxwidth}%
+     \hspace*{\mdf@innerrightmargin@length}%
+     \rule[-\mdfboundingboxdepth]%
+          {\mdf@middlelinewidth@length}%
+          {\mdfboundingboxtotalheight}%
+  }%
+}%
 \def\md@putbox@middle{%
   \ifvoid\@tempboxa%
   \else
-   \mdf@makebox[\linewidth]{%
+   \mdf@makebox@out{%
       \mdf@makeboxalign@left%
       \setlength{\mdfboundingboxwidth}{\wd\tw@}%
-      \setlength{\mdfboundingboxtotalwidth}{\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}%
+      \setlength{\mdfboundingboxtotalwidth}%
+                   {\dimexpr\mdfboundingboxwidth+\mdf@innerleftmargin@length%
+                           +\mdf@innerrightmargin@length\relax}%
       \setlength{\mdfboundingboxheight}{\dimexpr\ht\tw@+\dp\tw@\relax}%
-      \setlength{\mdfboundingboxdepth}{\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}%
-      \setlength{\mdfboundingboxtotalheight}{\dimexpr\mdfboundingboxheight+\mdf@splitbottomskip@length\relax}%
+      \setlength{\mdfboundingboxdepth}%
+                   {\dimexpr\dp\tw@+\mdf@splitbottomskip@length\relax}%
+      \setlength{\mdfboundingboxtotalheight}%
+                   {\dimexpr\mdfboundingboxheight+\mdf@splitbottomskip@length\relax}%
       \setlength{\@tempdima}{\dimexpr\mdfboundingboxtotalwidth%
                              +\ifbool{mdf@leftline}{\mdf@middlelinewidth@length}{\z@}%
-                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}\relax}%
-      \mdf@makebox[\@tempdima]{%
+                             +\ifbool{mdf@rightline}{\mdf@middlelinewidth@length}{\z@}%
+                    \relax}%
+      \mdf@makebox@in[\@tempdima]{%
         \null%
         \ifbool{mdf@leftline}{%
            \hspace*{\mdf@middlelinewidth@length}%
@@ -289,10 +285,11 @@
         \md@frame@background@middle%
         \hspace*{\mdf@innerleftmargin@length}%
         \ifbool{mdf@rightline}{%
-            \md@frame@rightline@middle}{}
+            \md@frame@rightline@middle}{}%
            {\box\tw@}%
     }%
     \mdf@makeboxalign@right%
-    }%
+  }
   \fi%
 }
+ \endinput
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 ea3832e27fb..8a90831e83d 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
@@ -1,21 +1,15 @@
-%%==================================================%%
-%%= Ausgabe der Box nach Vorgabe der Ausgaberoutine=%%
-%%==================================================%%
-%% Styledatei fuer das Paket mdframed erstellt durch
-%% Marco Daniel und Elke Schubert
-%% 
+%% Style file for mdframed for package option `framemethod=default`
+%%
 %% 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-1.mdf 223 2011-11-13 18:10:49Z marco $
-%%$Rev: 223 $
-%%$Author: marco $
-%%$Date: 2011-11-13 19:10:49 +0100 (So, 13. Nov 2011) $
-
+%%$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $
 \def\mdframedIpackagename{md-frame-1}
 \def\md@frameIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{md-frame-1.mdf}[\md@frameIdate@svn$Id: md-frame-1.mdf 223 2011-11-13 18:10:49Z marco $ \mdversion: \mdframedIpackagename]
+\ProvidesFile{md-frame-1.mdf}%
+          [\md@frameIdate@svn$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $ %
+           \mdversion: \mdframedIpackagename]
 %%%%    _____t_____
 %%%%   |           |
 %%%%   |           |
@@ -26,102 +20,104 @@
 %%%%   |___________|
 %%%%         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})}}
-\newrobustcmd*\md@test@lr{\ifboolexpr{not (bool {mdf@topline}) and not (bool {mdf@bottomline})
-                                      and (bool {mdf@leftline}) and (bool {mdf@rightline})}}
-\newrobustcmd*\md@test@tb{\ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline})
-                                      and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
-%Einzellinien
-\newrobustcmd*\md@test@l{\ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
-                                      and (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
-\newrobustcmd*\md@test@r{\ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
-                                      and not (bool {mdf@leftline}) and (bool {mdf@rightline})}}
-\newrobustcmd*\md@test@t{\ifboolexpr{ (bool {mdf@topline}) and not (bool {mdf@bottomline})
-                                      and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
-\newrobustcmd*\md@test@b{\ifboolexpr{ not (bool {mdf@topline}) and (bool {mdf@bottomline})
-                                      and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
-%keine Linien
-\newrobustcmd*\md@test@noline{\ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
-                                      and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
-%
-%Allgemeine Einstellungen fuer tikz
+\newrobustcmd*\md@test@ltrb{%
+    \ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline})
+                  and (bool {mdf@leftline}) and (bool {mdf@rightline})}}
+\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})}}
+\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})}}
+\newrobustcmd*\md@test@lr{%
+    \ifboolexpr{not (bool {mdf@topline}) and not (bool {mdf@bottomline})
+                  and (bool {mdf@leftline}) and (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@tb{%
+    \ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline})
+                  and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@l{%
+    \ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
+                  and (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@r{%
+    \ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
+                  and not (bool {mdf@leftline}) and (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@t{%
+    \ifboolexpr{ (bool {mdf@topline}) and not (bool {mdf@bottomline})
+                  and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@b{%
+    \ifboolexpr{ not (bool {mdf@topline}) and (bool {mdf@bottomline})
+                  and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
+\newrobustcmd*\md@test@noline{%
+    \ifboolexpr{ not (bool {mdf@topline}) and not (bool {mdf@bottomline})
+                  and not (bool {mdf@leftline}) and not (bool {mdf@rightline})}}
 \def\md@tikz@settings{%
-%
-  \tikzset{mdfbox/.style={anchor=south west,inner sep=0pt,outer sep=0pt,\mdf@fontcolor,}}% anchor der Ausgabebox ist unten links
-  \tikzset{mdfcorners/.style={rounded corners=\mdf@roundcorner@length}}% 
-  \tikzset{mdfbackground/.style={fill=\mdf@backgroundcolor,draw=\mdf@backgroundcolor}}% 
-%
+  \tikzset{mdfbox/.style={anchor=south west,%
+                          inner sep=0pt,%
+                          outer sep=0pt,%
+                          \mdf@fontcolor,}}% anchor der Ausgabebox ist unten links
+  \tikzset{mdfcorners/.style={rounded corners=\mdf@roundcorner@length}}%
+  \tikzset{mdfbackground/.style={fill=\mdf@backgroundcolor,%
+                                 draw=\mdf@backgroundcolor}}%
   \tikzset{mdfouterline/.style={}}%
-  \ifdimgreater{\mdf@outerlinewidth@length}{\z@}%nur wenn outerlinewidth>0 wird aussere Linie gezeichnet
+  \ifdimgreater{\mdf@outerlinewidth@length}{\z@}
     {\tikzset{mdfouterline/.append style={%
       draw=\mdf@outerlinecolor,%
       line width=2\mdf@outerlinewidth@length+\mdf@middlelinewidth@length}}}{}%
-%
   \tikzset{mdfinnerline/.style={}}%
-  \ifdimgreater{\mdf@innerlinewidth@length}{\z@}% nur wenn innerlinewidth>0 wird innere Linie gezeichnet
+  \ifdimgreater{\mdf@innerlinewidth@length}{\z@}
     {\tikzset{mdfinnerline/.append style={%
       draw=\mdf@innerlinecolor,%
       line width=2\mdf@innerlinewidth@length+\mdf@middlelinewidth@length}}}{}%
-%
   \mdf@tikzset@local
   \tikzset{mdfmiddleline/.style={}}%
-  \ifdimgreater{\mdf@middlelinewidth@length}{\z@}% nur wenn middlelinewidth>0 wird mittlere Linie gezeichnet
+  \ifdimgreater{\mdf@middlelinewidth@length}{\z@}
     {\tikzset{mdfmiddleline/.append style={%
-      preaction={draw=\mdf@middlelinecolor,line width=\mdf@middlelinewidth@length},%
+      preaction={draw=\mdf@middlelinecolor,%
+                 line width=\mdf@middlelinewidth@length},%
       line width=\mdf@middlelinewidth@length,%
       tikzsetting}}%
     }{}%
 }%
-%
-
-
-% Befehle fuer Ausgabe von Rahmen und Hintergrund
 \newrobustcmd*\md@tikzbox@tfl[1]{%three or four borders
-                                \clip(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);%
-                                \begin{scope}[mdfcorners]%
-                                  \clip[preaction=mdfouterline][postaction=mdfbackground][postaction=mdfinnerline]#1;%
-                                \end{scope}%
-                                \path[mdfmiddleline,mdfcorners]#1;}%
+    \clip(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);%
+    \begin{scope}[mdfcorners]%
+       \clip[preaction=mdfouterline]%
+            [postaction=mdfbackground]%
+            [postaction=mdfinnerline]#1;%
+    \end{scope}%
+    \path[mdfmiddleline,mdfcorners]#1;}%
 \newrobustcmd*\md@tikzbox@otl[2]{%one or two borders
-                                \clip(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);%
-                                \begin{scope}
-                                  \path[mdfouterline,mdfcorners]#1;%
-                                  \clip[postaction=mdfbackground]#2;%
-                                  \path[mdfinnerline,mdfcorners]#1;%
-                                \end{scope}
-                                \path[mdfmiddleline,mdfcorners]#1;}%
-%
-% Info zu den verwendeten Punkten:
-% O ist die untere linke Ecke der Mitte der middleline
-% P ist die obere rechte Ecke der Mitte der middleline
-% A ist der Punkt fuer den anchor (d.h. die untere linke Ecke) der Ausgabebox
-%
+    \clip(0,0)rectangle(\mdfboundingboxwidth,\mdfboundingboxheight);%
+    \begin{scope}
+       \path[mdfouterline,mdfcorners]#1;%
+       \clip[postaction=mdfbackground]#2;%
+       \path[mdfinnerline,mdfcorners]#1;%
+    \end{scope}
+    \path[mdfmiddleline,mdfcorners]#1;}%
 \def\md@putbox@single{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+   \mdf@makebox@out{%
     \mdf@makeboxalign@left%
     \md@tikz@settings%
-%
     \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
     \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax%
     \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax%
@@ -133,7 +129,6 @@
       \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\@tempboxa+\dp\@tempboxa\relax}%
     \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax%
     \advance\mdfboundingboxheight by \mdf@innerbottommargin@length\relax%
@@ -145,9 +140,9 @@
       \advance\mdfboundingboxheight by \mdf@innerlinewidth@length\relax%
       \advance\mdfboundingboxheight by \mdf@middlelinewidth@length\relax%
       \advance\mdfboundingboxheight by \mdf@outerlinewidth@length\relax}{}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
+    \mdf@makebox@in[\mdfboundingboxwidth]{%
     \null%
-    \begin{tikzpicture}%
+    \begin{tikzpicture}[remember picture]%
      \begin{scope}
       \pgfmathsetlengthmacro\md@Ax{+\mdf@innerleftmargin@length}%
       \pgfmathsetlengthmacro\md@Ay{+\mdf@innerbottommargin@length}%
@@ -155,56 +150,84 @@
       \pgfmathsetlengthmacro\md@Oy{+0pt}%
       \pgfmathsetlengthmacro\md@Px{+\mdfboundingboxwidth}%
       \pgfmathsetlengthmacro\md@Py{+\mdfboundingboxheight}%
-      \ifbool{mdf@leftline}{%
-        \pgfmathsetlengthmacro\md@Ax{\md@Ax+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-        \pgfmathsetlengthmacro\md@Ox{\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@rightline}{%
-         \pgfmathsetlengthmacro\md@Px{\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@bottomline}{%
-         \pgfmathsetlengthmacro\md@Ay{\md@Ay+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-         \pgfmathsetlengthmacro\md@Oy{\md@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@topline}{%
-         \pgfmathsetlengthmacro\md@Py{\md@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
-%
+      \ifbool{mdf@leftline}%
+        {%
+         \pgfmathsetlengthmacro\md@Ax%
+              {\md@Ax+\mdf@outerlinewidth@length+%
+               \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
+         \pgfmathsetlengthmacro\md@Ox%
+              {\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+        }{}%
+      \ifbool{mdf@rightline}%
+        {%
+         \pgfmathsetlengthmacro\md@Px%
+              {\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+        }{}%
+      \ifbool{mdf@bottomline}%
+        {%
+         \pgfmathsetlengthmacro\md@Ay%
+              {\md@Ay+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length%
+                +\mdf@innerlinewidth@length}%
+         \pgfmathsetlengthmacro\md@Oy%
+              {\md@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+        }{}%
+      \ifbool{mdf@topline}%
+        {%
+         \pgfmathsetlengthmacro\md@Py%
+              {\md@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+        }{}%
       \coordinate(O)at(\md@Ox,\md@Oy);%
       \coordinate(P)at(\md@Px,\md@Py);%
-%
       \md@test@ltrb{\md@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)--cycle}}{}%
-%
       \md@test@ltb{\md@tikzbox@tfl{(P|-O)--(O)--(O|-P)--(P)}}{}%
       \md@test@trb{\md@tikzbox@tfl{(O|-P)--(P)--(P|-O)--(O)}}{}%
       \md@test@ltr{\md@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}{}%
       \md@test@lrb{\md@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}{}%
-%
-      \md@test@lb{\md@tikzbox@otl{(P|-O)--(O)--(O|-P)}{(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}}{}%
-      \md@test@rb{\md@tikzbox@otl{(P)--(P|-O)--(O)}{(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}}{}% 
-      \md@test@tr{\md@tikzbox@otl{(O-|P)--(P)--(P-|O)}{(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}}{}%
-      \md@test@lt{\md@tikzbox@otl{(O)--(O|-P)--(P)}{(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}}{}%
-      \md@test@lr{\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}{}%
-      \md@test@tb{\md@tikzbox@otl{(O)--(O-|P)(O|-P)--(P)}{(O)rectangle(P)}}{}%
-%
-      \md@test@l{\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}{}%
-      \md@test@r{\md@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}{}%
-      \md@test@t{\md@tikzbox@otl{(O|-P)--(P)}{(O)rectangle(P)}}{}%
-      \md@test@b{\md@tikzbox@otl{(O)--(O-|P)}{(O)rectangle(P)}}{}%
-%
+      \md@test@lb{\md@tikzbox@otl{(P|-O)--(O)--(O|-P)}%
+                                 {(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}%
+                 }{}%
+      \md@test@rb{\md@tikzbox@otl{(P)--(P|-O)--(O)}%
+                                 {(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}%
+                 }{}%
+      \md@test@tr{\md@tikzbox@otl{(O-|P)--(P)--(P-|O)}%
+                                 {(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}%
+                 }{}%
+      \md@test@lt{\md@tikzbox@otl{(O)--(O|-P)--(P)}%
+                                 {(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}%
+                 }{}%
+      \md@test@lr{\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
+      \md@test@tb{\md@tikzbox@otl{(O)--(O-|P)(O|-P)--(P)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
+      \md@test@l{\md@tikzbox@otl{(O)--(O|-P)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
+      \md@test@r{\md@tikzbox@otl{(O-|P)--(P)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
+      \md@test@t{\md@tikzbox@otl{(O|-P)--(P)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
+      \md@test@b{\md@tikzbox@otl{(O)--(O-|P)}%
+                                 {(O)rectangle(P)}%
+                 }{}%
       \md@test@noline{\path[mdfbackground,mdfcorners](O)rectangle(P);}{}%
-%
       \node[mdfbox]at(\md@Ax,\md@Ay){\box\@tempboxa};% Ausgabebox einfuegen
      \end{scope}
      %HIER KOMMT EIN WEITERES MAKRO
-     \mdfcreateextratikz;
+     \mdfcreateextratikz
     \end{tikzpicture}%
     }%
    \mdf@makeboxalign@right%
   }%
  \fi
 }%
-
 \def\md@putbox@first{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+        \mdf@makebox@out{%
     \mdf@makeboxalign@left%
     \md@tikz@settings%
     \setlength\mdfboundingboxwidth{\wd\tw@}%
@@ -218,7 +241,6 @@
       \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\tw@+\dp\tw@\relax}%
     \advance\mdfboundingboxheight by \mdf@innertopmargin@length\relax%
     \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax%
@@ -226,65 +248,75 @@
       \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[\mdfboundingboxwidth]{%
+    \mdf@makebox@in[\mdfboundingboxwidth]{%
     \null%
-    \begin{tikzpicture}
+    \begin{tikzpicture}[remember picture]
      \begin{scope}
-%
       \pgfmathsetlengthmacro\md@Ax{+\mdf@innerleftmargin@length}%
       \pgfmathsetlengthmacro\md@Ay{+\mdf@splitbottomskip@length}%
       \pgfmathsetlengthmacro\md@Ox{+0pt}%
       \pgfmathsetlengthmacro\md@Oy{+0pt}%
       \pgfmathsetlengthmacro\md@Px{+\mdfboundingboxwidth}%
       \pgfmathsetlengthmacro\md@Py{+\mdfboundingboxheight}%
-      \ifbool{mdf@leftline}{%
-        \pgfmathsetlengthmacro\md@Ax{\md@Ax+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-        \pgfmathsetlengthmacro\md@Ox{\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
+      \ifbool{mdf@leftline}
+        {%
+         \pgfmathsetlengthmacro\md@Ax%
+              {\md@Ax+\mdf@outerlinewidth@length+%
+               \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
+         \pgfmathsetlengthmacro\md@Ox%
+              {\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+        }{}%
       \ifbool{mdf@rightline}{%
-         \pgfmathsetlengthmacro\md@Px{\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
+          \pgfmathsetlengthmacro\md@Px%
+              {\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+        }{}%
       \ifbool{mdf@topline}{%
-         \pgfmathsetlengthmacro\md@Py{\md@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
-%
+          \pgfmathsetlengthmacro\md@Py%
+              {\md@Py-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+        }{}%
       \coordinate(O)at(\md@Ox,\md@Oy);%
       \coordinate(P)at(\md@Px,\md@Py);%
-%
-      \ifboolexpr{test {\md@test@ltrb} or test {\md@test@ltr}}{\md@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}{}%
+      \ifboolexpr{test {\md@test@ltrb} or test {\md@test@ltr}}%
+        {\md@tikzbox@tfl{(O)--(O|-P)--(P)--(P|-O)}}%
+        {}%
       \ifboolexpr{test {\md@test@ltb} or test {\md@test@lt}}%
-               {\md@tikzbox@otl{(O)--(O|-P)--(P)}{(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}}{}%
+        {\md@tikzbox@otl{(O)--(O|-P)--(P)}{(P|-O)--(O)[mdfcorners]--(O|-P)--(P)}}%
+        {}%
       \ifboolexpr{test {\md@test@trb} or test {\md@test@tr}}%
-               {\md@tikzbox@otl{(O-|P)--(P)--(P-|O);}{(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}}{}%
+        {\md@tikzbox@otl{(O-|P)--(P)--(P-|O)}{(O)--(O|-P)[mdfcorners]--(P)--(P|-O)}}%
+        {}%
       \ifboolexpr{test {\md@test@lrb} or test {\md@test@lr}}%
-               {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@tb} or test {\md@test@t}}{\md@tikzbox@otl{(O|-P)--(P)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@lb} or test {\md@test@l}}{\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@rb} or test {\md@test@r}}{\md@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}{}%
-      \md@test@b{\path[mdfbackground](O)rectangle(P);}{}%
-%
+        {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@tb} or test {\md@test@t}}%
+        {\md@tikzbox@otl{(O|-P)--(P)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@lb} or test {\md@test@l}}%
+        {\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@rb} or test {\md@test@r}}%
+        {\md@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}%
+        {}%
+      \md@test@b{\path[mdfbackground](O)rectangle(P)}{}%
       \md@test@noline{\path[mdfbackground,mdfcorners](O)--(O|-P)--(P)--(P|-O);}{}%
-%
       \node[mdfbox]at(\md@Ax,\md@Ay){\box\tw@};% Ausgabebox einfuegen
      \end{scope}
      %HIER KOMMT EIN WEITERES MAKRO
-     \mdfcreateextratikz;
+     \mdfcreateextratikz%
     \end{tikzpicture}%
     }%
    \mdf@makeboxalign@right%
   }%
  \fi
 }%
-
-
-
 \def\md@putbox@middle{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+        \mdf@makebox@out{%
     \mdf@makeboxalign@left%
     \md@tikz@settings%
-%
     \setlength\mdfboundingboxwidth{\wd\tw@}%
     \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax%
     \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax%
@@ -296,13 +328,11 @@
       \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\tw@+\dp\tw@\relax}%
     \advance\mdfboundingboxheight by \mdf@splitbottomskip@length\relax%
-%
-    \mdf@makebox[\mdfboundingboxwidth]{%
+    \mdf@makebox@in[\mdfboundingboxwidth]{%
     \null%
-    \begin{tikzpicture}
+    \begin{tikzpicture}[remember picture]
      \begin{scope}
       \pgfmathsetlengthmacro\md@Ax{+\mdf@innerleftmargin@length}%
       \pgfmathsetlengthmacro\md@Ay{+\mdf@splitbottomskip@length}%
@@ -310,24 +340,29 @@
       \pgfmathsetlengthmacro\md@Oy{+0pt}%
       \pgfmathsetlengthmacro\md@Px{+\mdfboundingboxwidth}%
       \pgfmathsetlengthmacro\md@Py{+\mdfboundingboxheight}%
-      \ifbool{mdf@leftline}{%
-        \pgfmathsetlengthmacro\md@Ax{\md@Ax+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-        \pgfmathsetlengthmacro\md@Ox{\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@rightline}{%
-         \pgfmathsetlengthmacro\md@Px{\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
-%
+      \ifbool{mdf@leftline}%
+        {%
+         \pgfmathsetlengthmacro\md@Ax%
+              {\md@Ax+\mdf@outerlinewidth@length+%
+               \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
+         \pgfmathsetlengthmacro\md@Ox%
+              {\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+         }{}%
+      \ifbool{mdf@rightline}%
+         {%
+          \pgfmathsetlengthmacro\md@Px%
+              {\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+         }{}%
       \coordinate(O)at(\md@Ox,\md@Oy);%
       \coordinate(P)at(\md@Px,\md@Py);%
-%
       \ifboolexpr{bool {mdf@leftline} and bool {mdf@rightline}}%
-               {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P);}}{}%
+               {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}{}%
       \ifboolexpr{bool {mdf@leftline} and not (bool {mdf@rightline})}%
-               {\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P);}}{}%
+               {\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}{}%
       \ifboolexpr{not (bool {mdf@leftline}) and bool {mdf@rightline}}%
-               {\md@tikzbox@otl{(P)--(P|-O)}{(O)rectangle(P);}}{}%
+               {\md@tikzbox@otl{(P)--(P|-O)}{(O)rectangle(P)}}{}%
       \ifboolexpr{not (bool {mdf@leftline}) and not (bool {mdf@rightline})}%
-               {\path[mdfbackground](O)rectangle(P);}{}%
-%
+               {\path[mdfbackground](O)rectangle(P)}{}%
       \node[mdfbox]at(\md@Ax,\md@Ay){\box\tw@};% Ausgabebox einfuegen
      \end{scope}
      %HIER KOMMT EIN WEITERES MAKRO
@@ -337,15 +372,12 @@
   }%
  \fi
 }%
-
-
 \def\md@putbox@second{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+        \mdf@makebox@out{%
     \mdf@makeboxalign@left%
     \md@tikz@settings%
-%
     \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
     \advance\mdfboundingboxwidth by \mdf@innerleftmargin@length\relax%
     \advance\mdfboundingboxwidth by \mdf@innerrightmargin@length\relax%
@@ -357,17 +389,15 @@
       \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\@tempboxa+\dp\@tempboxa\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}{}%
-%
-    \mdf@makebox[\mdfboundingboxwidth]{%
+    \mdf@makebox@in[\mdfboundingboxwidth]{%
     \null%
-    \begin{tikzpicture}
+    \begin{tikzpicture}[remember picture]
      \begin{scope}
       \pgfmathsetlengthmacro\md@Ax{+\mdf@innerleftmargin@length}%
       \pgfmathsetlengthmacro\md@Ay{+\mdf@innerbottommargin@length}%
@@ -375,32 +405,52 @@
       \pgfmathsetlengthmacro\md@Oy{+0pt}%
       \pgfmathsetlengthmacro\md@Px{+\mdfboundingboxwidth}%
       \pgfmathsetlengthmacro\md@Py{+\mdfboundingboxheight}%
-      \ifbool{mdf@leftline}{%
-        \pgfmathsetlengthmacro\md@Ax{\md@Ax+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-        \pgfmathsetlengthmacro\md@Ox{\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@rightline}{%
-         \pgfmathsetlengthmacro\md@Px{\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}}{}%
-      \ifbool{mdf@bottomline}{%
-         \pgfmathsetlengthmacro\md@Ay{\md@Ay+\mdf@outerlinewidth@length+\mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
-         \pgfmathsetlengthmacro\md@Oy{\md@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}}{}%
-%
+      \ifbool{mdf@leftline}%
+        {%
+         \pgfmathsetlengthmacro\md@Ax%
+              {\md@Ax+\mdf@outerlinewidth@length+%
+               \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
+          \pgfmathsetlengthmacro\md@Ox%
+              {\md@Ox+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+         }{}%
+      \ifbool{mdf@rightline}%
+         {%
+          \pgfmathsetlengthmacro\md@Px%
+              {\md@Px-\mdf@outerlinewidth@length-0.5\mdf@middlelinewidth@length}%
+         }{}%
+      \ifbool{mdf@bottomline}%
+         {%
+          \pgfmathsetlengthmacro\md@Ay%
+              {\md@Ay+\mdf@outerlinewidth@length+%
+               \mdf@middlelinewidth@length+\mdf@innerlinewidth@length}%
+          \pgfmathsetlengthmacro\md@Oy%
+              {\md@Oy+\mdf@outerlinewidth@length+0.5\mdf@middlelinewidth@length}%
+         }{}%
       \coordinate(O)at(\md@Ox,\md@Oy);%
       \coordinate(P)at(\md@Px,\md@Py);%
-%
-      \ifboolexpr{test {\md@test@ltrb} or test {\md@test@lrb}}{\md@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P);}}{}%
+      \ifboolexpr{test {\md@test@ltrb} or test {\md@test@lrb}}%
+        {\md@tikzbox@tfl{(P-|O)--(O)--(O-|P)--(P)}}%
+        {}%
       \ifboolexpr{test {\md@test@ltb} or test {\md@test@lb}}%
-               {\md@tikzbox@otl{(P-|O)--(O)--(O-|P);}{(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}}{}%
+        {\md@tikzbox@otl{(P-|O)--(O)--(O-|P)}{(P)--(P|-O)[mdfcorners]--(O)--(O|-P)}}%
+        {}%
       \ifboolexpr{test {\md@test@trb} or test {\md@test@rb}}%
-               {\md@tikzbox@otl{(P)--(P|-O)--(O);}{(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}}{}%
+        {\md@tikzbox@otl{(P)--(P|-O)--(O)}{(O|-P)--(P)[mdfcorners]--(P|-O)--(O)}}%
+        {}%
       \ifboolexpr{test {\md@test@ltr} or test {\md@test@lr}}%
-               {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@tb} or test {\md@test@b}}{\md@tikzbox@otl{(O)--(O-|P)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@lt} or test {\md@test@l}}{\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}{}%
-      \ifboolexpr{test {\md@test@tr} or test {\md@test@r}}{\md@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}{}%
-      \md@test@t{\path[mdfbackground](O)rectangle(P);}{}%
-%
-      \md@test@noline{\path[mdfbackground,mdfcorners](O|-P)--(O)--(O-|P)--(P);}{}%
-%
+        {\md@tikzbox@otl{(O)--(O|-P)(P)--(P|-O)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@tb} or test {\md@test@b}}%
+        {\md@tikzbox@otl{(O)--(O-|P)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@lt} or test {\md@test@l}}%
+        {\md@tikzbox@otl{(O)--(O|-P)}{(O)rectangle(P)}}%
+        {}%
+      \ifboolexpr{test {\md@test@tr} or test {\md@test@r}}%
+        {\md@tikzbox@otl{(O-|P)--(P)}{(O)rectangle(P)}}%
+        {}%
+      \md@test@t{\path[mdfbackground](O)rectangle(P)}{}%
+      \md@test@noline{\path[mdfbackground,mdfcorners](O|-P)--(O)--(O-|P)--(P)}{}%
       \node[mdfbox] at (\md@Ax,\md@Ay){\box\@tempboxa};% Ausgabebox einfuegen
      \end{scope}
      %HIER KOMMT EIN WEITERES MAKRO
@@ -410,4 +460,4 @@
   }%
  \fi
 }%
-\endinput
+ \endinput
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 bd000726079..00000000000
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
+++ /dev/null
@@ -1,438 +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 214 2011-11-12 21:49:58Z marco $
-%%$Rev: 214 $
-%%$Author: marco $
-%%$Date: 2011-11-12 22:49:58 +0100 (Sa, 12. Nov 2011) $
-
-%%Allgemeine Einstellungen fuer pstricks
-%%Hier nur einfacher Rahmen mit Einstellungen
-\def\mdframedIIpackagename{md-frame-2}
-\def\md@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{md-frame-2.mdf}[\md@frameIIdate@svn$Id: md-frame-2.mdf 214 2011-11-12 21:49:58Z marco $ \mdversion: \mdframedIIpackagename]
-%
-\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{%
-  \ifvoid\@tempboxa
-  \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-       \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}%
-    }%
-   \mdf@makeboxalign@right%
-  }%
- \fi
-}%
-%%==================================================%%
-%%================first-box=========================%%
-%%==================================================%%
-
-\def\md@putbox@first{%
-  \ifvoid\@tempboxa
-  \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-         \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}%
-    }%
-   \mdf@makeboxalign@right%
-  }%
- \fi
-}%
-
-%%==================================================%%
-%%================middle-box========================%%
-%%==================================================%%
-
-\def\md@putbox@middle{%
-  \ifvoid\@tempboxa
-  \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-         \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}%
-    }%
-   \mdf@makeboxalign@right%
-  }%
- \fi
-}%
-%%==================================================%%
-%%=================last-box=========================%%
-%%==================================================%%
-\def\md@putbox@second{
-  \ifvoid\@tempboxa
-  \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-        \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}%
-    }%
-   \mdf@makeboxalign@right%
-  }%
- \fi
-}%
-
-\endinput
-%eof
-
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 f9552c7589e..53133ebf5d5 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
@@ -1,25 +1,16 @@
-%%==================================================%%
-%%= Ausgabe der Box nach Vorgabe der Ausgaberoutine=%%
-%%==================================================%%
-%% Styledatei fuer das Paket mdframed erstellt durch
-%% Marco Daniel 
-
+%% Style file for mdframed for package option `framemethod=default`
+%%
 %% 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-3.mdf 222 2011-11-13 18:03:53Z marco $
-%%$Rev: 222 $
-%%$Author: marco $
-%%$Date: 2011-11-13 19:03:53 +0100 (So, 13. Nov 2011) $
-
-%%Allgemeine Einstellungen fuer pstricks
-%%Hier nur einfacher Rahmen mit Einstellungen
+%%$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $
 \def\mdframedIIpackagename{md-frame-2}
 \def\md@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{md-frame-2.mdf}[\md@frameIIdate@svn$Id: md-frame-3.mdf 222 2011-11-13 18:03:53Z marco $ \mdversion: \mdframedIIpackagename]
-%
-\def\md@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div}
+\ProvidesFile{md-frame-2.mdf}%
+         [\md@frameIIdate@svn$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $ %
+          \mdversion: \mdframedIIpackagename]
+\def\md@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div }
 \let\ptTps\md@ptlength@to@pscode\relax
 %%%%    _____t_____
 %%%%   |           |
@@ -30,401 +21,484 @@
 %%%%   |           |
 %%%%   |___________|
 %%%%         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
+%%Zusammenhaenge abfragen:
+\newrobustcmd*\md@test@ltrb{%
+    \ifboolexpr{ (bool {mdf@topline}) and (bool {mdf@bottomline})
+                  and (bool {mdf@leftline}) and (bool {mdf@rightline})}}
+\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})}}
+\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})}}
 \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} ) }}
+    \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========================%%
-%%==================================================%%
+\newpsstyle{mdfbackgroundstyle}{linecolor=\mdf@backgroundcolor,fillstyle=solid,%
+                                fillcolor=\mdf@backgroundcolor,linestyle=solid,%
+                                linewidth=\mdf@middlelinewidth@length,dimen=outer,%
+}%
+\newpsstyle{mdflinestyle}{linewidth=\mdf@middlelinewidth@length,%
+                          linecolor=\mdf@linecolor,%
+                          fillstyle=none,dimen=middle,}%
 \def\md@putbox@single{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
+   \mdf@makebox@out{%
+     \mdf@makeboxalign@left%
+     \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
+     \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
+     \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
+     \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}%
+     \mdf@makebox@in[\mdfboundingboxwidth]{%
+       \null%
        \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@ltrb{%
+            \psframe[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! 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[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! 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[style=mdflinestyle]%
+              (! 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@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 )
+          \md@test@lt{%
+            \psline[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )%
+              (! \ptTps{\mdfboundingboxwidth}
+                 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )
+            }{}%
+            \ifbool{mdf@topline}{%
+             \psline[style=mdflinestyle]%
+              (! 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@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}
+            \ifbool{mdf@leftline}{%
+             \psline[style=mdflinestyle]%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul
+                 \ptTps{\mdfboundingboxheight} )%
+            }{}%
+            \ifbool{mdf@rightline}{%
+             \psline[style=mdflinestyle]%
+              (! \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[style=mdfbackgroundstyle]%
+              (!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}%
     }%
    \mdf@makeboxalign@right%
   }%
  \fi
 }%
-%%==================================================%%
-%%================first-box=========================%%
-%%==================================================%%
-
 \def\md@putbox@first{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-         \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) 
+   \mdf@makebox@out{%
+     \mdf@makeboxalign@left%
+     \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
+     \setlength\mdfboundingboxwidth{\wd\tw@}%
+     \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
+     \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}%
+     \mdf@makebox@in[\mdfboundingboxwidth]{%
+       \null%
+       \psset{unit=1truecm}%
+       \ifdimgreater{\mdfboundingboxheight}{\vsize}
+         {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\vsize)}
+         {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)}
+          %Hintergrund
+          \psline[style=mdfbackgroundstyle,%
+                  linearc={\dimexpr\mdf@roundcorner@length%
+                                  -\mdf@middlelinewidth@length\relax},]
+              (! \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)
-                  }{}
+            \psline[style=mdflinestyle]%
+              (! \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)
-                }{}
+            \psline[style=mdflinestyle]%
+              (! 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)%
+            \psline[style=mdflinestyle]%
+              (! \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}%
+          \ifboolexpr{ test {\md@test@single} or test {\md@test@rb} or
+                       test {\md@test@lrb} or test {\md@test@lb}}{%
+           \ifbool{mdf@topline}{%
+            \psline[style=mdflinestyle]%
+              (! 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[style=mdflinestyle]%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul
+                 \ptTps{\mdfboundingboxheight} )%
+           }{}%
+           \ifbool{mdf@rightline}{%
+             \psline[style=mdflinestyle]%
+              (! \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}%
     }%
    \mdf@makeboxalign@right%
   }%
  \fi
 }%
-
-%%==================================================%%
-%%================middle-box========================%%
-%%==================================================%%
-
 \def\md@putbox@middle{%
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
+   \mdf@makebox@out{%
     \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-         \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,%
+     \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
+     \setlength\mdfboundingboxwidth{\wd\tw@}%
+     \setlength\mdfboundingboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
+     \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}%
+     \mdf@makebox@in[\mdfboundingboxwidth]{%
+       \null%
+       \psset{unit=1truecm}%
+       \ifdimgreater{\mdfboundingboxheight}{\vsize}
+         {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\vsize)}
+         {\begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)}
+          \ifbool{mdf@leftline}{%
+            \psline[style=mdflinestyle]%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul
+                 \ptTps{\mdfboundingboxheight} )%
+          }{}%
+          \ifbool{mdf@rightline}{%
+             \psline[style=mdflinestyle]%
+              (! \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[style=mdfbackgroundstyle,%
                     linearc=\z@]%
-                    (!0 0)
-                    (! \ptTps{\mdfboundingboxwidth} \ptTps{\mdfboundingboxheight})
+              (!0 0)
+              (! \ptTps{\mdfboundingboxwidth}
+                 \ptTps{\mdfboundingboxheight})
            %Ausgabe
-           \rput[b](!\ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate
-                     \ptTps{\mdf@splitbottomskip@length} ){\box\tw@}
+          \rput[b](!
+                 \ptTps{\mdfboundingboxwidth} 0.5 mul % X-Koordinate
+                 \ptTps{\mdf@splitbottomskip@length} ){\box\tw@}
        \end{pspicture}%
     }%
    \mdf@makeboxalign@right%
   }%
  \fi
 }%
-%%==================================================%%
-%%=================last-box=========================%%
-%%==================================================%%
 \def\md@putbox@second{
   \ifvoid\@tempboxa
   \else%
-   \mdf@makebox[\linewidth]{%
-    \mdf@makeboxalign@left%
-        \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
-        \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
-        \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}%
-    \mdf@makebox[\mdfboundingboxwidth]{%
-    \null%
-        \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} )
+   \mdf@makebox@out{%
+     \mdf@makeboxalign@left%
+     \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
+     \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
+     \setlength\mdfboundingboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
+     \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}%
+     \mdf@makebox@in[\mdfboundingboxwidth]{%
+       \null%
+       \begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)
+          %Hintergrund
+          \psline[style=mdfbackgroundstyle,%
+                  linearc={\dimexpr\mdf@roundcorner@length%
+                                  -\mdf@middlelinewidth@length\relax},]%%
+              (! \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}{}
+          \ifboolexpr{ test {\md@test@ltrb} or test {\md@test@lrb}}{%
+            \psline[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! \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[style=mdflinestyle]%
+              (! 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[style=mdflinestyle]%
+              (! 0 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )%
+              (! \ptTps{\mdfboundingboxwidth}
+                 \ptTps{\mdf@middlelinewidth@length} 0.5 mul )
+           }{}%
+           \ifbool{mdf@leftline}{%
+            \psline[style=mdflinestyle]%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul 0)%
+              (! \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul
+                 \ptTps{\mdfboundingboxheight} )%
+           }{}%
+           \ifbool{mdf@rightline}{%
+            \psline[style=mdflinestyle]%
+              (! \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}%
     }%
@@ -432,7 +506,4 @@
   }%
  \fi
 }%
-
-\endinput
-%eof
-
+ \endinput
diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
index 9303173956d..e708bbe99bb 100644
--- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
+++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
@@ -1,51 +1,60 @@
-%%==================================================%%
-%%========Is based on the idea of framed.sty========%%
-%%==================================================%%
-%%===== Currently the package has a beta-Status ====%%
-%%==================================================%%
-%% WITH THANKS TO (alphabetically):
-%% ROLF NIEPRASCHK
-%% HEIKO OBERDIEK
-%% HERBERT VOSS
-
-%% Copyright (c) 2010 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.
 %%
+%% This is file `mdframed.sty',
+%% generated with the docstrip utility.
 %%
-%%==================================================%%
-%% Erstellung eines Rahmens, der am Seitenende keine
-%% horizontale Linie einfuegt
-%%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>%%
-%%      _______________                            %%
-%%      |    page 1   |                            %%  
-%%      |    Text     |                            %%
-%%      |  __Text__   |                            %%
-%%      |  | Text |   |                            %%
-%%     P A G E B R E A K                           %%
-%%      |  | Text |   |                            %%
-%%      |  |_Text_|   |                            %%
-%%      |    Text     |                            %%
-%%      |____page 2___|                            %%
-%%                                                 %%
-%%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>%%
-
-%%$Id: mdframed.sty 220 2011-11-13 17:39:13Z marco $
-%%$Rev: 220 $
-%%$Author: marco $
-%%$Date: 2011-11-13 18:39:13 +0100 (So, 13. Nov 2011) $
-
-%% Allgemeine Angaben
-\def\mdversion{v1.0}
+%% The original source files were:
+%%
+%% mdframed.dtx  (with options: `package')
+%% ----------------------------------------------------------------
+%% Working with the command fbox or fcolorbox, one has to
+%% handle page breaks by hand. The present package defines the
+%% environment mdframed which automatically deals with page breaks.
+%% 
+%% Author's name: Marco Daniel and Elke Schubert (!new)
+%% License type: lppl
+%% 
+%% ==================================================
+%% ========Is based on the idea of framed.sty========
+%% ==================================================
+%% ===== Currently the package has a beta-Status ====
+%% ==================================================
+%%  WITH THANKS TO (alphabetically):
+%%  ROLF NIEPRASCHK
+%%  HEIKO OBERDIEK
+%%  HERBERT VOSS
+%% 
+%%  Copyright (c) 2010 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.
+%% 
+%% 
+%% =================================================
+%%  Erstellung eines Rahmens, der am Seitenende keine
+%%  horizontale Linie einfuegt
+%% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+%%       _______________
+%%       |    page 1   |
+%%       |    Text     |
+%%       |  __Text__   |
+%%       |  | Text |   |
+%%      P A G E B R E A K
+%%       |  | Text |   |
+%%       |  |_Text_|   |
+%%       |    Text     |
+%%       |____page 2___|
+%% 
+%% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+%% ==================================================
+%% 
+\def\mdversion{v1.0b}
 \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 220 2011-11-13 17:39:13Z marco $ \mdversion: \mdframedpackagename]
-%%==================================================%%
-%%=============== Benoetigte Pakete ================%%
-%%==================================================%%
+\ProvidesPackage{mdframed}%
+     [\md@maindate@svn$Id: mdframed.dtx 271 2011-12-09 12:25:08Z marco $%
+      \mdversion: \mdframedpackagename]
 \newcommand*\md@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}}
 \newcommand*\md@PackageInfo[1]{\PackageInfo{\mdframedpackagename}{#1}}
 \newcommand*\md@LoadFile@IfExist[1]{%
@@ -58,25 +67,13 @@
                            }%
        }
 }
-
 \RequirePackage{kvoptions}
 \RequirePackage{etex}
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{zref-abspage}
-
-%separate Handhabung color
-\md@LoadFile@IfExist{color}
-
- 
-
-
+\RequirePackage{color}
 \SetupKeyvalOptions{family=mdf,prefix=mdf@}
 
-%%==================================================%%
-%%============Hilfsmakros fuer Optionen=============%%
-%%==================================================%%
-
-%%%\md@iflength{<EINGABE>}{<IST LAENGE>}{<IST KEINE LAENGE>}
 \newlength{\md@templength}
 \def\md@iflength#1{%
   \afterassignment\md@iflength@check%
@@ -93,13 +90,10 @@
   \fi
 }
 \def\md@iflength@cleanup#1\relax{}
-
-%%\mdf@option@length{<Laengenbezeichnung>}{<Defaultwert>}
 \newrobustcmd*{\mdf@option@length}[2]{%
  \expandafter\newlength\csname mdf@#1@length\endcsname%
  \expandafter\setlength\csname mdf@#1@length\endcsname{#2}%
  }
-%%\mdf@define@key@length{<Bezeichnungder Option der Laenge>}
 \newrobustcmd*{\mdf@define@key@length}[1]{%
    \define@key{mdf}{#1}{%
       \def\@tempa{##1}
@@ -109,10 +103,7 @@
        \expandafter\setlength\csname mdf@#1@length\endcsname{\csname mdfl@#1\endcsname}%
    }%
 }
-%%Schleifenmakro zur Optioneneingabe
 \DeclareListParser*{\mdf@dolist}{,}
-
-%Laengenoptionen
 \def\mdf@do@lengthoption#1{%
   \mdf@lengthoption@doubledo#1\@nil%
 }
@@ -120,7 +111,6 @@
    \mdf@option@length{#1}{#2}%
    \mdf@define@key@length{#1}%
 }
-%Stringoptionen
 \def\mdf@do@stringoption#1{%
    \mdf@stringoption@doubledo#1\@nil%
 }
@@ -130,9 +120,6 @@
       \csdef{mdf@#1}{##1}%
    }%
 }
-
-
-%Booloptionen
 \def\mdf@do@booloption#1{%
    \mdf@booloption@doubledo#1\@nil%
 }
@@ -142,8 +129,6 @@
       \setbool{mdf@#1}{##1}%
    }%
 }
-
-%Alignoptionen
 \def\mdf@do@alignoption#1{%
    \mdf@alignoption@tripledo#1\@nil%
 }
@@ -151,21 +136,9 @@
    \csdef{mdf@align@#1@left}{\null\hspace*{#2}}%
    \csdef{mdf@align@#1@right}{\hspace*{#3}\null}%
 }
-
-%%==================================================%%
-%%=====================Optionen=====================%%
-%%==================================================%%
-
-
-%Festlegung welcher Stildatei
-%% 0 := tex-Kommandos -- rule
-%% 1 := tikz
-%% 2 := pstricks
-%% 3 := pstricks <- veraltet
 \newcounter{mdf@globalstyle@cnt}
 \defcounter{mdf@globalstyle@cnt}{0}
 \newcommand*\mdfglobal@style{0}
-
 \define@key{mdf}{style}{%
         \md@PackageWarning{package option style is depreciated^^J
                            use framemethod instead\MessageBreak}%
@@ -173,14 +146,14 @@
         \defcounter{mdf@globalstyle@cnt}{#1}%
          \ifcase\value{mdf@globalstyle@cnt}\relax
              %0 <- kein Grafikpaket
-          \or\md@LoadFile@IfExist{tikz}%1 <- tikz wird benoetigt
-          \or\md@LoadFile@IfExist{pstricks-add}%2 <- tikz wird benoetigt
-          \or\defcounter{mdf@globalstyle@cnt}{2}\md@LoadFile@IfExist{pstricks-add}%3 <- pstricks wird benoetigt
-          \or\md@LoadFile@IfExist{pstricks-add}%4 <- pstricks wird benoetigt
+          \or\md@LoadFile@IfExist{tikz}%
+          \or\md@LoadFile@IfExist{pstricks-add}%
+          \or\defcounter{mdf@globalstyle@cnt}{2}%
+              \md@LoadFile@IfExist{pstricks-add}%
+          \or\md@LoadFile@IfExist{pstricks-add}%
           \else\md@PackageWarning{Unknown global style \value{mdf@globalstyle@cnt}}%
         \fi%
 }
-
 \providecommand*\mdf@framemethod{}
 \def\md@framemethod@i{}%
 \def\md@framemethod@ii{}%
@@ -203,13 +176,11 @@
      }%
   \ifcase\value{mdf@globalstyle@cnt}\relax%
          %0 <- kein Grafikpaket
-     \or\md@LoadFile@IfExist{tikz}%1 <- tikz wird benoetigt
-     \or\md@LoadFile@IfExist{pstricks-add}%2 <- pstricks wird benoetigt
-     \or\md@LoadFile@IfExist{pstricks-add}%3 <- pstricks wird benoetigt <- support old style
+     \or\md@LoadFile@IfExist{tikz}%
+     \or\md@LoadFile@IfExist{pstricks-add}%
+     \or\md@LoadFile@IfExist{pstricks-add}%
   \fi%
 }
-
-%%%%Optionen mit Laengen
 \mdf@dolist{\mdf@do@lengthoption}{%
    {skipabove==\z@},%
    {skipbelow==\z@},%
@@ -231,8 +202,7 @@
    {roundcorner==\z@},%
    {footenotedistance==\medskipamount},
    {userdefinedwidth==\linewidth}
-} 
-%%%%Optionen mit String
+}
 \mdf@dolist{\mdf@do@stringoption}{%
     {defaultunit==pt},%
     {settings=={}},%
@@ -247,7 +217,6 @@
     {frametitlefont==\bfseries\large},%
     {printheight==none},%
 }
-%%%%Optionen mit Boolflag
 \mdf@dolist{\mdf@do@booloption}{%
     {ntheorem==false},%
     {topline==true},%
@@ -258,9 +227,6 @@
     {nobreak==false},%
     {footnoteinside==true},%
 }
-
-
-%Alignoptionen:
 \mdf@dolist{\mdf@do@alignoption}{%
     {left==\mdf@leftmargin@length==\z@},%
     {center==\fill==\fill},%
@@ -268,7 +234,6 @@
     {outer==\fill==\mdf@rightmargin@length},%not supported yet
     {outer==\mdf@leftmargin@length==\fill},%not supported yet
 }
-
 \newcommand*\mdf@align{}%
 \newcommand*\mdf@makeboxalign@left{\null\hspace*{\mdf@leftmargin@length}}%
 \newcommand*\mdf@makeboxalign@right{}%
@@ -282,8 +247,6 @@
        \def\mdf@makeboxalign@right{\csuse{mdf@align@#1@right}}%
    }%
 }
-
-%Unterstuetzung der Optionen fuer tikz
 \def\mdf@tikzset@local{\tikzset{tikzsetting/.style={}}}
 \define@key{mdf}{tikzsetting}{%
   \def\mdf@tikzset@local{\tikzset{tikzsetting/.style={#1}}}%
@@ -291,14 +254,10 @@
 \define@key{mdf}{apptotikzsetting}{%
   \appto\mdf@tikzset@local{#1}%
 }
-
-%Unterstuetzung der Optionen fuer pstricks
 \def\mdf@psset@local{}
 \define@key{mdf}{pstrickssetting}{%
   \def\mdf@psset@local{#1}
 }
-
-%Unterstuetzung der xcolor fuer pstricks
 \def\mdf@xcolor{}
 \define@key{mdf}{xcolor}[none]{%
   \@ifpackageloaded{xcolor}{%
@@ -308,13 +267,10 @@
       \ifx\mdf@xcolor\@tempa
          \else
          \PassOptionsToPackage{\mdf@xcolor}{xcolor}%
-         \RequirePackage{xcolor}%     
+         \RequirePackage{xcolor}%
       \fi%
    }%
  }
-
-
-%Nutzung des Paketes needspace
 \define@key{mdf}{needspace}[\z@]{%
      \begingroup%
         \setlength{\dimen@}{#1}%
@@ -326,29 +282,20 @@
         \vskip\z@skip % hide the previous |\vskip| from |\addvspace|
       \endgroup%
 }
-
 \DeclareDefaultOption{%
    \md@PackageWarning{Unknown Option '\CurrentOption' for mdframed}}
-
-
 \ProcessKeyvalOptions*\relax
 \newcommand*{\mdfsetup}{\setkeys{mdf}}
-
-
-%Erlauben von mdfdefinestyle sowie redefinition von style
 \define@key{mdf}{style}{%
   \ifcsundef{mdf@definestyle@#1}{%
-        \md@PackageWarning{Unknown definedstyle #1^^J
-                           You have to define a style via \string\mdfdefinedstyle\MessageBreak
-                           }%
-        }%
-        {\expandafter\expandafter\expandafter\mdfsetup%
-         \expandafter\expandafter\expandafter{\csname mdf@definestyle@#1\endcsname}}%
+    \md@PackageWarning{Unknown definedstyle #1^^J
+                       You have to define a style ^^J
+                       via \string\mdfdefinedstyle\MessageBreak
+                      }%
+   }%
+   {\expandafter\expandafter\expandafter\mdfsetup%
+    \expandafter\expandafter\expandafter{\csname mdf@definestyle@#1\endcsname}}%
 }%
-
-%%==================================================%%
-%%==========Ausgabe des Platzes auf Seite===========%%
-%%==================================================%%
 \let\md@PackageNoInfo\@gobble
 \newrobustcmd*\md@ifstrequal@expand{%
 \expandafter\ifstrequal\expandafter{\mdf@printheight}%
@@ -361,64 +308,57 @@
          %case "warning"
          \md@ifstrequal@expand{warning}{\def\md@tempa{Warning}}{%
             %case "unknown"
-            \md@PackageWarning{Unknown key for printheight=\mdf@printheight %^^J
+            \md@PackageWarning{Unknown key for printheight=\mdf@printheight^^J
                                use none, info or warning}%
              \def\md@tempa{none}%
          }%
       }%
   }%
-\def\md@PackageInfoSpace{\csname md@Package\md@tempa\endcsname}
-}
-%%==================================================%%
-%%========Angepasste lrbox sowie trivlist===========%%
-%%==================================================%%
-%Anpassung lrbox
-\let\md@lrbox\lrbox
-\patchcmd\md@lrbox\hbox\vbox{}{}
-\patchcmd\md@lrbox\color@setgroup{%
-\color@setgroup\color{\mdf@fontcolor}%
-\hsize=\md@horizontalspaceofbox%
-\columnwidth=\hsize%
-\textwidth=\hsize%
-\linewidth=\hsize%
-\bgroup\md@@frametitle\egroup\noindent%
-}{}{}
-\def\endmd@lrbox{\unskip\color@endgroup}
+\def\md@PackageInfoSpace{\csname md@Package\md@tempa\endcsname}%
+}
+\def\md@lrbox#1{%
+  \edef\reserved@a{%
+    \endgroup
+    \setbox#1\vbox{%
+      \begingroup\aftergroup}%
+        \def\noexpand\@currenvir{\@currenvir}%
+        \def\noexpand\@currenvline{\on@line}}%
+  \reserved@a
+    \@endpefalse
+    \@parboxrestore
+    \begingroup%
+    \color@setgroup
+    \color{\mdf@fontcolor}%
+    \hsize=\md@horizontalspaceofbox%
+    \columnwidth=\hsize%
+    \textwidth=\hsize%
+    \linewidth=\hsize%
+    \@parboxrestore
+    \bgroup\md@@frametitle\egroup\noindent%
+    \ignorespaces}
 
-%Anpassung trivlist
+\def\endmd@lrbox{\endgroup\unskip\color@endgroup}
 \let\md@trivlist\trivlist
 \let\endmd@trivlist\endtrivlist
 \patchcmd\endmd@trivlist\@endparenv\md@endparenv{}{}
 \def\md@endparenv{%
   \addpenalty\@endparpenalty\addvspace\mdf@skipbelow@length\@endpetrue}
-
-
-%%==================================================%%
-%%==============leftline anpassen===================%%
-%%==================================================%%
-\newrobustcmd*\mdf@makebox[2][\mdf@userdefinedwidth@length]{%
- \noindent\makebox[#1][l]{#2}%
+\newrobustcmd*\mdf@makebox@out[2][\linewidth]{%
+ \noindent\hb@xt@\z@{%
+    \noindent\makebox[\dimexpr #1\relax][l]{#2}%
+ \hss}%
+}%
+\newrobustcmd*\mdf@makebox@in[2][\mdf@userdefinedwidth@length]{%
+ \noindent\makebox[\dimexpr #1\relax][l]{#2}%
 }
-
-
-%%==================================================%%
-%%==================framestyle======================%%
-%%==================================================%%
-%inspired by Lars Madsen
 \newrobustcmd*\mdfdefinestyle[2]{%
   \csdef{mdf@definestyle@#1}{#2}%
 }
-
 \newrobustcmd*\mdfapptodefinestyle[2]{%
  \ifcsundef{mdf@definestyle@#1}%
    {\md@PackageWarning{Unknown style #1}}%
    {\csappto{mdf@definestyle@#1}{,#2}}%
 }
-
-%%==================================================%%
-%%=============Umgebungdefinition===================%%
-%%==================================================%%
-%\newmdenv[<mdframed-options>]{<environmen>}
 \newrobustcmd*\newmdenv[2][]{%
   \newenvironment{#2}{%
      \mdfsetup{#1}%
@@ -427,98 +367,41 @@
      \end{mdframed}%
   }%
 }
-%\renewmdenv[<mdframed-options>]{<environmen>}
 \newrobustcmd*\renewmdenv[2][]{%
   \expandafter\let\csname #2\endcsname\relax%
   \expandafter\let\csname end#2\endcsname\relax%
   \newmdenv[#1]{#2}%
   }%
-
-%http://tex.stackexchange.com/questions/26298/own-command-to-create-new-environment
-%\newtheorem{<envname>}[<numberedlike>]{<caption>}[<within>]
-%\newmdtheoremenv[<mdframed-options>]{<envname>}[<numberedlike>]{<caption>}[<within>]
-%\md@tempa[<mdframed-options>]
-%\md@tempb{<envname>}%
-%\md@tempc[<numberedlike>]%
-%\md@tempd{<caption>}%
-%\md@tempe[<within>]%
 \newrobustcmd*\newmdtheoremenv{%
    \kernel@ifnextchar[%]
      {\newmdtheoremenv@i}{\newmdtheoremenv@i[]}%
 }
 \def\newmdtheoremenv@i[#1]#2{%
-    \def\md@tempa{#1}%
-    \def\md@tempb{#2}%
-    \kernel@ifnextchar[%]
-     {\newmdtheoremenv@ii}{\newmdtheoremenv@ii[]}%
+   \kernel@ifnextchar[%]
+     {\newmdtheoremenv@ii[#1]#2}{\newmdtheoremenv@ii[#1]#2[]}%
 }
-
-\def\newmdtheoremenv@ii[#1]#2{%
-    \def\md@tempc{#1}%
-    \ifboolexpr{ test {\ifcsundef{c@\md@tempc}} and test {\ifcsundef{c@md@@\md@tempc}} and not (test {\ifdefempty{\md@tempc}}) }%
-               {\md@PackageWarning{No Counter \md@tempc defined\MessageBreak}%
-                \edef\md@reserved@a{}}%
-               {\ifcsundef{c@\md@tempc}%
-                     {\ifdefempty{\md@tempc}{\edef\md@reserved@a{}}{\edef\md@reserved@a{md@@\md@tempc}}}%
-                     {\edef\md@reserved@a{\md@tempc}}%
-               }
-    \edef\md@tempc{\md@reserved@a}
-    \def\md@tempd{#2}%
+\def\newmdtheoremenv@ii[#1]#2[#3]#4{%
     \kernel@ifnextchar[%]
-     {\newmdtheoremenv@iii}{\newmdtheoremenv@iii[]}%
+     {\newmdtheoremenv@iii[#1]#2[#3]#4}{\newmdtheoremenv@iii[#1]#2[#3]#4[]}%
 }
-
-\def\newmdtheoremenv@iii[#1]{%
-   \def\md@tempe{#1}%
-    \ifboolexpr{ test {\ifcsundef{c@\md@tempe}} and test {\ifcsundef{c@md@@\md@tempe}} and not (test {\ifdefempty{\md@tempe}}) }%
-               {\md@PackageWarning{No Counter \md@tempe defined\MessageBreak}%
-                \edef\md@reserved@a{}}%
-               {\ifcsundef{c@\md@tempe}%
-                     {\ifdefempty{\md@tempe}{\edef\md@reserved@a{}}{\edef\md@reserved@a{md@@\md@tempe}}}%
-                     {\edef\md@reserved@a{\md@tempe}}%
-               }
-   \edef\md@tempe{\md@reserved@a}
-   \ifboolexpr{ not (test {\ifdefempty{\md@tempc}})
-              and 
-             not (test {\ifdefempty{\md@tempe}})
-           }{%
-             \md@PackageWarning{You defined {\string\newtheorem} with ^^J
-                                both optional arguments^^J 
-                                <numeredlike> and <within>. This isn't allowed^^J
-                                \mdframedpackagename will use <numeredlike>\MessageBreak}%
-             \begingroup\edef\md@reserved@a{%
-                  \endgroup\noexpand\newtheorem{md@@\md@tempb}[\md@tempc]{\md@tempd}}%
-            }%
-            {\ifdefempty{\md@tempc}{}{%
-               \begingroup%
-                    \edef\md@reserved@a{\endgroup%
-                         \noexpand\newtheorem{md@@\md@tempb}[\md@tempc]{\md@tempd}}}%
-             \ifdefempty{\md@tempe}{}{%
-               \begingroup%
-                    \edef\md@reserved@a{\endgroup%
-                         \noexpand\newtheorem{md@@\md@tempb}{\md@tempd}[\md@tempe]}}%
-            }
-   \ifboolexpr{test {\ifdefempty{\md@tempc}}
-                and 
-               test {\ifdefempty{\md@tempe}}
-               }{%
-               \begingroup%
-                    \edef\md@reserved@a{\endgroup%
-                         \noexpand\newtheorem{md@@\md@tempb}{\md@tempd}%
-                  }
-               }{}%
-   \md@reserved@a%
-   \protected@csxdef{\md@tempb}{\noexpand\mdfsetup{\md@tempa}%
-               \noexpand\begin{mdframed}[]\noexpand\begin{md@@\md@tempb}%
-    }%
-   \protected@csxdef{end\md@tempb}{%
-              \noexpand\end{md@@\md@tempb}\noexpand\end{mdframed}%
+\def\newmdtheoremenv@iii[#1]#2[#3]#4[#5]{%
+   \ifboolexpr{ test {\ifblank {#3}} and test {\ifblank {#5}} }%
+   {%
+     \newtheorem{#2}{#4}%
+   }{%
+      \ifboolexpr{ not (test {\ifblank {#3}}) and not (test {\ifblank {#5}}) }%
+         {\md@PackageWarning{You can't such a comibination for newmdtheoremenv^^J
+                             Instead mdframed uses newtheorem{#2}{#4}}%
+          \newtheorem{#2}{#4}%
+         }%
+         {%
+          \notblank{#3}{\newtheorem{#2}[#3]{#4}}{}%
+          \notblank{#5}{\newtheorem{#2}{#4}[#5]}{}%
+         }%
    }%
+   \BeforeBeginEnvironment{#2}{\begin{mdframed}[#1]}%
+   \AfterEndEnvironment{#2}{\end{mdframed}}%
 }
-
-%%==================================================%%
-%%=================== Frametitle ===================%%
-%%==================================================%%
 \let\mdraggedtitle\raggedright
 \providecommand*\mdframedtitleenv[1]{%
   \@afterindentfalse
@@ -527,7 +410,7 @@
          \mdraggedtitle\nobreak\mdf@frametitlefont#1\relax%
     \par}%
   \@afterheading}
-%
+
 \newrobustcmd*\md@@frametitle{%
   \ifx\mdf@frametitle\@empty\relax%
   \else
@@ -536,7 +419,6 @@
     \color@endgroup
   \fi%
 }
-
 \newrobustcmd*\md@checkntheorem{%
   \ifbool{mdf@ntheorem}%       %%% Pruefen ob ntheorem gesetzt ist
     {\ifundef{\theorempreskipamount}%
@@ -546,16 +428,9 @@
     }%
   }{}%
 }
-
-
-%%==================================================%%
-%%=================== Fussnoten ====================%%
-%%==================================================%%
 \newrobustcmd*\md@footnoterule{%
     \kern0\p@%
     \hrule \@width 1in \kern 2.6\p@}
-
-
 \newrobustcmd*\md@footnoteoutput{%
      \ifvoid\@mpfootins\else
           \nobreak%
@@ -565,53 +440,32 @@
           \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 =======%%
-%%==================================================%%
 \newrobustcmd*\mdf@load@style{%
 \ifcase\value{mdf@globalstyle@cnt}\relax%
-        \input{md-frame-0.mdf}%
-      \or\input{md-frame-1.mdf}%
-      \or\input{md-frame-2.mdf}
-      \or\input{md-frame-3.mdf}%
-      \else%
-       \IfFileExists{md-frame-\value{mdf@globalstyle@cnt}.mdf}{\input{md-frame-\value{mdf@globalstyle@cnt}.mdf}%
-           }{\input{md-frame-0.mdf}%
-            \md@PackageWarning{The style number \value{mdf@globalstyle@cnt} does not exist^^J
-                               mdframed ues instead style=0 \mdframedpackagename}%
-          }%
+    \input{md-frame-0.mdf}%
+ \or\input{md-frame-1.mdf}%
+ \or\input{md-frame-2.mdf}%
+ \or\input{md-frame-3.mdf}%
+ \else%
+    \IfFileExists{md-frame-\value{mdf@globalstyle@cnt}.mdf}%
+    {\input{md-frame-\value{mdf@globalstyle@cnt}.mdf}}%
+    {%
+     \input{md-frame-0.mdf}%
+     \md@PackageWarning{The style number \value{mdf@globalstyle@cnt} does not exist^^J
+                        mdframed ues instead style=0 \mdframedpackagename}%
+    }%
 \fi%
 }%
 \mdf@load@style
-%%==================================================%%
-%%========= style-abhaengige Modifikation ==========%%
-%%==================================================%%
+
 \newrobustcmd*\md@styledefinition{%
-   \ifnumequal{\value{mdf@globalstyle@cnt}}{0}% 
+   \ifnumequal{\value{mdf@globalstyle@cnt}}{0}%
    {\deflength{\mdf@innerlinewidth@length}{\z@}%
     \deflength{\mdf@middlelinewidth@length}{\mdf@linewidth@length}%
     \deflength{\mdf@outerlinewidth@length}{\z@}%
@@ -619,62 +473,53 @@
     \let\mdf@middlelinecolor\mdf@linecolor%
     \let\mdf@outerlinecolor\mdf@linecolor%
    }{}%
-   \ifnumequal{\value{mdf@globalstyle@cnt}}{2}% 
+   \ifnumequal{\value{mdf@globalstyle@cnt}}{2}%
    {\deflength{\mdf@innerlinewidth@length}{\z@}%
    \deflength{\mdf@middlelinewidth@length}{\mdf@linewidth@length}%
     \deflength{\mdf@outerlinewidth@length}{\z@}%
     \let\mdf@innerlinecolor\mdf@linecolor%
    }{}%
-   \ifnumequal{\value{mdf@globalstyle@cnt}}{3}% 
+   \ifnumequal{\value{mdf@globalstyle@cnt}}{3}%
    {\deflength{\mdf@innerlinewidth@length}{\z@}%
    \deflength{\mdf@middlelinewidth@length}{\mdf@linewidth@length}%
     \deflength{\mdf@outerlinewidth@length}{\z@}%
     \let\mdf@innerlinecolor\mdf@linecolor%
    }{}%
 }
-
-%%==================================================%%
-%%Modifikation zur Nutzung innerhalb float/minipage=%%
-%%==================================================%%
-%option nobreak
 \let\md@reserved@a\@empty
 \newrobustcmd*\detected@md@put@frame{%
   \ifmdf@nobreak%Option nobreak=true?
-        \def\md@reserved@a{\md@put@frame@standalone}%
-     \else
-       \def\md@reserved@a{\md@put@frame}%
-       \ifnum\@floatpenalty<0\relax%Detecting float
-          \if@twocolumn%
-             \ifx\@captype\@undefined
-                 \def\md@reserved@a{\md@put@frame}%
-             \else
-                 \md@PackageInfo{mdframed inside float  ^^J
-                                 mdframed uses option nobreak \mdframedpackagename}%
-                 \def\md@reserved@a{\md@put@frame@standalone}%   
-             \fi
-          \else
-             \md@PackageInfo{mdframed inside float  ^^J
-                             mdframed uses option nobreak \mdframedpackagename}%
-             \def\md@reserved@a{\md@put@frame@standalone}%     
-          \fi%
-       \fi%
-       \if@minipage%
-             \md@PackageInfo{mdframed inside minipage  ^^J
-                             mdframed uses option nobreak \mdframedpackagename}%
-             \def\md@reserved@a{\md@put@frame@standalone}%
-       \fi%
-       \ifinner%
-            \md@PackageInfo{mdframed inside a box ^^J
-                            mdframed uses option nobreak \mdframedpackagename}%
-             \def\md@reserved@a{\md@put@frame@standalone}%
-      \fi%
+     \def\md@reserved@a{\md@put@frame@standalone}%
+  \else
+     \def\md@reserved@a{\md@put@frame}%
+     \ifnum\@floatpenalty<0\relax%Detecting float
+        \if@twocolumn%
+           \ifx\@captype\@undefined
+               \def\md@reserved@a{\md@put@frame}%
+           \else
+               \md@PackageInfo{mdframed inside float  ^^J
+                               mdframed uses option nobreak \mdframedpackagename}%
+               \def\md@reserved@a{\md@put@frame@standalone}%
+           \fi
+        \else
+           \md@PackageInfo{mdframed inside float  ^^J
+                           mdframed uses option nobreak \mdframedpackagename}%
+           \def\md@reserved@a{\md@put@frame@standalone}%
+        \fi%
+     \fi%
+     \if@minipage%
+           \md@PackageInfo{mdframed inside minipage  ^^J
+                           mdframed uses option nobreak \mdframedpackagename}%
+           \def\md@reserved@a{\md@put@frame@standalone}%
+     \fi%
+     \ifinner%
+          \md@PackageInfo{mdframed inside a box ^^J
+                          mdframed uses option nobreak \mdframedpackagename}%
+          \def\md@reserved@a{\md@put@frame@standalone}%
+     \fi%
   \fi%
 \md@reserved@a%
 }
-
-%%==================================================%%
-%%======keine Linien anzeigen - hidealllines =======%%
-%%==================================================%%
 \newrobustcmd*\md@hidealllines@check{%
  \ifbool{mdf@hidealllines}{%
     \setbool{mdf@leftline}{false}%
@@ -683,40 +528,22 @@
     \setbool{mdf@bottomline}{false}%
   }{}%
 }
-
-
-%%==================================================%%
-%%==Deklaration diverser Eingabe und Hilfsparameter=%%
-%%==================================================%%
-%X-Laengen
 \newlength\mdfboundingboxwidth
 \newlength\mdfboundingboxtotalwidth
-%Y-Laengen
 \newlength\mdfboundingboxheight
 \newlength\mdfboundingboxdepth
 \newlength\mdfboundingboxtotalheight
-
-
-
 \newlength\md@freevspace@length
 \newlength\md@horizontalwidthofbox@length
 \newlength\md@verticalmarginwhole@length
-
 \providecommand*\ptTps{}
-
-%Kommando in tikz mit relax belegt:
 \newrobustcmd\mdfcreateextratikz{}
-
-
-%%==================================================%%
-%%==================Umgebung========================%%
-%%==================================================%%
 \def\mdframed{\@ifnextchar[\mdframed@i\mdframed@ii}%
 \def\mdframed@ii{\mdframed@i[]}%
 \def\mdframed@i[#1]{% default-Umgebung
 \begingroup
-%check is needed?
-   \mdfsetup{userdefinedwidth=\linewidth,#1}%%
+%%Ueberlegung- wie es besser geht!!!! WICHTIG
+   \mdfsetup{userdefinedwidth=\linewidth,#1}
    \md@hidealllines@check%
    \mdf@settings%
    \md@twoside@checklength%
@@ -725,26 +552,23 @@
    \setlength{\topsep}{\mdf@skipabove@length}%
    \begingroup%
    \let\partopsep\z@%
-   \expandafter\endgroup%   
+   \expandafter\endgroup%
    \begin{md@trivlist}\item\relax%
    \md@checkntheorem%
    \md@styledefinition%
-   \md@horizontalmargin@equation%
    \md@footnoteinput%
+   \md@horizontalmargin@equation%
    \begin{md@lrbox}{\@tempboxa}%
    }%
-
 \def\endmdframed{%
     \ifmdf@footnoteinside%
       \def\md@reserveda{%
         \md@footnoteoutput%
         \end{md@lrbox}%
-        \let\hsize\linewidth
         \detected@md@put@frame}%
     \else%
       \def\md@reserveda{%
-        \end{md@lrbox}
-        \let\hsize\linewidth
+        \end{md@lrbox}%
         \detected@md@put@frame%
         \md@footnoteoutput%
         }%
@@ -754,9 +578,6 @@
     \hrule \@height\z@ \@width\hsize
 \endgroup\@endparenv%
 }
-%%==================================================%%
-%%================== Twoside-Modus =================%%
-%%==================================================%%
 \newtoggle{md:checktwoside}
 \settoggle{md:checktwoside}{false}
 \newrobustcmd*\md@twoside@checklength{%
@@ -781,16 +602,13 @@
    }{}%
  \fi%
 }
-
 \newcounter{md@zref@counter}%keine doppelten laebes
 \zref@newprop*{md@pagevalue}[0]{\number\value{page}}
 \zref@addprop{\ZREF@mainlist}{md@pagevalue}
-
 \newrobustcmd*\md@zref@label{%
    \stepcounter{md@zref@counter}
    \zref@label{md@pagelabel-\number\value{md@zref@counter}}%
 }
-
 \newrobustcmd*\if@md@pageodd{%
      \zref@refused{md@pagelabel-\the\value{md@zref@counter}}%
      \ifodd\zref@extract{md@pagelabel-\the\value{md@zref@counter}}{md@pagevalue}%
@@ -800,7 +618,6 @@
      \fi
      \md@reserveda%
 }
-
 \newrobustcmd*\md@pageisodd{%
       \ifdimequal{\mdf@outermargin@length}{-999pt}%
          {\setlength\mdf@rightmargin@length{\z@}}%
@@ -817,12 +634,7 @@
          {\setlength\mdf@rightmargin@length{\z@}}%
          {\setlength\mdf@rightmargin@length{\mdf@innermargin@length}}%
 }
-
 \newrobustcmd*\md@@setzref{\md@zref@label\if@md@pageodd}
-
-%%==================================================%%
-%%================= Platz auf Seite ================%%
-%%==================================================%%
 \newrobustcmd*\md@freepagevspace{%
      \penalty\@M \vskip 2\baselineskip \vskip\height
      \penalty9999 \vskip -2\baselineskip \vskip-\height
@@ -833,14 +645,9 @@
            \advance\md@freevspace@length by -\pagetotal\relax%
           }%
 }
-
-%%==================================================%%
-%================= Breite der Box =================%%
-%%==================================================%%
 \newrobustcmd*\md@advancelength@orizontalmargin@add[1]{%
   \advance\md@horizontalspaceofbox by -\csname mdf@#1@length\endcsname\relax%
 }
-
 \newlength\md@horizontalspaceofbox
 \newrobustcmd*\md@horizontalmargin@equation{%
     \setlength{\md@horizontalspaceofbox}{\mdf@userdefinedwidth@length}%
@@ -853,21 +660,17 @@
                 \advance\md@horizontalspaceofbox by \mdf@innerlinewidth@length\relax%
                 \advance\md@horizontalspaceofbox by \mdf@middlelinewidth@length\relax%
                 \advance\md@horizontalspaceofbox by \mdf@outerlinewidth@length\relax%
-           }{}%      
+           }{}%
     \notbool{mdf@rightline}{%
                 \advance\md@horizontalspaceofbox by \mdf@innerlinewidth@length\relax%
                 \advance\md@horizontalspaceofbox by \mdf@middlelinewidth@length\relax%
-                \advance\md@horizontalspaceofbox by \mdf@outerlinewidth@length\relax% 
+                \advance\md@horizontalspaceofbox by \mdf@outerlinewidth@length\relax%
            }{}%
- %   \advance\md@horizontalspaceofbox by - \width\md@arrayparboxrestore%
     %%% Beruecksichtigung, dass Auszaehlung bzw. list-Umgebung enthalten
-    \ifdimless{\md@horizontalspaceofbox}{3cm}{\md@PackageWarning{You have only a width of 3cm}}{}
+    \ifdimless{\md@horizontalspaceofbox}{3cm}%
+              {\md@PackageWarning{You have only a width of 3cm}}{}
     \hsize=\md@horizontalspaceofbox%
 }
-
-%%==================================================%%
-%%===========Beruecksichtige Linienausgabe==========%%
-%%==================================================%%
 \newrobustcmd*\md@keeplines@single{%
   \notbool{mdf@topline}{%
       \advance\md@verticalmarginwhole@length by -\mdf@middlelinewidth@length%
@@ -876,39 +679,25 @@
       \advance\md@verticalmarginwhole@length by -\mdf@middlelinewidth@length%
      }{}%
 }
-
-%%==================================================%%
-%%===========Additionsalgorithmus fuer for==========%%
-%%==================================================%%
 \newrobustcmd*\md@advancelength@verticalmarginwhole[1]{%
   \advance\md@verticalmarginwhole@length by \csname mdf@#1@length\endcsname\relax%
 }
-
 \newrobustcmd*\md@advancelength@freevspace@sub[1]{%
   \advance\dimen@ by -\csname mdf@#1@length\endcsname\relax%
 }
-
 \newrobustcmd*\md@advancelength@freevspace@add[1]{%
   \advance\dimen@ by \csname mdf@#1@length\endcsname\relax%
 }
-%%==================================================%%
-%%====================Reset changes=================%%
-%%==================================================%%
-\protected@edef\md@reset{\boxmaxdepth\the\boxmaxdepth 
+\protected@edef\md@reset{\boxmaxdepth\the\boxmaxdepth
                           \splittopskip\the\splittopskip}%
-
-
-%%==================================================%%
-%%===========Ausgaberoutine -> Berechnung===========%%
-%%==================================================%%
-
 \newrobustcmd*\md@put@frame@standalone{\relax%
    \ifvoid\@tempboxa\relax
       \md@PackageWarning{The environment is empty\MessageBreak}%
       \let\md@reserved@a\relax%
    \else
       %Hier berechnung Box-Inhalt+Rahmen oben und unten
-      \setlength{\md@verticalmarginwhole@length}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
+      \setlength{\md@verticalmarginwhole@length}%
+                 {\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
       \mdf@dolist{\md@advancelength@verticalmarginwhole}{%
                   outerlinewidth,middlelinewidth,innerlinewidth,innertopmargin,
                   innerbottommargin,innerlinewidth,middlelinewidth,outerlinewidth}%
@@ -917,24 +706,23 @@
    \fi
    \md@reserved@a%
 }
-
-
 \def\md@put@frame{\relax%
 \ifvoid\@tempboxa\relax
 \md@PackageWarning{The environment is empty\MessageBreak}%
 \let\md@reserved@a\relax%
 \else
-   \md@print@space%
-   \md@freepagevspace%
-   \md@PackageInfoSpace{\the\md@freevspace@length before the beginning of the environment^^J
-                        ending on input line \MessageBreak}%
+  \md@print@space%
+  \md@freepagevspace%
+  \md@PackageInfoSpace{\the\md@freevspace@length before the beginning of ^^J
+                       the environment ending on input line \MessageBreak}%
    \ifdimless{\md@freevspace@length}{2\baselineskip}
-             {\md@PackageInfo{Not enough space on this page}%die Seite hat nur noch minimal Platz
+             {\md@PackageInfo{Not enough space on this page}
               \vfill\eject%
               \def\md@reserved@a{\md@put@frame}%
              }{%
                %Hier berechnung Box-Inhalt+Rahmen oben und unten
-              \setlength{\md@verticalmarginwhole@length}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
+              \setlength{\md@verticalmarginwhole@length}%
+                          {\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
               \mdf@dolist{\md@advancelength@verticalmarginwhole}{%
                      outerlinewidth,middlelinewidth,innerlinewidth,innertopmargin,
                      innerbottommargin,innerlinewidth,middlelinewidth,outerlinewidth}%
@@ -943,7 +731,7 @@
                 {%passt auf Seite%
                   \begingroup
                    \iftoggle{md:checktwoside}{\md@@setzref}{}%
-                    \md@putbox@single%%passt auf Seite
+                    \md@putbox@single
                   \endgroup
                  \let\md@reserved@a\relax}%
                 {\def\md@reserved@a{\md@put@frame@i}}%passt nicht auf Seite
@@ -951,7 +739,6 @@
 \fi
 \md@reserved@a%
 }
-
 \def\md@put@frame@i{%Box muss gesplittet werden -- Ausgabe der ersten Teilbox
       %Berechnung der Splittgroesse -- Linien und Abstand oben
       \md@freepagevspace%
@@ -978,7 +765,6 @@
          \advance\dimen@ by -1pt\relax%Box darf nicht zu Groß werden.
          \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length%
          \setbox\tw@\vsplit\@tempboxa to \dimen@
-         \setbox\tw@\vbox{\unvbox\tw@}%needed?
          \ifdimgreater{\ht\tw@+\dp\tw@}{\dimen@}{%Falsch gesplittet
             \md@PackageInfo{Box was splittet wrong\MessageBreak}%
              \dimen@i=\dimen@
@@ -987,11 +773,11 @@
               \advance\dimen@i by 0.5\dimen@
              \splittopskip\z@%
              \setbox\@tempboxa\vbox{\unvbox\tw@%
-                                     \hrule \@height\dp\strutbox \@width\z@%benoetigt um Tiefe zu haben
+                                     %benoetigt um Tiefe zu haben
+                                     \hrule \@height\dp\strutbox \@width\z@
                                      \unvbox\@tempboxa}
              \splittopskip\mdf@splittopskip@length%
              \setbox\tw@\vsplit\@tempboxa to \dimen@i
-             \setbox\tw@\vbox{\unvbox\tw@}%
              }{}%
          \setbox\@tempboxa\vbox{\unvbox\@tempboxa}%PRUEFEN!!!!
          \ifvoid\@tempboxa
@@ -1004,7 +790,7 @@
          \fi
          \ifvoid\tw@%%pruefe, ob erste Box leer ist
           \hrule \@height\z@ \@width\hsize
-          \vfill\eject%  
+          \vfill\eject%
              \def\md@reserved@a{\md@put@frame}%
          \else
           \ifdimequal{\ht\tw@}{0pt}%
@@ -1022,11 +808,10 @@
             \vfill\eject%
             \def\md@reserved@a{\md@put@frame@ii}%
             }%
-         \fi% 
+         \fi%
       \fi%
 \md@reserved@a%
 }
-
 \def\md@put@frame@ii{%Ausgabe der mittleren Box(en) wenn vorhanden
   \setlength{\md@freevspace@length}{\vsize}%
   \setlength{\dimen@}{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
@@ -1039,7 +824,7 @@
         \advance\md@freevspace@length by -\mdf@splitbottomskip@length
         \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length%
         \setbox\tw@\vsplit\@tempboxa to \md@freevspace@length%
-        \setbox\tw@\vbox{\unvbox\tw@}%PRUEFEN!!!
+ %       \setbox\tw@\vbox{\unvbox\tw@}%PRUEFEN!!!
         \setbox\@tempboxa\vbox{\unvbox\@tempboxa}%PRUEFEN!!!!
         \ifvoid\@tempboxa\relax%
            \md@PackageWarning{You got a bad break\MessageBreak
@@ -1067,18 +852,26 @@
      }%Hier kommt die Ausgabe der letzten Box
   \md@reserved@a%
 }
-
-%%==================================================%%
-%%= Sicherstellen, dass Optionen nur global setzbar=%%
-%%==================================================%%
-\DisableKeyvalOption[%  
-  action=warning,  
-  package=mdframed,    
-]{mdf}{framemethod}%
-
-\DisableKeyvalOption[%  
-  action=warning,  
-  package=mdframed,    
-]{mdf}{xcolor}%
-\endinput
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\DisableKeyvalOption[action=warning,package=mdframed]{mdf}{framemethod}%
+\DisableKeyvalOption[action=warning,package=mdframed]{mdf}{xcolor}%
+
+ \endinput
+%% 
+%% ================================================================
+%% Copyright (C) 2011 by Marco Daniel
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version.  The latest version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Marco Daniel.
+%% 
+%% Have fun!
+%% 
+%% ================================================================
+%%
+%% End of file `mdframed.sty'.