mdframed 0.4a (16may10)

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

1 files changed, 29 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
index 9a6ac151080..c4501813fd9 100644
--- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
+++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
@@ -34,7 +34,7 @@
 
 %% Allgemeine Angaben
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mdframed}[2010/05/02 v4: mdframed]
+\ProvidesPackage{mdframed}[2010/05/14 v4a: mdframed]
 
 %%==================================================%%
 %%=============== Benoetigte Pakete ================%%
@@ -71,8 +71,8 @@
 \DeclareStringOption[white]{backgroundcolor}
 \DeclareStringOption[black]{fontcolor}
 \DeclareStringOption[20pt]{margin}
-\DeclareStringOption[\baselineskip]{skipabove}
-\DeclareStringOption[\baselineskip]{skipbelow}
+\DeclareStringOption[\z@]{skipabove}
+\DeclareStringOption[\z@]{skipbelow}
 \DeclareStringOption[none]{xcolor}
 
 \DeclareStringOption[pt]{defaultunit}
@@ -234,6 +234,24 @@
 \let\mdf@margin\mdfl@margin
 }
 
+
+\define@key{mdfl}{skipbelow}[\mdf@skipbelow]{%
+\def\@tempa{#1}
+\md@iflength{\@tempa}%
+         {\global\edef\mdfl@skipbelow{\the\md@templength}}%
+         {\global\edef\mdfl@skipbelow{\the\md@templength}}
+\let\mdf@skipbelow\mdfl@skipbelow
+}
+
+\define@key{mdfl}{skipabove}[\mdf@skipabove]{%
+\def\@tempa{#1}
+\md@iflength{\@tempa}%
+         {\global\edef\mdfl@skipabove{\the\md@templength}}%
+         {\global\edef\mdfl@skipabove{\the\md@templength}}
+\let\mdf@skipabove\mdfl@skipabove
+}
+
+
 \define@key{mdfl}{backgroundcolor}[\mdf@backgroundcolor]{%
 \def\@tempa{#1}
 \let\mdf@backgroundcolor\@tempa\relax
@@ -314,6 +332,9 @@
 \def\@tempa{#1}
 \let\mdf@innerlinecolor\@tempa\relax
 }
+
+
+
 %%==================================================%%
 %%======= Laden der gewuenschten Style-Datei =======%%
 %%==================================================%%
@@ -379,8 +400,8 @@
    \vskip -2\partopsep%
    \vskip -2\lineskip%
    \vskip -0.6\baselineskip%
-   \vspace*{\mdf@skipabove}%
    \setkeys{mdfl}{#1}%
+   \vspace*{\mdf@skipabove}%
    \ifmdf@ntheorem%
       \ifdefined\theorempreskipamount%
          \theorempreskipamount0pt%
@@ -512,9 +533,10 @@
      \kern\z@                         %%%\z@=0
      \hrule\@width\md@hsize\@height\z@%   
      \penalty-100 % put depth into height
-    \endgroup%
+   \endgroup%
  \egroup%
- \begingroup% 
+ \begingroup%
+  \color{\mdf@fontcolor} 
   \md@put@frame%
  \endgroup%
 }
@@ -768,12 +790,8 @@
 \DisableKeyvalOption[%  
   action=warning,  
   package=mdframed,    
-]{mdf}{skipabove}%
+]{mdf}{style}%
 
-\DisableKeyvalOption[%  
-  action=warning,  
-  package=mdframed,    
-]{mdf}{skipbelow}%
 
 \DisableKeyvalOption[%  
   action=warning,