caption 3.0o (31mar07)

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

7 files changed, 92 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/anleitung.pdf b/Master/texmf-dist/doc/latex/caption/anleitung.pdf
index f1b4195ee93..e1b3803e8c7 100644
--- a/Master/texmf-dist/doc/latex/caption/anleitung.pdf
+++ b/Master/texmf-dist/doc/latex/caption/anleitung.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/anleitung.tex b/Master/texmf-dist/doc/latex/caption/anleitung.tex
index f478d2e4469..2452a70393c 100644
--- a/Master/texmf-dist/doc/latex/caption/anleitung.tex
+++ b/Master/texmf-dist/doc/latex/caption/anleitung.tex
@@ -1975,9 +1975,10 @@ J"urgen G"obel,
 Uwe Siart,
 Sang-Heon Shim,
 Henrik Lundell,
-David Byers
-und
+David Byers,
 William Asquith
+und
+Prof.~Dr.~Dirk Hoffmann
 f"ur ihre Hilfe beim stetigen Verbessern dieses Paketes bedanken.
 
 % --------------------------------------------------------------------------- %
diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf
index 73d5ff7844e..f9437169104 100644
--- a/Master/texmf-dist/doc/latex/caption/caption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption.pdf
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index 8d0a013f980..794171bde9b 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -23,7 +23,7 @@
 % caption.sty, caption2.sty, caption3.sty, and manual.tex.
 % 
 % \fi
-% \CheckSum{2058}
+% \CheckSum{2089}
 %
 % \iffalse
 %<*driver>
@@ -1823,8 +1823,9 @@
 % Sang-Heon Shim,
 % Henrik Lundell,
 % David Byers,
-% and
 % William Asquith,
+% and
+% Prof.~Dr.~Dirk Hoffmann,
 % who all helped to make this package a better one.
 % 
 % \iffalse
@@ -1997,7 +1998,7 @@
 %
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \subsubsection*{Generic helpers}
@@ -2404,6 +2405,53 @@
 \DeclareCaptionOption{parskip}{\l@addto@macro\caption@@par{\setlength\parskip{#1}}}
 %    \end{macrocode}
 %
+% \changes{v3.0h}{2005/08/22}{Increased compatibility to KOMA-Script: A special version of options
+%                             `parindent' and `parskip' added}
+% \changes{v3.0i}{2006/01/03}{Bugfix 06-01-03: KOMA-Script variants of `parskip' and `parindent' options
+%                             revised and moved into caption kernel}
+% \changes{v3.0j}{2006/02/23}{KOMA-Script variants of `parskip' and `parindent' are obsolete now, removed}
+% \changes{v3.0o}{2007/03/30}{KOMA-Script variants of `parskip' and `parindent' re-added, since they
+%                             still collide with the actual version of subfig (Sigh!)}
+%
+%    \begin{macrocode}
+\@ifundefined{scr@caption}{}{%
+%    \end{macrocode}
+%
+% There is an option clash between the \KOMAScript\ document classes
+% and the \package{caption} kernel,
+% both define the options |parindent| and |parskip| but with different meaning.
+% Furthermore the ones defined by the \package{caption} kernel take a
+% value as parameter but the \KOMAScript\ ones do not.
+% So we need special versions of the options |parindent| and |parskip| here,
+% ones who determine if a value is given (and therefore should be treated as
+% our option) or not (and therefore should be ignored by us).
+%
+%    \begin{macrocode}
+  \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}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+  \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}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+}
+%    \end{macrocode}
+%
 % \subsubsection*{Styles}
 %
 % \begin{macro}{\DeclareCaptionStyle}
@@ -3233,9 +3281,10 @@
 %
 % \begin{macro}{\captionbox}
 % \changes{v3.0k}{2006/05/13}{We define \cs{captionbox} instead of \cs{caption@start/endbox}}
+% \changes{v3.0n}{2006/03/09}{Bugfix 07-03-09: \cs{captionbox} changed from \cs{parbox-t} to \cs{parbox-b}}
 %  This macro defines the box which surrounds the caption paragraph.
 %    \begin{macrocode}
-\newcommand\captionbox{\parbox[t]}
+\newcommand\captionbox{\parbox[b]}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3361,7 +3410,7 @@
 %
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \subsubsection*{Loading the caption kernel}
@@ -3865,7 +3914,7 @@
 %
 %    \begin{macrocode}
 \@ifundefined{scr@caption}{}{%
-  \caption@Info{KOMA-Script class detected}%
+  \caption@Info{KOMA-Script class detected}
 %    \end{macrocode}
 %
 % \begin{macro}{\onelinecaptionsfalse}
@@ -3885,18 +3934,20 @@
 % \begin{macro}{\captionabove}
 % \begin{macro}{\captionbelow}
 % \changes{v3.0j}{2006/03/21}{Bugfix 06-03-21: \cs{let}\cs{caption@setposition}\cs{@gobble} added}
+% \changes{v3.0n}{2006/03/09}{Accidentally this got broken in \version{3.0m}, fixed}
 %  Original code:
 %  \begin{verbatim}
 %  \newcommand{\captionabove}{\@captionabovetrue\scr@caption}
 %  \newcommand{\captionbelow}{\@captionabovefalse\scr@caption}
 %  \end{verbatim}
 %    \begin{macrocode}
+  \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}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -4563,7 +4614,6 @@
 %      \endgraf\vskip\baselineskip}%
 %    \hss}}}
 %  \end{verbatim}
-%
 %    \begin{macrocode}
   \def\LT@makecaption#1#2#3{%
     \caption@LT@make{%
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@
diff --git a/Master/texmf-dist/tpm/caption.tpm b/Master/texmf-dist/tpm/caption.tpm
index 2ae80b26937..95635463c57 100644
--- a/Master/texmf-dist/tpm/caption.tpm
+++ b/Master/texmf-dist/tpm/caption.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/caption.zip">
     <TPM:Name>caption</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2007/03/07 18:06:47</TPM:Date>
+    <TPM:Date>2007/04/02 18:51:59</TPM:Date>
     <TPM:Version>3.0f</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -17,23 +17,23 @@ captions, as well as backward compatibility.
 [description copied from TeX Catalogue]
     </TPM:Description>
     <TPM:Author>Harald Axel Sommerfeldt</TPM:Author>
-    <TPM:Size>1030108</TPM:Size>
+    <TPM:Size>1023530</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="53984">
+    <TPM:RunFiles size="54573">
 texmf-dist/tex/latex/caption/caption.sty
 texmf-dist/tex/latex/caption/caption2.sty
 texmf-dist/tex/latex/caption/caption3.sty
 texmf-dist/tpm/caption.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="744290">
+    <TPM:DocFiles size="745070">
 texmf-dist/doc/latex/caption/anleitung.pdf
 texmf-dist/doc/latex/caption/anleitung.tex
 texmf-dist/doc/latex/caption/caption.pdf
 texmf-dist/doc/latex/caption/caption2.pdf
 texmf-dist/doc/latex/caption/manual.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="225256">
+    <TPM:SourceFiles size="227408">
 texmf-dist/source/latex/caption/caption.dtx
 texmf-dist/source/latex/caption/caption.ins
 texmf-dist/source/latex/caption/caption2.dtx