summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/mdframed
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-03-05 00:55:00 +0000
committerKarl Berry <karl@freefriends.org>2012-03-05 00:55:00 +0000
commit1480574d9087a43f46a3013758228cf555693b6e (patch)
tree06f8899fd2687e41ac6b417709959d5d75d3679f /Master/texmf-dist/tex/latex/mdframed
parent4f735f9c7efbb40316858ad2efed993d860c7461 (diff)
mdframed 1.4 (4mar12)
git-svn-id: svn://tug.org/texlive/trunk@25560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mdframed')
-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
6 files changed, 46 insertions, 47 deletions
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}