caption 3.0m (5mar07)

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

6 files changed, 165 insertions, 136 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/anleitung.pdf b/Master/texmf-dist/doc/latex/caption/anleitung.pdf
index 9bcd020ebfa..f1b4195ee93 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/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf
index bb301107457..73d5ff7844e 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 830ee5ea1b7..8d0a013f980 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{2055}
+% \CheckSum{2058}
 %
 % \iffalse
 %<*driver>
@@ -91,7 +91,7 @@
 % \let\package\puresf\def\thispackage{\package{caption}}
 % \let\env\purett \let\opt\purett
 %
-% \newcommand*\version[1]{$v#1$}
+% \newcommand*\version[2][]{$v#2$}
 % 
 % \newenvironment{Options}[1]%
 %   {\list{}{\renewcommand{\makelabel}[1]{\texttt{##1}\hfil}%
@@ -1997,8 +1997,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2007/02/18 v3.0l caption3 kernel (AR)]
-%<+debug>\PackageWarning{caption3}{DEBUG VERSION}
+\ProvidesPackage{caption3}[2007/03/04 v3.0m caption3 kernel (AR)]
 %    \end{macrocode}
 %
 % \subsubsection*{Generic helpers}
@@ -2214,6 +2213,7 @@
   \advance\caption@keydepth\@ne
 %
   \def\caption@package{#1}%
+  \caption@Debug{\protect\setkeys{#2}{#3}}%
   \setkeys{#2}{#3}%
   \def\caption@package{caption}%
 %
@@ -2982,8 +2982,8 @@
 %    \begin{macrocode}
 \newcommand\caption@autoposition{%
   \ifvmode
-%<+debug>    \edef\caption@tempa{\the\prevdepth}%
-%<+debug>    \PackageInfo{caption}{\protect\prevdepth=\caption@tempa}%
+    \edef\caption@tempa{\the\prevdepth}%
+    \caption@Debug{\protect\prevdepth=\caption@tempa}%
 %   \caption@setposition{\ifdim\prevdepth>-\p@ b\else t\fi}%
     \ifdim\prevdepth>-\p@
       \let\caption@position\@secondoftwo
@@ -2991,7 +2991,7 @@
       \let\caption@position\@firstoftwo
     \fi
   \else
-%<+debug>    \PackageInfo{caption}{no \protect\prevdepth}%
+    \caption@Debug{no \protect\prevdepth}%
 %   \caption@setposition{b}%
     \let\caption@position\@secondoftwo
   \fi}
@@ -3024,12 +3024,18 @@
 \DeclareCaptionOption{strut}{\caption@setbool{strut}{#1}}
 %    \end{macrocode}
 %
-% \subsubsection*{Debug options}
-% {\small Please note that these options are usually not available.}
+% \subsubsection*{Debug option}
+% \changes{v3.1}{2007/03/04}{Debug option added to kernel}
 %
 %    \begin{macrocode}
-%<+debug>\DeclareCaptionOption{showposition}{\caption@setbool{showpos}{#1}}
-%<+debug>\captionsetup{showposition=0}
+\DeclareCaptionOption{debug}[1]{%
+  \caption@setbool{debug}{#1}%
+  \caption@ifbool{debug}{%
+    \def\caption@Debug{\PackageInfo{caption3}}%
+  }{%
+    \let\caption@Debug\@gobble
+  }}
+\setkeys{caption}{debug=0}
 %    \end{macrocode}
 %
 % \subsubsection*{Initialization of parameters}
@@ -3174,11 +3180,11 @@
   \fi
 %    \end{macrocode}
 %    \begin{macrocode}
-%<+debug>  \PackageInfo{caption}{%
-%<+debug>    \protect\hsize=\the\hsize,
-%<+debug>    \protect\margin=\the\captionmargin,
-%<+debug>    \protect\marginx=\the\captionmarginx,
-%<+debug>    \protect\width=\the\captionwidth}%
+  \caption@Debug{%
+    \protect\hsize=\the\hsize,
+    \protect\margin=\the\captionmargin,
+    \protect\marginx=\the\captionmarginx,
+    \protect\width=\the\captionwidth}%
 %    \end{macrocode}
 %    \begin{macrocode}
 }
@@ -3257,10 +3263,7 @@
   \fi
 %    \end{macrocode}
 %
-% If the text is empty, we use no caption label separator, too.\par
-% \emph{Note:} Unfortunately this only works under certain circumstances.
-% Therefore an additional check inside |\@caption| will be introduced
-% in the upcoming version \version{3.1} of the caption package.
+% If the text is empty, we use no caption label separator, too.
 %
 %    \begin{macrocode}
   \caption@ifempty{#2}{%
@@ -3335,7 +3338,7 @@
 \AtBeginDocument{%
   \def\@tempa{\@ifstar\sf@@subref\sf@subref}%
   \ifx\subref\@tempa
-    \PackageInfo{caption}{subref 1.2 or 1.3 detected}%
+    \PackageInfo{caption3}{subref 1.2 or 1.3 detected}%
     \DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}%
   \fi
 }
@@ -3358,8 +3361,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2007/02/20 v3.0l Customising captions (AR)]
-%<+debug>\PackageWarning{caption}{DEBUG VERSION}
+\ProvidesPackage{caption}[2007/03/04 v3.0m Customising captions (AR)]
 %    \end{macrocode}
 %
 % \subsubsection*{Loading the caption kernel}
@@ -3447,12 +3449,10 @@
 % \changes{v3.0h}{2005/08/22}{\KOMAScript\ compatibility options added}
 %
 %    \begin{macrocode}
-\@ifundefined{scr@caption}{}{%
-  \DeclareCaptionOption*{onelinecaption}[]{\caption@setbool{slc}{1}}
-  \DeclareCaptionOption*{noonelinecaption}[]{\caption@setbool{slc}{0}}
-  \DeclareCaptionOption*{tablecaptionabove}[]{\captionsetup[table]{position=t}}
-  \DeclareCaptionOption*{tablecaptionbelow}[]{\captionsetup[table]{position=b}}
-}
+\DeclareCaptionOption*{onelinecaption}[]{\caption@setbool{slc}{1}}
+\DeclareCaptionOption*{noonelinecaption}[]{\caption@setbool{slc}{0}}
+\DeclareCaptionOption*{tablecaptionabove}[]{\captionsetup[table]{position=t}}
+\DeclareCaptionOption*{tablecaptionbelow}[]{\captionsetup[table]{position=b}}
 %    \end{macrocode}
 %
 % \subsubsection*{Generic package support}
@@ -3481,12 +3481,12 @@
 \newcommand\caption@ifpackage[3]{%
 %    \end{macrocode}
 %    \begin{macrocode}
-%<+debug>  \edef\caption@tempa{%
-%<+debug>    \caption@ifbool{pkt@#1}%
-%<+debug>      {\@ifundefined{#2}{AtBeginDocument}{firstofone}}%
-%<+debug>      {gobble}}%
-%<+debug>  \PackageInfo{caption}{#1 = \caption@ifbool{pkt@#1}{1}{0} %
-%<+debug>       (\@ifundefined{#2}{not }{}loaded -> \caption@tempa)}%
+  \edef\caption@tempa{%
+    \caption@ifbool{pkt@#1}%
+      {\@ifundefined{#2}{AtBeginDocument}{firstofone}}%
+      {gobble}}%
+  \caption@Info{#1=\caption@ifbool{pkt@#1}{1}{0} %
+       (\@ifundefined{#2}{not }{}loaded->\caption@tempa)}%
 %    \end{macrocode}
 %    \begin{macrocode}
   \caption@ifbool{pkt@#1}{%
@@ -3534,6 +3534,20 @@
 \caption@declarepackage{supertabular}
 %    \end{macrocode}
 %
+% \subsubsection*{Processing of options}
+%
+% \changes{v3.0m}{2007/03/04}{Verbose option added to package}
+%    \begin{macrocode}
+\DeclareCaptionOption{verbose}[1]{%
+  \caption@setbool{verbose}{#1}%
+  \caption@ifbool{verbose}{%
+    \def\caption@Info{\PackageInfo{caption}}%
+  }{%
+    \let\caption@Info\@gobble
+  }}
+\setkeys{caption}{verbose=0}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \caption@ProcessOptions{caption}
 %    \end{macrocode}
@@ -3610,16 +3624,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\DeclareCaptionEnvironment}
-% \changes{v3.0k}{2007/01/07}{This macro added}
-%  |\DeclareCaptionEnvironment|\oarg{extra code}\marg{environment}
-%    \begin{macrocode}
-\newcommand*\DeclareCaptionEnvironment[2][]{%
-  \AtBeginEnvironment{#2}{\caption@letfloattype{#2}{#1}}}
-\@onlypreamble\DeclareCaptionEnvironment
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsubsection*{Internal helpers}
 %
 % \begin{macro}{\caption@begin}
@@ -3821,7 +3825,7 @@
 % We define |\caption@caption| here so it's there but does not make any harm.
 %
 %    \begin{macrocode}
-    \PackageInfo{caption}{captcont package v2.0 detected}%
+    \caption@Info{captcont package v2.0 detected}%
     \def\caption@caption#1{#1}%
   }%
 }
@@ -3848,16 +3852,7 @@
 %    \begin{macrocode}
 \renewcommand\@makecaption[2]{%
   \caption@iftop{\vskip\belowcaptionskip}{\vskip\abovecaptionskip}%
-%    \end{macrocode}
-%    \begin{macrocode}
-%<+debug>  \caption@ifbool{showpos}{%
-%<+debug>    \llap{$\caption@iftop\downarrow\uparrow$ }}{}%
-%    \end{macrocode}
-%    \begin{macrocode}
   \caption@@make{#1}{#2}%
-%    \end{macrocode}
-%
-%    \begin{macrocode}
   \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}}
 %    \end{macrocode}
 % \end{macro}
@@ -3870,22 +3865,19 @@
 %
 %    \begin{macrocode}
 \@ifundefined{scr@caption}{}{%
-  \PackageInfo{caption}{KOMA-Script class detected}%
+  \caption@Info{KOMA-Script class detected}%
 %    \end{macrocode}
 %
-% \begin{macro}{\scr@caption}
-%  We update the definition of |\scr@caption| so it actually reflects
-%  our definition of |\caption|.
-%    \begin{macrocode}
-  \AtBeginDocument{\let\scr@caption\caption}
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\onelinecaptionsfalse}
 % \begin{macro}{\onelinecaptionstrue}
 %    \begin{macrocode}
   \def\onelinecaptionstrue{\caption@setbool{slc}{1}}
   \def\onelinecaptionsfalse{\caption@setbool{slc}{0}}
+  \ifonelinecaptions
+    \onelinecaptionstrue
+  \else
+    \onelinecaptionsfalse
+  \fi
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3901,10 +3893,10 @@
 %    \begin{macrocode}
   \def\captionabove{%
     \caption@setposition{t}\let\caption@setposition\@gobble
-    \scr@caption}
+    \caption}
   \def\captionbelow{%
     \caption@setposition{b}\let\caption@setposition\@gobble
-    \scr@caption}
+    \caption}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3959,7 +3951,7 @@
 %
 %    \begin{macrocode}
 \AtBeginDocument{\@ifundefined{f@ffrench}{}{%
-  \PackageInfo{caption}{french(le) package detected}%
+  \caption@Info{french(le) package detected}%
 %    \end{macrocode}
 %
 % If |\GOfrench| is defined as |\relax| all the re-definitions regarding
@@ -3983,7 +3975,7 @@
 %
 % \begin{macro}{\@tablescaption}
 %  The \package{french(le)} package sets |\caption| to |\@tablescaption| at
-%  |\begin{table}| for special a treatment of footnotes.
+%  |\begin{table}| for special treatment of footnotes.
 %  Therefore we have to patch |\@tablescaption| so |\caption*| will work
 %  inside the |table| environment.
 %    \begin{macrocode}
@@ -4070,7 +4062,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{float}{@float@setevery}{%
-  \PackageInfo{caption}{float package v1.3 (or newer) detected}%
+  \caption@Info{float package v1.3 (or newer) detected}%
 %    \end{macrocode}
 %
 % Since |\float@caption| puts the float contents into a savebox we need
@@ -4160,7 +4152,6 @@
 %    \begin{macrocode}
   \let\caption@float@setevery\@float@setevery
   \def\@float@setevery#1{%
-    \caption@float@setevery{#1}%
 %    \end{macrocode}
 %
 %  \LaTeX{} and most packages use |\|\meta{type}|name|
@@ -4202,10 +4193,10 @@
     \ifx\caption@tempa\float@caption
     \else\ifx\caption@tempa\@caption
     \else\ifx\caption@tempa\caption@@float
-%<+debug>      \PackageInfo{caption}{\protect\@float@c@#1\space := \protect\float@caption}%
+      \caption@Info{\protect\@float@c@#1\space := \protect\float@caption}%
       \expandafter\let\csname @float@c@#1\endcsname\float@caption
     \else
-%<+debug>      \PackageInfo{caption}{\protect\@float@c@#1\space := \protect\@caption}%
+      \caption@Info{\protect\@float@c@#1\space := \protect\@caption}%
       \expandafter\let\csname @float@c@#1\endcsname\@caption
     \fi\fi\fi
 %    \end{macrocode}
@@ -4259,7 +4250,11 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-    \fi}%
+    \fi
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+    \caption@float@setevery{#1}}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4308,13 +4303,13 @@
 % \subsubsection*{\package{floatrow} package support}
 % \changes{v3.0f}{2005/06/01}{Support of the \package{floatrow} package added}
 %
-% The \package{floatrow} package is adapted for usage with the
-% \package{caption} package. So the main work has already been done,
-% there are only two little things we have to take care about:
+% The \package{floatrow} package is already adapted for usage with the
+% \package{caption} package. So the main work has already been done by
+% Mrs.Lapko, there are only two little things we have to take care about:
 %
 %    \begin{macrocode}
 \caption@ifpackage{floatrow}{flrow@setlist}{%
-  \PackageInfo{caption}{floatrow package v0.1f (or newer) detected}%
+  \caption@Info{floatrow package v0.1f (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\caption@of}
@@ -4336,6 +4331,8 @@
 %    \begin{macrocode}
   \renewcommand*\caption@floatname[1]{%
     \@nameuse{\@ifundefined{fname@#1}{#1name}{fname@#1}}}%
+  \renewcommand*\caption@setfloatname[1]{%
+    \@namedef{\@ifundefined{fname@#1}{#1name}{fname@#1}}}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4361,7 +4358,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{hyperref}{theHfigure}{%
-  \PackageInfo{caption}{hyperref package v6.74m (or newer) detected}%
+  \caption@Info{hyperref package v6.74m (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\caption@ContinuedFloat}
@@ -4419,14 +4416,14 @@
 %   it locally to avoid duplicated \package{hyperref} labels which could
 %   occur if |\ContinuedFloat| will be used.)}
 %   \item |\capstart| will call |\H@refstepcounter| to increase the float
-%   number. This collides with a following|\ContinuedFloat|, too, so we have
+%   number. This collides with a following |\ContinuedFloat|, too, so we have
 %   to move this call from here to |\caption|. (Since we set
 %   |\Hy@hypertexnamesfalse| we can do this without problems.)
 % \end{enumerate}
 %
 %    \begin{macrocode}
 \caption@ifpackage{hypcap}{hc@caption}{%
-  \PackageInfo{caption}{hypcap package v1.0 (or newer) detected}%
+  \caption@Info{hypcap package v1.0 (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\capstart}
@@ -4507,7 +4504,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{listings}{lst@MakeCaption}{%
-  \PackageInfo{caption}{listings package v1.2 (or newer) detected}%
+  \caption@Info{listings package v1.2 (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\lst@MakeCaption}
@@ -4543,7 +4540,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{longtable}{LT@makecaption}{%
-  \PackageInfo{caption}{longtable package v3.15 (or newer) detected}%
+  \caption@Info{longtable package v3.15 (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\LT@makecaption}
@@ -4646,7 +4643,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{picins}{piccaption}{%
-  \PackageInfo{caption}{picins package v3.0 (or newer) detected}%
+  \caption@Info{picins package v3.0 (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\piccaption}
@@ -4670,7 +4667,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{rotating}{@rotcaption}{%
-  \PackageInfo{caption}{rotating package v2.0 (or newer) detected}%
+  \caption@Info{rotating package v2.0 (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\rotcaption}
@@ -4687,12 +4684,14 @@
 % \changes{v3.0i}{2005/12/07}{New}
 %  Make |\rotcaptionof(*)| work.
 %    \begin{macrocode}
-  \def\rotcaptionof{\@ifstar{\caption@of{\rotcaption*}}{\caption@of\rotcaption}}%
+  \def\rotcaptionof{%
+    \@ifstar{\caption@of{\rotcaption*}}{\caption@of\rotcaption}}%
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\@makerotcaption}
 % \changes{v3.0i}{2005/12/06}{Rewritten, should finally work proper now}
+% \changes{v3.0m}{2007/03/04}{Uses \cs{captionbox} instead of \cs{caption@start/endbox} now}
 %  Original (bugfixed) code:
 %  \begin{verbatim}
 %  \long\def\@makerotcaption#1#2{%
@@ -4721,11 +4720,9 @@
         \let\caption@makerot\caption@@make
         \setcaptionmargin\z@
 %       \setlength\captionindent\z@
-%       \def\caption@startbox##1{\hbox\bgroup\hsize=.8\textheight}%
-%       \def\caption@endbox{\egroup}%
+%       \long\def\captionbox##1##2{\hbox{\hsize=.8\textheight\relax##2}}%
 %         (not needed because \rotatebox uses an \hbox anyway)
-        \let\caption@startbox\@gobble
-        \let\caption@endbox\relax}%
+        \let\captionbox\@secondoftwo}%
       \caption@setbool{slc}{0}% been there, done that
     \fi
 %    \end{macrocode}
@@ -4749,7 +4746,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{sidecap}{endSC@FLOAT}{%
-  \PackageInfo{caption}{sidecap package v1.4d (or newer) detected}%
+  \caption@Info{sidecap package v1.4d (or newer) detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\SC@caption}
@@ -4794,9 +4791,9 @@
 %
 %  Make |\caption*| work.
 %    \begin{macrocode}
-    \let\caption@old\caption
-%   \def\caption{\renewcommand\captionsetup[1]{}\caption@caption\caption@old}%
-    \def\caption{\caption@caption\caption@old}%
+    \let\caption@SC\caption
+%   \def\caption{\renewcommand\captionsetup[1]{}\caption@caption\caption@SC}%
+    \def\caption{\caption@caption\caption@SC}%
   }%
 %    \end{macrocode}
 % \end{macro}
@@ -4897,7 +4894,7 @@
 %
 %    \begin{macrocode}
 \caption@ifpackage{supertabular}{ST@caption}{%
-  \PackageInfo{caption}{supertabular package detected}%
+  \caption@Info{supertabular package detected}%
 %    \end{macrocode}
 %
 % \begin{macro}{\tablecaption}
@@ -4926,7 +4923,6 @@
 %    \endgroup}
 %  \end{verbatim}
 %    \begin{macrocode}
-  \let\caption@ST\ST@caption
   \long\def\ST@caption#1[#2]#3{\par%
     \caption@letfloattype{supertabular}{}%
     \let\caption@fixposition\caption@setSTposition
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 5f799c915ba..6d07328ebaa 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/02/20 v3.0l Customising captions (AR)]
+\ProvidesPackage{caption}[2007/03/04 v3.0m Customising captions (AR)]
 \RequirePackage{caption3}[2007/01/31] % needs v3.0l or newer
 \DeclareCaptionOption{config}[caption]{%
    \InputIfFileExists{#1.cfg}{\typeout{*** Local configuration file
@@ -66,17 +66,21 @@
 \DeclareCaptionOption*{flushright}[]{\caption@setjustification{raggedleft}}
 \DeclareCaptionOption*{oneline}[]{\caption@setbool{slc}{1}}
 \DeclareCaptionOption*{ignoreLTcapwidth}[]{}
-\@ifundefined{scr@caption}{}{%
-  \DeclareCaptionOption*{onelinecaption}[]{\caption@setbool{slc}{1}}
-  \DeclareCaptionOption*{noonelinecaption}[]{\caption@setbool{slc}{0}}
-  \DeclareCaptionOption*{tablecaptionabove}[]{\captionsetup[table]{position=t}}
-  \DeclareCaptionOption*{tablecaptionbelow}[]{\captionsetup[table]{position=b}}
-}
+\DeclareCaptionOption*{onelinecaption}[]{\caption@setbool{slc}{1}}
+\DeclareCaptionOption*{noonelinecaption}[]{\caption@setbool{slc}{0}}
+\DeclareCaptionOption*{tablecaptionabove}[]{\captionsetup[table]{position=t}}
+\DeclareCaptionOption*{tablecaptionbelow}[]{\captionsetup[table]{position=b}}
 \newcommand*\caption@declarepackage[1]{%
   \caption@setbool{pkt@#1}{1}%
   \DeclareCaptionOption*{#1}{\caption@setbool{pkt@#1}{##1}}}
 \AtEndOfPackage{\let\caption@declarepackage\@undefined}
 \newcommand\caption@ifpackage[3]{%
+  \edef\caption@tempa{%
+    \caption@ifbool{pkt@#1}%
+      {\@ifundefined{#2}{AtBeginDocument}{firstofone}}%
+      {gobble}}%
+  \caption@Info{#1=\caption@ifbool{pkt@#1}{1}{0} %
+       (\@ifundefined{#2}{not }{}loaded->\caption@tempa)}%
   \caption@ifbool{pkt@#1}{%
     \@ifundefined{#2}%
       {\let\caption@tempa\AtBeginDocument}%
@@ -98,6 +102,14 @@
 \caption@declarepackage{rotating}
 \caption@declarepackage{sidecap}
 \caption@declarepackage{supertabular}
+\DeclareCaptionOption{verbose}[1]{%
+  \caption@setbool{verbose}{#1}%
+  \caption@ifbool{verbose}{%
+    \def\caption@Info{\PackageInfo{caption}}%
+  }{%
+    \let\caption@Info\@gobble
+  }}
+\setkeys{caption}{verbose=0}
 \caption@ProcessOptions{caption}
 \caption@ifbool{pkt@caption}{}{\endinput}
 \caption@undefbool{pkt@caption}
@@ -120,9 +132,6 @@
 \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
@@ -165,7 +174,7 @@
         \caption@@old{#1}[{#2}]{#3}%
       \caption@end}%
   }{}}{%
-    \PackageInfo{caption}{captcont package v2.0 detected}%
+    \caption@Info{captcont package v2.0 detected}%
     \def\caption@caption#1{#1}%
   }%
 }
@@ -174,19 +183,23 @@
   \caption@@make{#1}{#2}%
   \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}}
 \@ifundefined{scr@caption}{}{%
-  \PackageInfo{caption}{KOMA-Script class detected}%
-  \AtBeginDocument{\let\scr@caption\caption}
+  \caption@Info{KOMA-Script class detected}%
   \def\onelinecaptionstrue{\caption@setbool{slc}{1}}
   \def\onelinecaptionsfalse{\caption@setbool{slc}{0}}
+  \ifonelinecaptions
+    \onelinecaptionstrue
+  \else
+    \onelinecaptionsfalse
+  \fi
   \def\captionabove{%
     \caption@setposition{t}\let\caption@setposition\@gobble
-    \scr@caption}
+    \caption}
   \def\captionbelow{%
     \caption@setposition{b}\let\caption@setposition\@gobble
-    \scr@caption}
+    \caption}
 }
 \AtBeginDocument{\@ifundefined{f@ffrench}{}{%
-  \PackageInfo{caption}{french(le) package detected}%
+  \caption@Info{french(le) package detected}%
   \@ifundefined{GOfrench}%
     {\let\caption@tempa\@firstofone}%
     {\def\caption@tempa{\g@addto@macro\GOfrench}}%
@@ -209,7 +222,7 @@
 \def\caption@setfloatposition{%
   \caption@setposition{\@fs@iftopcapt t\else b\fi}}
 \caption@ifpackage{float}{@float@setevery}{%
-  \PackageInfo{caption}{float package v1.3 (or newer) detected}%
+  \caption@Info{float package v1.3 (or newer) detected}%
   \let\caption@of@float\@gobble
   \renewcommand*\caption@of[2]{%
     \@ifundefined{fst@#2}{}{%
@@ -235,15 +248,16 @@
     \caption@end}%
   \let\caption@float@setevery\@float@setevery
   \def\@float@setevery#1{%
-    \caption@float@setevery{#1}%
     \def\caption@floatname##1{\@nameuse{fname@#1}}%
     \def\caption@setfloatname##1{\@namedef{fname@#1}}%
     \expandafter\let\expandafter\caption@tempa\csname @float@c@#1\endcsname
     \ifx\caption@tempa\float@caption
     \else\ifx\caption@tempa\@caption
     \else\ifx\caption@tempa\caption@@float
+      \caption@Info{\protect\@float@c@#1\space := \protect\float@caption}%
       \expandafter\let\csname @float@c@#1\endcsname\float@caption
     \else
+      \caption@Info{\protect\@float@c@#1\space := \protect\@caption}%
       \expandafter\let\csname @float@c@#1\endcsname\@caption
     \fi\fi\fi
     \expandafter\ifx\csname @float@c@#1\endcsname\float@caption
@@ -253,7 +267,8 @@
       \edef\caption@fst{\noexpand\@gobblefour\caption@fst}%
       \caption@setstyle*\caption@fst
       \caption@settype\caption@fst
-    \fi}%
+    \fi
+    \caption@float@setevery{#1}}%
   \g@addto@macro\fs@plaintop{\def\@fs@mid{\vspace\abovecaptionskip\relax}}%
   \g@addto@macro\fs@boxed{\def\@fs@mid{\kern\abovecaptionskip\relax}}%
 }
@@ -265,14 +280,16 @@
 }
 \caption@undefbool{ruled}
 \caption@ifpackage{floatrow}{flrow@setlist}{%
-  \PackageInfo{caption}{floatrow package v0.1f (or newer) detected}%
+  \caption@Info{floatrow package v0.1f (or newer) detected}%
   \renewcommand*\caption@of[2]{%
     \def\@captype{#2}\flrow@setlist{{#2}}#1}%
   \renewcommand*\caption@floatname[1]{%
     \@nameuse{\@ifundefined{fname@#1}{#1name}{fname@#1}}}%
+  \renewcommand*\caption@setfloatname[1]{%
+    \@namedef{\@ifundefined{fname@#1}{#1name}{fname@#1}}}%
 }
 \caption@ifpackage{hyperref}{theHfigure}{%
-  \PackageInfo{caption}{hyperref package v6.74m (or newer) detected}%
+  \caption@Info{hyperref package v6.74m (or newer) detected}%
   \def\caption@ContinuedFloat#1{%
     \@ifundefined{theH#1}{}{%
       \@ifundefined{CF@#1}{%
@@ -287,7 +304,7 @@
     \@ifundefined{CF@#1}{}{\global\csname CF@#1\endcsname\z@\relax}}%
 }
 \caption@ifpackage{hypcap}{hc@caption}{%
-  \PackageInfo{caption}{hypcap package v1.0 (or newer) detected}%
+  \caption@Info{hypcap package v1.0 (or newer) detected}%
   \let\caption@capstart\capstart
   \def\capstart{%
     \let\hc@org@caption\caption
@@ -312,7 +329,7 @@
     \caption@end}%
 }
 \caption@ifpackage{listings}{lst@MakeCaption}{%
-  \PackageInfo{caption}{listings package v1.2 (or newer) detected}%
+  \caption@Info{listings package v1.2 (or newer) detected}%
   \let\caption@lst@MakeCaption\lst@MakeCaption
   \def\lst@MakeCaption#1{%
     \def\caption@autoposition{\caption@setposition{#1}}%
@@ -321,7 +338,7 @@
     \caption@end}%
 }
 \caption@ifpackage{longtable}{LT@makecaption}{%
-  \PackageInfo{caption}{longtable package v3.15 (or newer) detected}%
+  \caption@Info{longtable package v3.15 (or newer) detected}%
   \def\LT@makecaption#1#2#3{%
     \caption@LT@make{%
       \caption@startrue#1\caption@starfalse
@@ -342,21 +359,21 @@
     \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\hsize{#1}\hss}}}%
 }
 \caption@ifpackage{picins}{piccaption}{%
-  \PackageInfo{caption}{picins package v3.0 (or newer) detected}%
+  \caption@Info{picins package v3.0 (or newer) detected}%
   \def\piccaption{\@dblarg\@piccaption}
 }
 \caption@ifpackage{rotating}{@rotcaption}{%
-  \PackageInfo{caption}{rotating package v2.0 (or newer) detected}%
+  \caption@Info{rotating package v2.0 (or newer) detected}%
   \def\rotcaption{\let\@makecaption\@makerotcaption\caption}%
-  \def\rotcaptionof{\@ifstar{\caption@of{\rotcaption*}}{\caption@of\rotcaption}}%
+  \def\rotcaptionof{%
+    \@ifstar{\caption@of{\rotcaption*}}{\caption@of\rotcaption}}%
   \long\def\@makerotcaption#1#2{%
     \ifdim\captionwidth=\z@
       \setcaptionwidth{.8\textheight}%
       \caption@slc{#1}{#2}{.8\vsize}{%
         \let\caption@makerot\caption@@make
         \setcaptionmargin\z@
-        \let\caption@startbox\@gobble
-        \let\caption@endbox\relax}%
+        \let\captionbox\@secondoftwo}%
       \caption@setbool{slc}{0}% been there, done that
     \fi
     \rotatebox{90}{\caption@makerot{#1}{#2}}%
@@ -365,7 +382,7 @@
     \begin{minipage}\captionwidth\caption@@make{#1}{#2}\end{minipage}}%
 }
 \caption@ifpackage{sidecap}{endSC@FLOAT}{%
-  \PackageInfo{caption}{sidecap package v1.4d (or newer) detected}%
+  \caption@Info{sidecap package v1.4d (or newer) detected}%
   \@ifundefined{caption@caption}%
     {\let\caption@tempa\AtBeginDocument}%
     {\let\caption@tempa\@firstofone}%
@@ -375,8 +392,8 @@
     \caption@SC@zfloat{#1}{#2}{#3}[#4]%
     \global\let\SC@CAPsetup\@empty
     \def\captionsetup##1{\g@addto@macro\SC@CAPsetup{,##1}}%
-    \let\caption@old\caption
-    \def\caption{\caption@caption\caption@old}%
+    \let\caption@SC\caption
+    \def\caption{\caption@caption\caption@SC}%
   }%
   \let\caption@endSC@FLOAT\endSC@FLOAT
   \def\endSC@FLOAT{%
@@ -401,10 +418,9 @@
 \def\caption@setSTposition{%
   \caption@setposition{\if@topcaption t\else b\fi}}
 \caption@ifpackage{supertabular}{ST@caption}{%
-  \PackageInfo{caption}{supertabular package detected}%
+  \caption@Info{supertabular package detected}%
   \let\caption@tablecaption\tablecaption
   \def\tablecaption{\caption@caption\caption@tablecaption}%
-  \let\caption@ST\ST@caption
   \long\def\ST@caption#1[#2]#3{\par%
     \caption@letfloattype{supertabular}{}%
     \let\caption@fixposition\caption@setSTposition
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 60649de1fa3..137a193128d 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/02/18 v3.0l caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2007/03/04 v3.0m caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand{\l@addto@macro}[2]{%
@@ -111,6 +111,7 @@
   \fi
   \advance\caption@keydepth\@ne
   \def\caption@package{#1}%
+  \caption@Debug{\protect\setkeys{#2}{#3}}%
   \setkeys{#2}{#3}%
   \def\caption@package{caption}%
   \advance\caption@keydepth\m@ne
@@ -382,12 +383,15 @@
   \fi}
 \newcommand\caption@autoposition{%
   \ifvmode
+    \edef\caption@tempa{\the\prevdepth}%
+    \caption@Debug{\protect\prevdepth=\caption@tempa}%
     \ifdim\prevdepth>-\p@
       \let\caption@position\@secondoftwo
     \else
       \let\caption@position\@firstoftwo
     \fi
   \else
+    \caption@Debug{no \protect\prevdepth}%
     \let\caption@position\@secondoftwo
   \fi}
 \newcommand\caption@beginhook{}
@@ -397,6 +401,14 @@
 \DeclareCaptionOption{listof}{\caption@setbool{lof}{#1}}
 \DeclareCaptionOption{singlelinecheck}{\caption@setbool{slc}{#1}}
 \DeclareCaptionOption{strut}{\caption@setbool{strut}{#1}}
+\DeclareCaptionOption{debug}[1]{%
+  \caption@setbool{debug}{#1}%
+  \caption@ifbool{debug}{%
+    \def\caption@Debug{\PackageInfo{caption3}}%
+  }{%
+    \let\caption@Debug\@gobble
+  }}
+\setkeys{caption}{debug=0}
 \captionsetup{style=default,position=default,listof=1}
 \newif\ifcaption@star
 \newcommand\caption@make[2]{%
@@ -443,6 +455,11 @@
     \divide\captionmargin by 2
     \captionmarginx\z@
   \fi
+  \caption@Debug{%
+    \protect\hsize=\the\hsize,
+    \protect\margin=\the\captionmargin,
+    \protect\marginx=\the\captionmarginx,
+    \protect\width=\the\captionwidth}%
 }
 \newcommand\caption@slc[4]{%
   \caption@startslc
@@ -497,7 +514,7 @@
 \AtBeginDocument{%
   \def\@tempa{\@ifstar\sf@@subref\sf@subref}%
   \ifx\subref\@tempa
-    \PackageInfo{caption}{subref 1.2 or 1.3 detected}%
+    \PackageInfo{caption3}{subref 1.2 or 1.3 detected}%
     \DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}%
   \fi
 }
diff --git a/Master/texmf-dist/tpm/caption.tpm b/Master/texmf-dist/tpm/caption.tpm
index e4fd48301fb..2ae80b26937 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/02/21 23:53:02</TPM:Date>
+    <TPM:Date>2007/03/07 18:06:47</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>1019268</TPM:Size>
+    <TPM:Size>1030108</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="53041">
+    <TPM:RunFiles size="53984">
 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="751069">
+    <TPM:DocFiles size="744290">
 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="225998">
+    <TPM:SourceFiles size="225256">
 texmf-dist/source/latex/caption/caption.dtx
 texmf-dist/source/latex/caption/caption.ins
 texmf-dist/source/latex/caption/caption2.dtx