mdframed 0.4a (16may10)

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

7 files changed, 121 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/mdframed/README b/Master/texmf-dist/doc/latex/mdframed/README
index ddf0979dab2..2f55e838846 100644
--- a/Master/texmf-dist/doc/latex/mdframed/README
+++ b/Master/texmf-dist/doc/latex/mdframed/README
@@ -5,6 +5,10 @@ environment mdframed which automatically deals with page breaks.
 Author's name: Marco Daniel and Elke Schubert (!new)
 License type: lppl
 
+changes in version 0.4a:
+- fixes bug in fontcolor (Elke Schubert)
+
+------------------------------------------------
 changes in version 0.4:
 - second author Elke Schubert
 - fixes some bugs 
diff --git a/Master/texmf-dist/doc/latex/mdframed/md-test.pdf b/Master/texmf-dist/doc/latex/mdframed/md-test.pdf
new file mode 100644
index 00000000000..661d404d559
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mdframed/md-test.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/md-test.tex b/Master/texmf-dist/doc/latex/mdframed/md-test.tex
new file mode 100644
index 00000000000..725e026f2a5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mdframed/md-test.tex
@@ -0,0 +1,78 @@
+\documentclass[11pt]{scrartcl}
+\usepackage{ntheorem}
+\usepackage[ style =1 ,linewidth=0,linecolor=blue,backgroundcolor=yellow,margin=0pt,leftmargin=0cm,rightmargin=0cm,xcolor=cmyk] {mdframed}
+\usepackage { lipsum}
+\usepackage{showframe}
+\newtheorem{mdlemma}{Lemma}[section]
+
+\newenvironment{lemma}{%
+    \begin{mdframed}[ntheorem=true,margin=10,backgroundcolor=red!30,linecolor=cyan,fontcolor=blue!70!black,linewidth=0,rightmargin=0cm,leftmargin=0cm,roundcorner=5pt,leftmargin=20pt,rightmargin=20pt]% 
+     \begin{mdlemma}%
+     }{%
+     \end{mdlemma}%
+    \end{mdframed}%
+}
+
+
+\begin{document}
+\begin{mdframed} [skipabove=1cm, outerlinewidth=4pt , middlelinewidth=2pt , innerlinewidth=1pt ,%
+outerlinecolor=blue , middlelinecolor=yellow , innerlinecolor=red ,%
+backgroundcolor=orange,roundcorner=10pt]
+\lipsum[1]
+\end{mdframed}
+
+    \begin{lemma}Text
+           \begin{equation}
+               x+y=2
+           \end{equation}
+           \par\noindent\rule{\linewidth}{2pt}
+    \end{lemma}%
+\clearpage%
+\begin{mdframed}%
+Some Text with an first empy line. The is only text to fill the line. It has no sence.
+
+Some Text with an first empy line. The is only text to fill the line. It has no sence.
+\end{mdframed}
+
+\clearpage
+   \section{foo}
+% % % % % % % % % % %
+   \begin{lemma}
+%        \lipsum[1]\lipsum[1]\lipsum[1]
+        \begin{itemize}
+          \item HALLO
+        \end{itemize}
+    \end{lemma}
+
+   \begin{lemma}
+      HALLO WELT!
+   \end{lemma}
+    \begin{lemma}\mbox{ }\par\noindent
+               \rule{\linewidth}{4pt}
+    \end{lemma}
+    \begin{mdframed}
+       \rule{\linewidth}{4pt}
+     \end{mdframed}
+    \begin{lemma}
+          \lipsum[5]\lipsum[5]
+          \lipsum[5]\lipsum[5]
+    \end{lemma}
+    \lipsum[1]%
+    \begin{lemma}Text
+           \begin{equation}
+               x+y=2
+           \end{equation}
+           \par\noindent\rule{\linewidth}{2pt}
+    \end{lemma}%
+%    
+        \begin{lemma}\mbox{ }
+                   \begin{equation}
+                       x+y=2
+                   \end{equation}
+                   \par\noindent\rule{\linewidth}{2pt}
+            \end{lemma}
+    \begin{mdframed}%
+           \lipsum[1]\par\noindent\rule{\linewidth}{2pt}
+    \end{mdframed}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/mdframed/md-tikz-1.mdf b/Master/texmf-dist/doc/latex/mdframed/md-tikz-1.mdf
index 4247334edaa..e4e0b653864 100644
--- a/Master/texmf-dist/doc/latex/mdframed/md-tikz-1.mdf
+++ b/Master/texmf-dist/doc/latex/mdframed/md-tikz-1.mdf
@@ -33,7 +33,7 @@
                         }{}%
         \setlength\mdf@xmargin@tikz{\mdf@margin}%         % links und rechts
         \setlength\mdf@ymargin@tikz{0.4\baselineskip}%    % oben und unten
-        \tikzset{mdftext/.style={inner sep=0pt,outer sep=0pt}}%
+        \tikzset{mdftext/.style={inner sep=0pt,outer sep=0pt}}%,font=\color{\mdf@fontcolor}
         \tikzset{mdfcorners/.style={rounded corners=\mdf@roundcorner}}%
         \tikzset{mdfbackground/.style={fill=\mdf@backgroundcolor}}%
         \ifdimgreater{\mdf@outerlinewidth@tikz}{\z@}%
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.pdf
index e4f31961fdc..39bd733d5eb 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.tex
index e369d549728..d74386ad639 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.tex
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-doc.tex
@@ -1,5 +1,5 @@
 %% Documentation of the package mdframed.sty
-\def\mdversion{version 0.4}
+\def\mdversion{version 0.4a}
 \documentclass[american,11pt]{article}
 \usepackage{geometry}
 \geometry{left=3cm,right=3cm,top=2cm,bottom=2cm}
@@ -111,7 +111,7 @@ plainpages=false
  \normalfont\large\normalcolor auto-split frame environment
 
 \vspace*{.5\baselineskip}
- \href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}\footnote{With thanks to Heiko Oberdiek, Rolf Niepraschk, Martin Scharrer and Herbert Voss.}, \href{}{Elke Schubert}\qquad \mdversion\ \qquad \today
+ \href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}\footnote{With thanks to Heiko Oberdiek, Rolf Niepraschk, Martin Scharrer and Herbert Voss.}, \href{mailto:marco.daniel@mada-nada.de}{Elke Schubert}\qquad \mdversion\ \qquad \today
  \end{center}
 \begin{abstract}
 Working with the command \mdcommand{fbox} or \mdcommand{fcolorbox}, one has to handle page breaks by hand,
@@ -174,10 +174,6 @@ The following options are only global options.
 \begin{center}
 \renewcommand{\arraystretch}{1.5}
 \begin{tabularx}{\linewidth}{@{}lXl@{}}
-  \mdoption{skipabove}=<LENGTH>& Sets an additional skip above the frame.
-                               & default=\mdsetting{0pt} \\
-  \mdoption{skipbelow}=<LENGTH>& Sets an additional skip below the frame.
-                               & default=\mdsetting{0pt} \\
   \mdoption{xcolor}=<VALUE(S)>& By setting this key, the package \mdpack{xcolor} will
                                 be loaded with the given value(s). Without any value \mbox{\mdname} loads
                                 the package \mdpack{color} without any options.
@@ -202,6 +198,10 @@ The options listed below can be set globally or locally.
 \begin{center}
 \renewcommand{\arraystretch}{1.5}
 \begin{tabularx}{\linewidth}{@{}lXl@{}}
+  \mdoption{skipabove}=<LENGTH>& Sets an additional skip above the frame.
+                                 & default=\mdsetting{0pt} \\
+  \mdoption{skipbelow}=<LENGTH>& Sets an additional skip below the frame.
+                                 & default=\mdsetting{0pt} \\
   \mdoption{linecolor}=<COLOR> & Sets the color of the line around the environment to <COLOR>.
                                & default=\mdsetting{black} \\
   \mdoption{backgroundcolor}=<COLOR> & Sets the color of the background of the environment to <COLOR>.
@@ -303,9 +303,9 @@ The header for the following examples is
 \paragraph{Example 2}~\par
 
 \begin{mdexample}
- \begin{mdframed}[outerlinewidth=4pt,middlelinewith=2pt,innerlinewidth=1pt,%
-                 outerlinecolor=blue,middlelinecolor=yellow,innerlinecolor=red,%
-                 backgroundcolor=orange]
+ \begin{mdframed}[outerlinewidth=4pt,middlelinewidth=2pt,innerlinewidth=1pt,%
+                   outerlinecolor=blue,middlelinecolor=yellow,innerlinecolor=red,%
+                   backgroundcolor=orange,roundcorner=10pt]
   \lipsum[1]
  \end{mdframed}
 \end{mdexample}
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,