caption 3.0o (31mar07)

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

2 files changed, 25 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 6d07328ebaa..cf8c40c921a 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}[2007/03/04 v3.0m Customising captions (AR)]
+\ProvidesPackage{caption}[2007/03/09 v3.0o Customising captions (AR)]
 \RequirePackage{caption3}[2007/01/31] % needs v3.0l or newer
 \DeclareCaptionOption{config}[caption]{%
    \InputIfFileExists{#1.cfg}{\typeout{*** Local configuration file
@@ -183,7 +183,7 @@
   \caption@@make{#1}{#2}%
   \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}}
 \@ifundefined{scr@caption}{}{%
-  \caption@Info{KOMA-Script class detected}%
+  \caption@Info{KOMA-Script class detected}
   \def\onelinecaptionstrue{\caption@setbool{slc}{1}}
   \def\onelinecaptionsfalse{\caption@setbool{slc}{0}}
   \ifonelinecaptions
@@ -191,12 +191,13 @@
   \else
     \onelinecaptionsfalse
   \fi
+  \AtBeginDocument{\let\scr@caption\caption}
   \def\captionabove{%
     \caption@setposition{t}\let\caption@setposition\@gobble
-    \caption}
+    \scr@caption}
   \def\captionbelow{%
     \caption@setposition{b}\let\caption@setposition\@gobble
-    \caption}
+    \scr@caption}
 }
 \AtBeginDocument{\@ifundefined{f@ffrench}{}{%
   \caption@Info{french(le) package detected}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 137a193128d..3a760aa1bb6 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -27,7 +27,7 @@
 %% caption.sty, caption2.sty, caption3.sty, and manual.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2007/03/04 v3.0m caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2007/03/30 v3.0o caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand{\l@addto@macro}[2]{%
@@ -183,6 +183,24 @@
 \DeclareCaptionOption{hangindent}{\setlength\captionhangindent{#1}}
 \DeclareCaptionOption{parindent}{\setlength\captionparindent{#1}}
 \DeclareCaptionOption{parskip}{\l@addto@macro\caption@@par{\setlength\parskip{#1}}}
+\@ifundefined{scr@caption}{}{%
+  \let\caption@KV@parindent\KV@caption@parindent
+  \DeclareCaptionOption{parindent}[]{%
+    \def\caption@tempa{#1}%
+    \ifx\caption@tempa\@empty
+      \PackageInfo{caption3}{Option `parindent' ignored}%
+    \else
+      \caption@KV@parindent{#1}%
+    \fi}%
+  \let\caption@KV@parskip\KV@caption@parskip
+  \DeclareCaptionOption{parskip}[]{%
+    \def\caption@tempa{#1}%
+    \ifx\caption@tempa\@empty
+      \PackageInfo{caption3}{Option `parskip' ignored}%
+    \else
+      \caption@KV@parskip{#1}%
+    \fi}%
+}
 \newcommand*\DeclareCaptionStyle[1]{%
   \@ifnextchar[{\caption@declarestyle{#1}}{\caption@declarestyle{#1}[]}}
 \def\caption@declarestyle#1[#2]#3{%
@@ -479,7 +497,7 @@
   \let\caption@hj\relax}
 \newcommand\caption@endslc{%
   \endgroup}
-\newcommand\captionbox{\parbox[t]}
+\newcommand\captionbox{\parbox[b]}
 \newcommand\caption@@@make[2]{%
   \sbox\@tempboxa{#1}%
   \ifdim\wd\@tempboxa=\z@