summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption.sty
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2007-01-08 20:13:32 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2007-01-08 20:13:32 +0000
commit414c8ad86b77b988ba8ce4844a664729e8774f64 (patch)
tree87a1a695f3b64d1f690afed61c75bb5905d7b57b /Master/texmf-dist/tex/latex/caption/caption.sty
parent4d0955e8f5596298fad939a8ea13f99c675fe4ba (diff)
Update caption.
git-svn-id: svn://tug.org/texlive/trunk@3252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty14
1 files changed, 12 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 1e5324db58b..382086e3532 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -27,7 +27,7 @@
%% caption.sty, caption2.sty, caption3.sty, and manual.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2006/03/21 v3.0j Customising captions (AR)]
+\ProvidesPackage{caption}[2007/01/07 v3.0k Customising captions (AR)]
\RequirePackage{caption3}[2006/01/12] % needs v3.0i or newer
\DeclareCaptionOption{config}[caption]{%
\InputIfFileExists{#1.cfg}{\typeout{*** Local configuration file
@@ -76,7 +76,7 @@
\scr@caption}
\def\captionbelow{%
\caption@setposition{b}\let\caption@setposition\@gobble
-\scr@caption}
+ \scr@caption}
}
\newcommand*\caption@declarepackage[1]{%
\caption@setbool{pkt@#1}{1}%
@@ -149,6 +149,9 @@
\let\caption@ContinuedFloat\@gobble
\let\caption@resetContinuedFloat\@gobble
\providecommand*\caption@@ContinuedFloat[1]{}
+\newcommand*\DeclareCaptionEnvironment[2][]{%
+ \AtBeginEnvironment{#2}{\caption@letfloattype{#2}{#1}}}
+\@onlypreamble\DeclareCaptionEnvironment
\newcommand*\caption@begin[1]{%
\caption@resetContinuedFloat{#1}%
\begingroup
@@ -411,6 +414,13 @@
\fi}%
\caption@endSC@FLOAT}%
}
+\AtBeginDocument{%
+ \def\@tempa{\@ifstar\sf@@subref\sf@subref}%
+ \ifx\subref\@tempa
+ \PackageInfo{caption}{subref 1.2 or 1.3 detected}%
+ \DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}%
+ \fi
+}
\def\caption@setSTposition{%
\caption@setposition{\if@topcaption t\else b\fi}}
\caption@ifpackage{supertabular}{ST@caption}{%