mdframed 1.0 (14nov11)

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

1 files changed, 56 insertions, 23 deletions

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 9f8ee185161..f9552c7589e 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
@@ -7,16 +7,17 @@
 %% 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 201 2011-10-04 18:57:50Z marco $
-%%$Rev: 201 $
+
+%%$Id: md-frame-3.mdf 222 2011-11-13 18:03:53Z marco $
+%%$Rev: 222 $
 %%$Author: marco $
-%%$Date: 2011-10-04 20:57:50 +0200 (Di, 04. Okt 2011) $
+%%$Date: 2011-11-13 19:03:53 +0100 (So, 13. Nov 2011) $
 
 %%Allgemeine Einstellungen fuer pstricks
 %%Hier nur einfacher Rahmen mit Einstellungen
-\def\mdframedIIIpackagename{md-frame-3}
-\def\md@frameIIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{md-frame-3.mdf}[\md@frameIIIdate@svn$Id: md-frame-3.mdf 201 2011-10-04 18:57:50Z marco $ \mdversion: \mdframedIIIpackagename]
+\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}
 \let\ptTps\md@ptlength@to@pscode\relax
@@ -60,10 +61,13 @@
 %%================single-box========================%%
 %%==================================================%%
 \def\md@putbox@single{%
-   \leftline{\null\hspace*{\mdf@leftmargin@length}%%
+  \ifvoid\@tempboxa
+  \else%
+   \mdf@makebox[\linewidth]{%
+    \mdf@makeboxalign@left%
         \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
         \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\ht\@tempboxa+\dp\@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}{}%
@@ -73,6 +77,8 @@
        \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]%
@@ -149,7 +155,7 @@
                   (! \ptTps{\mdfboundingboxwidth}  %X
                      \ptTps{\mdfboundingboxheight} \ptTps{\mdf@middlelinewidth@length} neg 0.5 mul add)%
             }{}
-           \md@test@single{}{%
+           \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 )%
@@ -186,17 +192,23 @@
                      \ifbool{mdf@bottomline}{\ptTps{\mdf@middlelinewidth@length} add}{}
                   ){\box\@tempboxa}
         \end{pspicture}%
-     }%
-}
+    }%
+   \mdf@makeboxalign@right%
+  }%
+ \fi
+}%
 %%==================================================%%
 %%================first-box=========================%%
 %%==================================================%%
 
 \def\md@putbox@first{%
-   \leftline{\null\hspace*{\mdf@leftmargin@length}%%
+  \ifvoid\@tempboxa
+  \else%
+   \mdf@makebox[\linewidth]{%
+    \mdf@makeboxalign@left%
         \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
         \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\ht\tw@+\dp\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}{}%
@@ -204,6 +216,8 @@
          \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)}
@@ -273,24 +287,32 @@
            \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{%
-   \leftline{\null\hspace*{\mdf@leftmargin@length}%%
+  \ifvoid\@tempboxa
+  \else%
+   \mdf@makebox[\linewidth]{%
+    \mdf@makeboxalign@left%
         \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
         \setlength\mdfboundingboxwidth{\wd\tw@}%
-        \setlength\mdfboundingboxheight{\ht\tw@+\dp\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)}
@@ -316,16 +338,22 @@
            \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{
-   \leftline{\null\hspace*{\mdf@leftmargin@length}%%
+  \ifvoid\@tempboxa
+  \else%
+   \mdf@makebox[\linewidth]{%
+    \mdf@makeboxalign@left%
         \ifbool{mdf@leftline}{\hspace*{\mdf@middlelinewidth@length}}{}%
         \setlength\mdfboundingboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboundingboxheight{\ht\@tempboxa+\dp\@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%
@@ -333,6 +361,8 @@
         \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,
@@ -397,8 +427,11 @@
                   \ifbool{mdf@bottomline}{\ptTps{\mdf@middlelinewidth@length} add}{}
                 ){\box\@tempboxa}
        \end{pspicture}%
-     }%
-}
+    }%
+   \mdf@makeboxalign@right%
+  }%
+ \fi
+}%
 
 \endinput
 %eof