mdframed (30mar12)

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

1 files changed, 56 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
index ed201b7ec4b..2103353e87a 100644
--- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
+++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
@@ -29,6 +29,7 @@
 %%  Public License, as described in lppl.txt in the base LaTeX distribution.
 %%  Either version 1.0 or, at your option, any later version.
 %% 
+%% 
 %% =================================================
 %%  Erstellung eines Rahmens, der am Seitenende keine
 %%  horizontale Linie einfuegt
@@ -47,12 +48,12 @@
 %% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 %% ==================================================
 %% 
-\def\mdversion{v1.4}
+\def\mdversion{v1.4d}
 \def\mdframedpackagename{mdframed}
 \def\mdf@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mdframed}%
-     [\mdf@maindate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $%
+     [\mdf@maindate@svn$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $%
       \mdversion: \mdframedpackagename]
 \newcommand*\mdf@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}}
 \newcommand*\mdf@PackageInfo[1]{\PackageInfo{\mdframedpackagename}{#1}}
@@ -243,13 +244,21 @@
     {frametitleleftline==true},%
     {frametitlebottomline==true},%
     {frametitlerightline==true},%
-    {hidealllines==false},%
     {frametitlerule==false},%
     {nobreak==false},%
     {footnoteinside==true},%
     {usetwoside==true},%
     {repeatframetitle==false},%Noch nicht richtig implementiert
     {shadow==false},%
+    {everyline==false},%
+}
+%%special boolflag hidealllines:
+\newbool{mdf@hidealllines}%
+\define@key{mdf}{hidealllines}[false]{%
+\setbool{mdf@hidealllines}{#1}%
+ \ifbool{mdf@hidealllines}{%
+   \setkeys{mdf}{leftline=false,topline=false,rightline=false,bottomline=false}%
+ }{}%
 }
 \mdf@dolist{\mdf@do@alignoption}{%
     {left==\mdf@leftmargin@length==\z@},%
@@ -707,7 +716,7 @@
 \newenvironment{mdframed}[1][]{%
 \color@begingroup%
    \mdfsetup{userdefinedwidth=\linewidth,#1}%
-   \mdf@hidealllines@check%
+%%%   \mdf@hidealllines@check%
    \mdf@twoside@checklength%
    \let\width\z@%
    \let\height\z@%
@@ -722,7 +731,7 @@
    \mdf@settings%
    \mdf@lrbox{\mdf@splitbox@one}%
   }%
-  {\par\unskip\nointerlineskip\hrule \@height\z@ \@width\hsize%%
+  {\par\unskip\ifvmode\nointerlineskip\hrule \@height\z@ \@width\hsize\fi%%
     \ifmdf@footnoteinside%
       \def\mdf@reserveda{%
         \mdf@footnoteoutput%
@@ -910,6 +919,13 @@
     \mdf@dolist{\mdf@advancelength@freevspace@sub}{%calculate with \dimen@
               outerlinewidth,middlelinewidth,innerlinewidth,%
               innertopmargin,splitbottomskip}%
+    \ifbool{mdf@everyline}{%
+      \ifbool{mdf@bottomline}{%
+               \advance\dimen@ by -\mdf@innerlinewidth@length%
+               \advance\dimen@ by -\mdf@middlelinewidth@length%
+               \advance\dimen@ by -\mdf@outerlinewidth@length%
+           }{}%
+        }{}%
     \ifbool{mdf@topline}{}{%
                \advance\dimen@ by \mdf@innerlinewidth@length%
                \advance\dimen@ by \mdf@middlelinewidth@length%
@@ -956,6 +972,16 @@
            \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \dimen@i
            \setbox\mdf@splitbox@two\vbox{\unvbox\mdf@splitbox@two}%
            \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}%
+           \ifdimgreater{\ht\mdf@splitbox@two+\dp\mdf@splitbox@two}{\dimen@}%
+                        {%
+                         \splittopskip\z@\mdf@ignorevbadness%%
+                         \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@two%
+                                                 %benoetigt um Tiefe zu haben
+                                               \hrule \@height\dp\strutbox \@width\z@
+                                               \unvbox\mdf@splitbox@one}%
+                         \mdf@ignorevbadness%
+                         \setbox\mdf@splitbox@one\vbox{\unvbox\mdf@splitbox@one}%
+                         }{}%
        \ifbool{mdf@repeatframetitle}{%
                   \setbox\mdf@splitbox@one\vbox{%
                        \vbox to \mdf@splittopskip@length{\hsize\z@}
@@ -983,7 +1009,7 @@
        \fi
        \ifvoid\mdf@splitbox@two%%pruefe, ob erste Box leer ist
         \hrule \@height\z@ \@width\hsize
-        \vfill\eject%
+        %%\vfill\eject%
            \def\mdf@reserved@a{\mdf@put@frame}%
        \else
         \ifdimequal{\ht\mdf@splitbox@two}{0pt}%
@@ -1011,19 +1037,34 @@
   \mdf@dolist{\mdf@advancelength@freevspace@add}{%used \dimen@
                 outerlinewidth,middlelinewidth,innerlinewidth,%
                 innerbottommargin}%%%Addition der Linien unten
+   \ifbool{mdf@everyline}{%
+      \ifbool{mdf@topline}{%
+               \advance\dimen@ by \mdf@innerlinewidth@length%
+               \advance\dimen@ by \mdf@middlelinewidth@length%
+               \advance\dimen@ by \mdf@outerlinewidth@length%
+           }{}%
+        }{}%
    \ifbool{mdf@bottomline}{}{%
-               \advance\dimen@i by \mdf@innerlinewidth@length%
-               \advance\dimen@i by \mdf@middlelinewidth@length%
-               \advance\dimen@i by \mdf@outerlinewidth@length%
+               \advance\dimen@ by -\mdf@innerlinewidth@length%
+               \advance\dimen@ by -\mdf@middlelinewidth@length%
+               \advance\dimen@ by -\mdf@outerlinewidth@length%
           \relax}%
    \ifdimgreater{\dimen@}{\mdf@freevspace@length}%
     {%
-   \advance\mdf@freevspace@length by -\mdf@splitbottomskip@length\relax%
-   \ifbool{mdf@bottomline}{}{%
-               \advance\dimen@i by -\mdf@innerlinewidth@length%
-               \advance\dimen@i by -\mdf@middlelinewidth@length%
-               \advance\dimen@i by -\mdf@outerlinewidth@length%
-          \relax}%
+     \advance\mdf@freevspace@length by -\mdf@splitbottomskip@length\relax%
+     \advance\mdf@freevspace@length by .5\ht\strutbox\relax%
+     \ifbool{mdf@everyline}{%
+       \ifbool{mdf@topline}{%
+               \advance\mdf@freevspace@length by -\mdf@innerlinewidth@length%
+               \advance\mdf@freevspace@length by -\mdf@middlelinewidth@length%
+               \advance\mdf@freevspace@length by -\mdf@outerlinewidth@length%
+           }{}%
+       \ifbool{mdf@bottomline}{%
+               \advance\mdf@freevspace@length by -\mdf@innerlinewidth@length%
+               \advance\mdf@freevspace@length by -\mdf@middlelinewidth@length%
+               \advance\mdf@freevspace@length by -\mdf@outerlinewidth@length%
+          \relax}{}%
+        }{}%
         \splitmaxdepth\z@ \splittopskip\mdf@splittopskip@length%
         \mdf@ignorevbadness%
         \setbox\mdf@splitbox@two\vsplit\mdf@splitbox@one to \mdf@freevspace@length%