summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/README (renamed from Master/texmf-dist/doc/latex/mdframed/README.txt)1
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdfbin272392 -> 269831 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex7
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdfbin77285 -> 76771 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex7
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdfbin214936 -> 214233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex7
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdfbin273885 -> 271564 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex7
-rw-r--r--Master/texmf-dist/doc/latex/mdframed/mdframed.pdfbin780170 -> 778966 bytes
-rw-r--r--Master/texmf-dist/source/latex/mdframed/mdframed.dtx124
-rw-r--r--Master/texmf-dist/source/latex/mdframed/mdframed.ins1
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls14
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf5
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf5
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf5
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf5
-rw-r--r--Master/texmf-dist/tex/latex/mdframed/mdframed.sty59
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
20 files changed, 134 insertions, 118 deletions
diff --git a/Master/texmf-dist/doc/latex/mdframed/README.txt b/Master/texmf-dist/doc/latex/mdframed/README
index a32f456c4f5..df8944c8a17 100644
--- a/Master/texmf-dist/doc/latex/mdframed/README.txt
+++ b/Master/texmf-dist/doc/latex/mdframed/README
@@ -68,4 +68,3 @@ I recommend the following installation in your texmf-tree:
- ltxmdf.cls
================================================================
================================================================
-%% CheckSum{5147}
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 be599f78f04..03f05e2b286 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex
index 7f02e9ea477..565cda9ce03 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex
@@ -1,8 +1,7 @@
-%% CheckSum{5147}
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
\lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},}
@@ -13,7 +12,7 @@
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
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 3ac84effad6..241b159d56c 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex
index 58a12c8d081..4e7c3604b51 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex
@@ -1,8 +1,7 @@
-%% CheckSum{5147}
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\lstDeleteShortInline{|}
\newcommand\Loadedframemethod{PSTricks}
@@ -14,7 +13,7 @@
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
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 660d8ebb22f..3cbbefdd207 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex
index 5e660905667..c69d71276ed 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex
@@ -1,9 +1,8 @@
-%% CheckSum{5147}
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt,ltxlipsum]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
\lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},}
@@ -14,7 +13,7 @@
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
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 91eb8a3b564..ee9dc14713d 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex
index 06d6c651f04..e40bc39154d 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex
@@ -1,8 +1,7 @@
-%% CheckSum{5147}
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
\lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},}
@@ -13,7 +12,7 @@
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
index beb66b7d0c9..aac2611d618 100644
--- a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
+++ b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
index 0a7168602f0..71b3456ee66 100644
--- a/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
+++ b/Master/texmf-dist/source/latex/mdframed/mdframed.dtx
@@ -206,11 +206,11 @@ Have fun!
\fi
%</internal>
%<*driver>
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,11pt,]{ltxmdf}
\usepackage[framemethod=TikZ]{mdframed}
-\ltxmdfsetifoot$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\EnableCrossrefs
\CodelineIndex
@@ -221,7 +221,7 @@ Have fun!
%</driver>
% \fi
%
-%% CheckSum{5147}
+% \CheckSum{5231}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -250,7 +250,7 @@ Have fun!
% \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}%
% \href{mailto:marco.daniel@mada-nada.de}{Elke Schubert}}}
% \version{\mdversion}
-% \date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+% \date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
% \introduction{The standard methods for framing text (\Cmd{fbox}
% or \Cmd{fcolorbox}) require you to handle page breaks
% by hand, meaning that you have to split the \Cmd{fbox}
@@ -1071,6 +1071,10 @@ Have fun!
%
% The examples are often not equivalent but normally they can be adapted to another method.
% So I really recommend to have a look to all example files.
+%
+% The Korean \TeX Group created a very nice presentation. I want to show the link
+% because it's really a great work:
+% \href{http://prezi.com/zc355i9tcsgz/talk-kts-2012-mdframed/}{kts 2012 mdframed}.
%
% \section{Errors, Warnings and Messages}
%
@@ -1404,6 +1408,15 @@ Have fun!
%
% \subsection{Revision history}\label{rev}
% \raggedright
+% \minisec{Version 1.4 submitted 4 Mar 2012}
+% \begin{itemize*}
+% \item fixed bug in combination with \Cmd{marginpar} (Thanks Juan Carlos Trujillo Ortega)
+% \item fixed bug with option \Opt{font}
+% \item fixed bug inside \texttt{frametitle} (Thanks Yi, Hoze)
+% \item removed unnessary groups (Thanks Yi, Hoze)
+% \item changed the definition of \Pack{listings} to allow copy paste of the examples
+% \end{itemize*}
+%
% \minisec{Version 1.3a submitted 5 Feb 2012}
% \begin{itemize*}
% \item fixed bug (Thanks to Dietrich Grau)
@@ -1563,14 +1576,14 @@ Have fun!
%
% \subsection{The Explanation of mdframed.sty}
%
-% %$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
-% %$Rev: 344 $
+% %$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
+% %$Rev: 347 $
% %$Author: marco $
-% %$Date: 2012-02-05 00:50:02 +0100 (So, 05. Feb 2012) $
+% %$Date: 2012-03-04 14:04:28 +0100 (So, 04. Mär 2012) $
% \begin{macro}{mdversion,mdframedpackagename,mdf@maindate@svn}
% Set package information
% \begin{macrocode}
-\def\mdversion{v1.3a}
+\def\mdversion{v1.4}
\def\mdframedpackagename{mdframed}
\def\mdf@maindate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
% \end{macrocode}
@@ -1579,7 +1592,7 @@ Have fun!
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mdframed}%
- [\mdf@maindate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $%
+ [\mdf@maindate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $%
\mdversion: \mdframedpackagename]
% \end{macrocode}
%
@@ -2368,12 +2381,11 @@ Have fun!
% \endgroup
% }
\newrobustcmd\mdfframedtitleenv[1]{%
- \begingroup%
- \color@setgroup%
- \mdf@frametitlefont\color{\mdf@frametitlefontcolor}%
+ \color@begingroup%%
\mdf@lrbox{\mdf@frametitlebox}%
\mdf@frametitlealignment%
- #1\par\unskip
+ \color{\mdf@frametitlefontcolor}%
+ \normalfont\mdf@frametitlefont{#1}\par\unskip
\endmdf@lrbox%
\mdf@ignorevbadness%
\global\setbox\mdf@frametitlebox\vbox{\unvbox\mdf@frametitlebox}%
@@ -2383,7 +2395,6 @@ Have fun!
\global\mdfframetitleboxtotalheight=\dimexpr\ht\mdf@frametitlebox+\dp\mdf@frametitlebox
+\mdf@frametitleaboveskip@length+\mdf@frametitlebelowskip@length\relax%
\color@endgroup%
- \endgroup%
}
\newrobustcmd*\mdf@@frametitle{%
@@ -2497,6 +2508,8 @@ Have fun!
% \end{macrocode}
% \end{macro}
% \changes{v1.1beta}{2011/12/17}{Added frametitle detection to \protect\Cmd{detected@mdf@put@frame}}
+% \changes{v1.4}{2012/03/04}{Changed the detecting of float environments. Now mdframed uses
+% only \protect\Cmd{@captype} instead of \protect\Cmd{@floatpenalty}}
% \begin{macro}{detected@mdf@put@frame}
% Detect whether inside a non breakable environment.
% \begin{macrocode}
@@ -2506,21 +2519,28 @@ Have fun!
\def\mdf@reserved@a{\mdf@put@frame@standalone}%
\else
\def\mdf@reserved@a{\mdf@put@frame}%
- \ifnum\@floatpenalty<0\relax%Detecting float
- \if@twocolumn%
- \ifx\@captype\@undefined
- \def\mdf@reserved@a{\mdf@put@frame}%
- \else
- \mdf@PackageInfo{mdframed inside float ^^J
- mdframed uses option nobreak \mdframedpackagename}%
- \def\mdf@reserved@a{\mdf@put@frame@standalone}%
- \fi
- \else
- \mdf@PackageInfo{mdframed inside float ^^J
- mdframed uses option nobreak \mdframedpackagename}%
- \def\mdf@reserved@a{\mdf@put@frame@standalone}%
- \fi%
- \fi%
+ \ifx\@captype\@undefined
+ \def\mdf@reserved@a{\mdf@put@frame}%
+ \else
+ \mdf@PackageInfo{mdframed inside float ^^J
+ mdframed uses option nobreak \mdframedpackagename}%
+ \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+ \fi
+%% \ifnum\@floatpenalty<0\relax%Detecting float
+%% \if@twocolumn%
+%% \ifx\@captype\@undefined
+%% \def\mdf@reserved@a{\mdf@put@frame}%
+%% \else
+%% \mdf@PackageInfo{mdframed inside float ^^J
+%% mdframed uses option nobreak \mdframedpackagename}%
+%% \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+%% \fi
+%% \else
+%% \mdf@PackageInfo{mdframed inside float ^^J
+%% mdframed uses option nobreak \mdframedpackagename}%
+%% \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+%% \fi%
+%% \fi%
\if@minipage%
\mdf@PackageInfo{mdframed inside minipage ^^J
mdframed uses option nobreak \mdframedpackagename}%
@@ -2554,12 +2574,13 @@ Have fun!
% \changes{v1.1beta}{2012/01/01}{Changed the definition of \protect\Cmd{mdf@trivlist}}
% \changes{v1.1release}{2012/01/03}{Changed the enddefinition of \protect\Env{mdframed}.
% Uses now \protect\Cmd{@doendpe} instead of \protect\Cmd{\@endparenv}}
+% \changes{v1.4}{2012/03/004}{Changed the enddefinition of \protect\Env{mdframed}.
+% Uses now a line to provide the defined width}
% \begin{macro}{mdframed,mdframed@ii,mdframed@i}
% That the user environement.
% \begin{macrocode}
\newenvironment{mdframed}[1][]{%
-\begingroup%
-\color@setgroup%
+\color@begingroup%
\mdfsetup{userdefinedwidth=\linewidth,#1}%
\mdf@hidealllines@check%
\mdf@twoside@checklength%
@@ -2569,13 +2590,14 @@ Have fun!
\mdf@styledefinition%
\mdf@footnoteinput%
\color{\mdf@fontcolor}%
+ \mdf@font%
\ifvmode\nointerlineskip\fi%
\mdf@trivlist{\mdf@skipabove@length}%%
\ifdefempty{\mdf@frametitle}{}{\mdf@@frametitle}%
\mdf@settings%
\mdf@lrbox{\mdf@splitbox@one}%
}%
- {\par\unskip%
+ {\par\unskip\nointerlineskip\hrule \@height\z@ \@width\hsize%%
\ifmdf@footnoteinside%
\def\mdf@reserveda{%
\mdf@footnoteoutput%
@@ -2592,7 +2614,7 @@ Have fun!
\fi%
\mdf@reserveda%
\endmdf@trivlist%
-\color@endgroup\endgroup\@doendpe%\@endparenv%
+\color@endgroup\@doendpe%
}
@@ -3109,7 +3131,7 @@ Have fun!
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
%
% \end{macrocode}
%
@@ -3119,7 +3141,7 @@ Have fun!
\def\mdframedOpackagename{md-frame-0}
\def\mdf@frameOdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-0.mdf}%
- [\mdf@frameOdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $%
+ [\mdf@frameOdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $%
\mdversion: \mdframedOpackagename]
% \end{macrocode}
% \end{macro}
@@ -3589,7 +3611,7 @@ Have fun!
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
%
% \end{macrocode}
% \changes{v1.1beta}{2011/12/16}{added lost semicolons}
@@ -3599,7 +3621,7 @@ Have fun!
\def\mdframedIpackagename{md-frame-1}
\def\mdf@frameIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-1.mdf}%
- [\mdf@frameIdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $ %
+ [\mdf@frameIdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ %
\mdversion: \mdframedIpackagename]
%
% \end{macrocode}
@@ -4284,7 +4306,7 @@ Have fun!
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
%
% \end{macrocode}
%
@@ -4294,7 +4316,7 @@ Have fun!
\def\mdframedIIpackagename{md-frame-2}
\def\mdf@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-2.mdf}%
- [\mdf@frameIIdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $ %
+ [\mdf@frameIIdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ %
\mdversion: \mdframedIIpackagename]
% \end{macrocode}
% \end{macro}
@@ -4999,10 +5021,10 @@ Have fun!
%
% \begin{macrocode}
%Documenation of the package mdframed
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
\lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},}
@@ -5013,7 +5035,7 @@ Have fun!
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
@@ -5216,10 +5238,10 @@ The example below is inspired by the following post on StackExchange \href{http:
%
% \begin{macrocode}
%Documenation of the package mdframed
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
@@ -5231,7 +5253,7 @@ The example below is inspired by the following post on StackExchange \href{http:
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
@@ -5470,10 +5492,10 @@ color(100bp)=(black!5)}
%
% \begin{macrocode}
%Documenation of the package mdframed
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt]{ltxmdf}
-\ltxmdfsetifoot$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\lstDeleteShortInline{|}
\newcommand\Loadedframemethod{PSTricks}
@@ -5485,7 +5507,7 @@ color(100bp)=(black!5)}
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
@@ -5612,10 +5634,10 @@ function of the independent variables alone.
% \begin{macrocode}
%Documenation of the package mdframed
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\setcounter{errorcontextlines}{999}
\documentclass[parskip=false,english,11pt,ltxlipsum]{ltxmdf}
-\ltxmdfsetifoot $Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+\ltxmdfsetifoot $Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\usepackage{showexpl}
@@ -5627,7 +5649,7 @@ function of the independent variables alone.
\title{The \Pack{mdframed} package}
\subtitle{Examples for \Opt{framemethod=\Loadedframemethod}}
\author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}}
-\date{\mdfdateID$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $}
+\date{\mdfdateID$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $}
\version{\mdversion}
\introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}.
Some presented examples are more or less exorbitant.}
diff --git a/Master/texmf-dist/source/latex/mdframed/mdframed.ins b/Master/texmf-dist/source/latex/mdframed/mdframed.ins
index 4189d285ad3..a33cfa88416 100644
--- a/Master/texmf-dist/source/latex/mdframed/mdframed.ins
+++ b/Master/texmf-dist/source/latex/mdframed/mdframed.ins
@@ -96,4 +96,3 @@ Have fun!
\Msg{* Happy TeXing!}
\Msg{*********************************************************}
\endbatchfile
-%% CheckSum{5147}
diff --git a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
index e72cb7c1b17..fda5dd42ad7 100644
--- a/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
+++ b/Master/texmf-dist/tex/latex/mdframed/ltxmdf.cls
@@ -9,16 +9,16 @@
%% Either version 1.0 or, at your option, any later version.
-%%$Id: ltxmdf.cls 337 2012-02-04 11:21:26Z marco $
-%%$Rev: 337 $
+%%$Id: ltxmdf.cls 347 2012-03-04 13:04:28Z marco $
+%%$Rev: 347 $
%%$Author: marco $
-%%$Date: 2012-02-04 12:21:26 +0100 (Sa, 04. Feb 2012) $
+%%$Date: 2012-03-04 14:04:28 +0100 (So, 04. Mär 2012) $
%% Allgemeine Angaben
\def\ltxmdf@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 337 2012-02-04 11:21:26Z marco $ ltxmdf]
+\ProvidesPackage{ltxmdf}[\ltxmdf@svn$Id: ltxmdf.cls 347 2012-03-04 13:04:28Z marco $ ltxmdf]
\DeclareOption{tocdepthsec}{\def\ltxmdf@tocdepth{1}}
\DeclareOption{tocdepthsub}{\def\ltxmdf@tocdepth{2}}
\newif\ifltxmdf@lipsum
@@ -95,7 +95,7 @@
\ifoot{#2 #3 #4-#5-#6 #7 #8}
}
-\ltxmdfsetifoot$Id: ltxmdf.cls 337 2012-02-04 11:21:26Z marco $
+\ltxmdfsetifoot$Id: ltxmdf.cls 347 2012-03-04 13:04:28Z marco $
@@ -117,7 +117,7 @@
texcsstyle=*\color{red!50!black}\bfseries,
moretexcs=intertext,
keywordstyle=\color{blue!60!black}\bfseries,%
- columns=fixed,%
+ columns=fullflexible,%
fontadjust=true,%
basewidth=0.65em,%
breakatwhitespace=true,
@@ -172,7 +172,7 @@
\def\version#1{\def\@version{#1}}
\def\date#1{\def\@date{#1}}
\def\@@date$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6}
-\date{\@@date$Id: ltxmdf.cls 337 2012-02-04 11:21:26Z marco $}
+\date{\@@date$Id: ltxmdf.cls 347 2012-03-04 13:04:28Z marco $}
\let\mdfdateID\@@date
diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf
index f9f453a0741..96beb5f2010 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-0.mdf
@@ -1,4 +1,3 @@
-%% CheckSum{5147}
%% Style file for mdframed for package option `framemethod=default`
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -6,11 +5,11 @@
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\def\mdframedOpackagename{md-frame-0}
\def\mdf@frameOdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-0.mdf}%
- [\mdf@frameOdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $%
+ [\mdf@frameOdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $%
\mdversion: \mdframedOpackagename]
\def\mdf@background@default{\color{\mdf@backgroundcolor}}
\def\mdf@frametitlebackground@default{\color{\mdf@frametitlebackgroundcolor}}
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 223ce0d73ab..259bfecf2c2 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-1.mdf
@@ -1,4 +1,3 @@
-%% CheckSum{5147}
%% Style file for mdframed for package option `framemethod=default`
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -6,11 +5,11 @@
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\def\mdframedIpackagename{md-frame-1}
\def\mdf@frameIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-1.mdf}%
- [\mdf@frameIdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $ %
+ [\mdf@frameIdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ %
\mdversion: \mdframedIpackagename]
\def\mdf@tikz@settings{%
\tikzset{mdfbox/.style={anchor=south west,%
diff --git a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
index ed1f87e6195..60f37ddf674 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-2.mdf
@@ -1,4 +1,3 @@
-%% CheckSum{5147}
%% Style file for mdframed for package option `framemethod=default`
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -6,11 +5,11 @@
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\def\mdframedIIpackagename{md-frame-2}
\def\mdf@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-2.mdf}%
- [\mdf@frameIIdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $ %
+ [\mdf@frameIIdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ %
\mdversion: \mdframedIIpackagename]
\def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div }
\def\mdf@ptlength@to@pscode@length#1{\pst@number{\csname mdf@#1@length\endcsname} \pst@number\psxunit div }
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 ed1f87e6195..60f37ddf674 100644
--- a/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
+++ b/Master/texmf-dist/tex/latex/mdframed/md-frame-3.mdf
@@ -1,4 +1,3 @@
-%% CheckSum{5147}
%% Style file for mdframed for package option `framemethod=default`
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -6,11 +5,11 @@
%% Either version 1.0 or, at your option, any later version.
%%
%%
-%%$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $
+%%$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $
\def\mdframedIIpackagename{md-frame-2}
\def\mdf@frameIIdate@svn$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
\ProvidesFile{md-frame-2.mdf}%
- [\mdf@frameIIdate@svn$Id: mdframed.dtx 344 2012-02-04 23:50:02Z marco $ %
+ [\mdf@frameIIdate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $ %
\mdversion: \mdframedIIpackagename]
\def\mdf@ptlength@to@pscode#1{\pst@number{#1} \pst@number\psxunit div }
\def\mdf@ptlength@to@pscode@length#1{\pst@number{\csname mdf@#1@length\endcsname} \pst@number\psxunit div }
diff --git a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
index a0e56bcaf65..ed201b7ec4b 100644
--- a/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
+++ b/Master/texmf-dist/tex/latex/mdframed/mdframed.sty
@@ -29,7 +29,6 @@
%% 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
@@ -48,13 +47,12 @@
%% >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
%% ==================================================
%%
-%% CheckSum{5147}
-\def\mdversion{v1.3a}
+\def\mdversion{v1.4}
\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 344 2012-02-04 23:50:02Z marco $%
+ [\mdf@maindate@svn$Id: mdframed.dtx 347 2012-03-04 13:04:28Z marco $%
\mdversion: \mdframedpackagename]
\newcommand*\mdf@PackageWarning[1]{\PackageWarning{\mdframedpackagename}{#1}}
\newcommand*\mdf@PackageInfo[1]{\PackageInfo{\mdframedpackagename}{#1}}
@@ -564,12 +562,11 @@
}
\newrobustcmd\mdfframedtitleenv[1]{%
- \begingroup%
- \color@setgroup%
- \mdf@frametitlefont\color{\mdf@frametitlefontcolor}%
+ \color@begingroup%%
\mdf@lrbox{\mdf@frametitlebox}%
\mdf@frametitlealignment%
- #1\par\unskip
+ \color{\mdf@frametitlefontcolor}%
+ \normalfont\mdf@frametitlefont{#1}\par\unskip
\endmdf@lrbox%
\mdf@ignorevbadness%
\global\setbox\mdf@frametitlebox\vbox{\unvbox\mdf@frametitlebox}%
@@ -579,7 +576,6 @@
\global\mdfframetitleboxtotalheight=\dimexpr\ht\mdf@frametitlebox+\dp\mdf@frametitlebox
+\mdf@frametitleaboveskip@length+\mdf@frametitlebelowskip@length\relax%
\color@endgroup%
- \endgroup%
}
\newrobustcmd*\mdf@@frametitle{%
@@ -665,21 +661,28 @@
\def\mdf@reserved@a{\mdf@put@frame@standalone}%
\else
\def\mdf@reserved@a{\mdf@put@frame}%
- \ifnum\@floatpenalty<0\relax%Detecting float
- \if@twocolumn%
- \ifx\@captype\@undefined
- \def\mdf@reserved@a{\mdf@put@frame}%
- \else
- \mdf@PackageInfo{mdframed inside float ^^J
- mdframed uses option nobreak \mdframedpackagename}%
- \def\mdf@reserved@a{\mdf@put@frame@standalone}%
- \fi
- \else
- \mdf@PackageInfo{mdframed inside float ^^J
- mdframed uses option nobreak \mdframedpackagename}%
- \def\mdf@reserved@a{\mdf@put@frame@standalone}%
- \fi%
- \fi%
+ \ifx\@captype\@undefined
+ \def\mdf@reserved@a{\mdf@put@frame}%
+ \else
+ \mdf@PackageInfo{mdframed inside float ^^J
+ mdframed uses option nobreak \mdframedpackagename}%
+ \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+ \fi
+%% \ifnum\@floatpenalty<0\relax%Detecting float
+%% \if@twocolumn%
+%% \ifx\@captype\@undefined
+%% \def\mdf@reserved@a{\mdf@put@frame}%
+%% \else
+%% \mdf@PackageInfo{mdframed inside float ^^J
+%% mdframed uses option nobreak \mdframedpackagename}%
+%% \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+%% \fi
+%% \else
+%% \mdf@PackageInfo{mdframed inside float ^^J
+%% mdframed uses option nobreak \mdframedpackagename}%
+%% \def\mdf@reserved@a{\mdf@put@frame@standalone}%
+%% \fi%
+%% \fi%
\if@minipage%
\mdf@PackageInfo{mdframed inside minipage ^^J
mdframed uses option nobreak \mdframedpackagename}%
@@ -702,8 +705,7 @@
}{}%
}
\newenvironment{mdframed}[1][]{%
-\begingroup%
-\color@setgroup%
+\color@begingroup%
\mdfsetup{userdefinedwidth=\linewidth,#1}%
\mdf@hidealllines@check%
\mdf@twoside@checklength%
@@ -713,13 +715,14 @@
\mdf@styledefinition%
\mdf@footnoteinput%
\color{\mdf@fontcolor}%
+ \mdf@font%
\ifvmode\nointerlineskip\fi%
\mdf@trivlist{\mdf@skipabove@length}%%
\ifdefempty{\mdf@frametitle}{}{\mdf@@frametitle}%
\mdf@settings%
\mdf@lrbox{\mdf@splitbox@one}%
}%
- {\par\unskip%
+ {\par\unskip\nointerlineskip\hrule \@height\z@ \@width\hsize%%
\ifmdf@footnoteinside%
\def\mdf@reserveda{%
\mdf@footnoteoutput%
@@ -736,7 +739,7 @@
\fi%
\mdf@reserveda%
\endmdf@trivlist%
-\color@endgroup\endgroup\@doendpe%\@endparenv%
+\color@endgroup\@doendpe%
}
\newtoggle{md:checktwoside}
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index b6ccd08fa69..2b199055583 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -17,7 +17,7 @@ sub main {
# erroneous or problematic tds files (when new, tell RobinF and author)
$erroneous_tds = join ("|",
- qw(engpron gost he-she imtekda spanish titleps),
+ qw(engpron gost he-she imtekda mdframed spanish titleps),
);
# Heiko's tds files (don't propagate through CTAN fast enough).
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 5518e981e61..958804485cc 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1673,7 +1673,7 @@ $standarddocfmt='latex';
$standardsourcefmt='latex';
-$standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
+$standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
%specialsource= (
'FAQ-en', 'NULL',
'ae', '\.mtx|\.etx|\.tex|clean|go|install|makepl',
@@ -1717,6 +1717,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
'latex2man', 'NULL', # leave Makefile
'latexdiff', 'NULL', # leave Makefile
'lua-alt-getopt', 'NULL',
+ 'mdframed', 'Makefile|' . $standardsource,
'mff', '\.mfj|\.bat|\.diz',
'microtype-de', 'NULL', # doc package
'mkjobtexmf', 'Makefile.in|' . $standardsource,