mdframed (2jul13)

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

8 files changed, 29 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf
index 15f1530bc24..c9790903242 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf
index 2061649b842..4c1ba1ac2dc 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf
index 513e71a93e8..3bf9c0ed497 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf
index 9044a27f3ef..e48aac7e7c4 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
index 6e8a24268a9..c7974c91539 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
diff --git a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
index dd30dbe2c1f..f053b814d58 100644
--- a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
+++ b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
@@ -2258,10 +2258,10 @@ Have fun!
 % \begin{macro}{mdversion,mdframedpackagename,mdfmaindate}
 % Set package information
 %    \begin{macrocode}
-\def\mdversion{1.9a}
+\def\mdversion{1.9b}
 \def\mdframedpackagename{mdframed}
-\def\mdfmaindate{2013/06/21}
-\def\mdfrevision{     208}% Done by github: git rev-list HEAD | wc -l
+\def\mdfmaindate{2013/07/01}
+\def\mdfrevision{     212}% Done by github: git rev-list HEAD | wc -l
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2297,6 +2297,7 @@ Have fun!
 \RequirePackage{xparse}
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{zref-abspage}
+\RequirePackage{needspace}
 \RequirePackage{color}
 %    \end{macrocode}
 %
@@ -2503,6 +2504,7 @@ Have fun!
    {roundcorner==\z@},%
    {footenotedistance==\medskipamount},
    {userdefinedwidth==\linewidth},
+   {needspace==\z@},
    {frametitleaboveskip==5pt},
    {frametitlebelowskip==5pt},
    {frametitlerulewidth==.2pt},
@@ -2603,7 +2605,6 @@ Have fun!
     {frametitlebottomline==true},%
     {frametitlerightline==true},%
     {frametitlerule==false},%
-    {nobreak==false},%
     {footnoteinside==true},%
     {usetwoside==true},%
     {repeatframetitle==false},%Noch nicht richtig implementiert
@@ -2616,7 +2617,7 @@ Have fun!
     {subsubtitlebelowline==false},
     {draft==false},
     {suppressfirstparskip==true},
-}
+}    
 %%special boolflag hidealllines:
 \newbool{mdf@hidealllines}%
 \define@key{mdf}{hidealllines}[false]{%
@@ -2630,6 +2631,12 @@ Have fun!
  }%
 }
 \appto\mdf@definestyle@defaultoptions{hidealllines=false,}%
+%%special boolflag nobreak:
+% \newbool{mdf@nobreak}%
+% \boolfalse{mdf@nobreak}%
+\DeclareBoolOption[true]{nobreak}
+\boolfalse{mdf@nobreak}%
+\appto\mdf@definestyle@defaultoptions{nobreak=false,}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2712,22 +2719,6 @@ Have fun!
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{mdf@needspace}
-% Defining the option needspace
-%    \begin{macrocode}
-\define@key{mdf}{needspace}[\z@]{%
-     \begingroup%
-        \setlength{\dimen@}{#1}%
-        \vskip\z@\@plus\dimen@%
-        \penalty -100\vskip\z@\@plus -\dimen@%
-        \vskip\dimen@%
-        \penalty 9999%
-        \vskip -\dimen@%
-        \vskip\z@skip % hide the previous |\vskip| from |\addvspace|
-      \endgroup%
-}
-%    \end{macrocode}
-% \end{macro}
 %
 %    \begin{macrocode}
 \DeclareDefaultOption{%
@@ -3304,6 +3295,7 @@ Have fun!
 % Collect all definitions at the beginning of \Env{mdframed}
 %    \begin{macrocode}
 \newrobustcmd*\mdf@preenvsetting{%
+   \needspace{\mdf@needspace@length}
    \mdf@twoside@checklength%
    \edef\mdf@par@local{%
       \parskip=\the\parskip\relax%
@@ -3625,11 +3617,11 @@ Have fun!
        \mdf@dolist{\mdf@advancelength@sub{\dimen@}}%
          {innerlinewidth,middlelinewidth,outerlinewidth}%
       }{}%
-    \notbool{mdf@topline}%no top line
+    \ifbool{mdf@topline}{}%%no top line
        {%
            \mdf@dolist{\mdf@advancelength@add{\dimen@}}%
              {innerlinewidth,middlelinewidth,outerlinewidth}%
-       }{}%
+       }%
     \advance\dimen@.8\pageshrink%
     \ifdimless{\ht\mdf@splitbox@one+\dp\mdf@splitbox@one}{\dimen@}%
        {\mdf@PackageWarning{You got a bad break\MessageBreak
@@ -5056,7 +5048,7 @@ Have fun!
           }% anchor der Ausgabebox ist unten links
   \tikzset{mdfcorners/.style={rounded corners=\mdf@roundcorner@length}}% 
   \tikzset{mdfbackground/.style={fill=\mdf@backgroundcolor,%
-                                 draw=\mdf@backgroundcolor%
+                                 draw=none,%
                                 }%
           }% 
   \tikzset{mdfframetitlebackground/.style=%
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 db84ca8c611..b4197ed8f80 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
@@ -19,7 +19,7 @@
           }% anchor der Ausgabebox ist unten links
   \tikzset{mdfcorners/.style={rounded corners=\mdf@roundcorner@length}}%
   \tikzset{mdfbackground/.style={fill=\mdf@backgroundcolor,%
-                                 draw=\mdf@backgroundcolor%
+                                 draw=none,%
                                 }%
           }%
   \tikzset{mdfframetitlebackground/.style=%
diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
index 112c389e61c..27765d7882b 100644
--- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
+++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
@@ -49,10 +49,10 @@
 %% ==================================================
 %% 
 
-\def\mdversion{1.9a}
+\def\mdversion{1.9b}
 \def\mdframedpackagename{mdframed}
-\def\mdfmaindate{2013/06/21}
-\def\mdfrevision{     208}% Done by github: git rev-list HEAD | wc -l
+\def\mdfmaindate{2013/07/01}
+\def\mdfrevision{     212}% Done by github: git rev-list HEAD | wc -l
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mdframed}%
      [\mdfmaindate\space \mdversion: \mdframedpackagename]
@@ -73,6 +73,7 @@
 \RequirePackage{xparse}
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{zref-abspage}
+\RequirePackage{needspace}
 \RequirePackage{color}
 \SetupKeyvalOptions{family=mdf,prefix=mdf@}
 \def\mdf@definestyle@defaultoptions{}%
@@ -208,6 +209,7 @@
    {roundcorner==\z@},%
    {footenotedistance==\medskipamount},
    {userdefinedwidth==\linewidth},
+   {needspace==\z@},
    {frametitleaboveskip==5pt},
    {frametitlebelowskip==5pt},
    {frametitlerulewidth==.2pt},
@@ -291,7 +293,6 @@
     {frametitlebottomline==true},%
     {frametitlerightline==true},%
     {frametitlerule==false},%
-    {nobreak==false},%
     {footnoteinside==true},%
     {usetwoside==true},%
     {repeatframetitle==false},%Noch nicht richtig implementiert
@@ -318,6 +319,10 @@
  }%
 }
 \appto\mdf@definestyle@defaultoptions{hidealllines=false,}%
+%%special boolflag nobreak:
+\DeclareBoolOption[true]{nobreak}
+\boolfalse{mdf@nobreak}%
+\appto\mdf@definestyle@defaultoptions{nobreak=false,}
 \def\mdf@do@alignoption#1{%
    \mdf@alignoption@tripledo#1\@nil%
 }
@@ -372,17 +377,6 @@
       \RequirePackage{xcolor}%
   \fi%
 }%
-\define@key{mdf}{needspace}[\z@]{%
-     \begingroup%
-        \setlength{\dimen@}{#1}%
-        \vskip\z@\@plus\dimen@%
-        \penalty -100\vskip\z@\@plus -\dimen@%
-        \vskip\dimen@%
-        \penalty 9999%
-        \vskip -\dimen@%
-        \vskip\z@skip % hide the previous |\vskip| from |\addvspace|
-      \endgroup%
-}
 \DeclareDefaultOption{%
    \mdf@PackageError{Unknown Option '\CurrentOption' for mdframed}}
 \ProcessKeyvalOptions*\relax
@@ -808,6 +802,7 @@
 \@definecounter{mdf@env@i}
 \@definecounter{mdf@env@ii}
 \newrobustcmd*\mdf@preenvsetting{%
+   \needspace{\mdf@needspace@length}
    \mdf@twoside@checklength%
    \edef\mdf@par@local{%
       \parskip=\the\parskip\relax%
@@ -1054,11 +1049,11 @@
        \mdf@dolist{\mdf@advancelength@sub{\dimen@}}%
          {innerlinewidth,middlelinewidth,outerlinewidth}%
       }{}%
-    \notbool{mdf@topline}%no top line
+    \ifbool{mdf@topline}{}%%no top line
        {%
            \mdf@dolist{\mdf@advancelength@add{\dimen@}}%
              {innerlinewidth,middlelinewidth,outerlinewidth}%
-       }{}%
+       }%
     \advance\dimen@.8\pageshrink%
     \ifdimless{\ht\mdf@splitbox@one+\dp\mdf@splitbox@one}{\dimen@}%
        {\mdf@PackageWarning{You got a bad break\MessageBreak