mdframed (23jun13)

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

1 files changed, 39 insertions, 133 deletions

diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
index 52eb36485a6..86e4d4c1145 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
@@ -1,3 +1,4 @@
+
 %% Style file for mdframed for package option `framemethod=pstricks`
 %%
 %% This package may be distributed under the terms of the LaTeX Project
@@ -158,168 +159,69 @@
       \par\unskip\vskip\mdf@innertopmargin@length%
     }%
 }%
+\def\mdf@drawsubtitleaboveline{%
+ \rlap{%
+  \hspace*{-\mdf@innerleftmargin@length}%
+  \begin{pspicture}(0,0)(\mdf@templength,\mdf@subtitleabovelinewidth@length)
+     \psframe[style=mdfsubtitleaboverule]%
+              (0,0)(\mdf@templength,\mdf@subtitleabovelinewidth@length)%
+  \end{psicture}%
+ }%
+}
+\def\mdf@drawsubtitlebelowline{%
+ \rlap{%
+  \hspace*{-\mdf@innerleftmargin@length}%
+  \begin{pspicture}(0,0)(\mdf@templength,\mdf@subtitlebelowlinewidth@length)
+     \psframe[style=mdfsubtitlebelowrule]%
+              (0,0)(\mdf@templength,\mdf@subtitleabovelinewidth@length)%
+  \end{psicture}%
+ }%
+}
+\def\mdf@drawsubtitlebackground{%
+ \rlap{%
+  \hspace*{-\mdf@innerleftmargin@length}%
+  \begin{pspicture}(0,0)(0,0)
+     \psframe[style=mdfsubtitlebackground]%
+              (0,0)(\mdf@templength,-\mdfsubtitleheight)%
+  \end{psicture}%
+ }%
+}
+
 \newpsstyle{mdfsubtitleaboverule}{%
    linecolor=\mdf@subtitleabovelinecolor,
    fillcolor=\mdf@subtitleabovelinecolor,
    fillstyle=solid,dimen=outer,%
 }
+
 \newpsstyle{mdfsubtitlebelowrule}{%
    linecolor=\mdf@subtitlebelowlinecolor,
    fillcolor=\mdf@subtitlebelowlinecolor,
    fillstyle=solid,dimen=outer,%
 }
+
 \newpsstyle{mdfsubtitlebackground}{%
    linecolor=\mdf@subtitlebackgroundcolor,
    fillcolor=\mdf@subtitlebackgroundcolor,
    fillstyle=solid,linestyle=none,
 }
-\newrobustcmd\mdfsubtitle[2][]%
-{%
- \begingroup
-  \penalty-9995%set a breakpoint before the subtitle
-  \parindent\z@\relax%
-  \mdfsetup{#1}%only for subtitle options
-  \setbox\z@=\vbox{\mdf@subtitlefont{#2}\relax}%
-  \dimen@=\linewidth\relax%
-   \advance\dimen@ by \mdf@innerleftmargin@length\relax%
-   \advance\dimen@ by \mdf@innerrightmargin@length\relax%
-  \dimen@i=\mdf@subtitleinneraboveskip@length\relax%
-   \advance\dimen@i by \mdf@subtitleinnerbelowskip@length\relax%
-   \advance\dimen@i by \ht\z@\relax%
-   \advance\dimen@i by \dp\z@\relax%
-  \ifbool{mdf@subtitleaboveline}{}%
-         {\mdfsetup{subtitleabovelinewidth=\z@}}%
-  \ifbool{mdf@subtitlebelowline}{}%
-         {\mdfsetup{subtitlebelowlinewidth=\z@}}%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subtitleaboveskip@length
-  \rlap%
-  {%
-   \hspace*{-\mdf@innerleftmargin@length}%
-   \begingroup%
-     \begin{pspicture}(0,0)(\dimen@,\mdf@subtitleabovelinewidth@length)
-      \ifbool{mdf@subtitleaboveline}%
-       {%
-       \psframe[style=mdfsubtitleaboverule]%
-              (0,0)(\dimen@,\mdf@subtitleabovelinewidth@length)%
-       }{}
-     \end{pspicture}
-   \endgroup%
-  }%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subtitleinneraboveskip@length
-  \hspace*{-\mdf@innerleftmargin@length}%
-     \begin{pspicture}%
-        (0,0)%
-        (0,\ht\z@)
-       \psframe[style=mdfsubtitlebackground]%
-              (0,\dimexpr-\dp\z@-\mdf@subtitleinnerbelowskip@length\relax)%
-              (\dimen@,\dimen@i)
-     \end{pspicture}
-  \hspace*{+\mdf@innerleftmargin@length}%
-  \box\z@\relax%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subtitleinnerbelowskip@length
-  \rlap%
-  {%
-   \hspace*{-\mdf@innerleftmargin@length}%
-   \begingroup%
-     \begin{pspicture}(0,0)(\dimen@,\mdf@subtitlebelowlinewidth@length)
-      \ifbool{mdf@subtitlebelowline}%
-       {%
-       \psframe[style=mdfsubtitlebelowrule]%
-              (0,0)(\dimen@,\mdf@subtitlebelowlinewidth@length)%
-       }{}%
-     \end{pspicture}
-   \endgroup%
-  }%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subtitlebelowskip@length
-  \penalty 9995
- \endgroup
-}
 
 \newpsstyle{mdfsubsubtitleaboverule}{%
    linecolor=\mdf@subtitleabovelinecolor,
    fillcolor=\mdf@subtitleabovelinecolor,
    fillstyle=solid,dimen=outer,%
 }
+
 \newpsstyle{mdfsubsubtitlebelowrule}{%
    linecolor=\mdf@subtitlebelowlinecolor,
    fillcolor=\mdf@subtitlebelowlinecolor,
    fillstyle=solid,dimen=outer,%
 }
+
 \newpsstyle{mdfsubsubtitlebackground}{%
    linecolor=\mdf@subtitlebackgroundcolor,
    fillcolor=\mdf@subtitlebackgroundcolor,
    fillstyle=solid,linestyle=none,
 }
-\newrobustcmd\mdfsubsubtitle[2][]%
-{%
- \begingroup
-  \penalty-9995%set a breakpoint before the subsubtitle
-  \parindent\z@\relax%
-  \mdfsetup{#1}%only for subsubtitle options
-  \setbox\z@=\vbox{\mdf@subsubtitlefont{#2}\relax}%
-  \dimen@=\linewidth\relax%
-   \advance\dimen@ by \mdf@innerleftmargin@length\relax%
-   \advance\dimen@ by \mdf@innerrightmargin@length\relax%
-  \dimen@i=\mdf@subsubtitleinneraboveskip@length\relax%
-   \advance\dimen@i by \mdf@subsubtitleinnerbelowskip@length\relax%
-   \advance\dimen@i by \ht\z@\relax%
-   \advance\dimen@i by \dp\z@\relax%
-  \ifbool{mdf@subsubtitleaboveline}{}%
-         {\mdfsetup{subsubtitleabovelinewidth=\z@}}%
-  \ifbool{mdf@subsubtitlebelowline}{}%
-         {\mdfsetup{subsubtitlebelowlinewidth=\z@}}%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subsubtitleaboveskip@length
-  \rlap%
-  {%
-   \hspace*{-\mdf@innerleftmargin@length}%
-   \begingroup%
-     \begin{pspicture}(0,0)(\dimen@,\mdf@subsubtitleabovelinewidth@length)
-      \ifbool{mdf@subsubtitleaboveline}%
-       {%
-       \psframe[style=mdfsubsubtitleaboverule]%
-              (0,0)(\dimen@,\mdf@subsubtitleabovelinewidth@length)%
-       }{}
-     \end{pspicture}
-   \endgroup%
-  }%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subsubtitleinneraboveskip@length
-  \hspace*{-\mdf@innerleftmargin@length}%
-   \begin{pspicture}(0,-\dp\z@)(0,\dimen@i
-     \begin{pspicture}%
-        (0,0)%
-        (0,\ht\z@)
-       \psframe[style=mdfsubsubtitlebackground]%
-              (0,\dimexpr-\dp\z@-\mdf@subsubtitleinnerbelowskip@length\relax)%
-              (\dimen@,\dimen@i)
-     \end{pspicture}
-  \hspace*{+\mdf@innerleftmargin@length}%
-  \box\z@\relax%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subsubtitleinnerbelowskip@length
-  \rlap%
-  {%
-   \hspace*{-\mdf@innerleftmargin@length}%
-   \begingroup%
-     \begin{pspicture}(0,0)(\dimen@,\mdf@subsubtitlebelowlinewidth@length)
-      \ifbool{mdf@subsubtitlebelowline}%
-       {%
-       \psframe[style=mdfsubsubtitlebelowrule]%
-              (0,0)(\dimen@,\mdf@subsubtitlebelowlinewidth@length)%
-       }{}%
-     \end{pspicture}
-   \endgroup%
-  }%
-  \par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%
-  \vskip\mdf@subsubtitlebelowskip@length
-  \penalty 9995
- \endgroup
-}
 
 \def\mdf@putbox@single{%
   \ifvoid\mdf@splitbox@one\relax
@@ -431,6 +333,7 @@
           \drawbrackgroundframetitle@single
         %output%
           \rput[bl](mdf@A){\box\mdf@splitbox@one}
+          \mdf@extra%
           \mdf@singleextra
        \end{pspicture}%
     }%
@@ -616,7 +519,8 @@
        \drawbrackgroundframetitle@first
       %output%
        \rput[bl](mdf@A){\box\mdf@splitbox@two}
-      \mdf@firstextra
+      \mdf@extra%
+      \mdf@firstextra%
      \end{pspicture}
     }%
    \mdf@makeboxalign@right%
@@ -824,7 +728,8 @@
        %\psdot(mdf@A)\uput[90](mdf@A){mdf at A}
        %\psdot(mdf@P)\uput[90](mdf@P){mdf at P}
        %\psdot(mdf@O)\uput[90](mdf@O){mdf at O}
-      \mdf@middleextra
+      \mdf@extra%
+      \mdf@middleextra%
      \end{pspicture}%
     }%
    \mdf@makeboxalign@right%
@@ -1033,6 +938,7 @@
        \drawbrackgroundframetitle@second
       %output%
        \rput[bl](mdf@A){\box\mdf@splitbox@one}
+      \mdf@extra%
       \mdf@secondextra
      \end{pspicture}%
     }%