caption 3.0q (17apr07)

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

2 files changed, 47 insertions, 88 deletions

diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index ad7af11deb6..99e1ed531d4 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{2198}
+% \CheckSum{2194}
 %
 % \iffalse
 %<*driver>
@@ -2000,7 +2000,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2007/04/09 v3.0p caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2007/04/11 v3.0q caption3 kernel (AR)]
 %    \end{macrocode}
 %
 % \subsubsection*{Generic helpers}
@@ -2088,7 +2088,7 @@
   }{\caption@ifinlist{#2}{0,false,no,off}{%
     \expandafter\let\csname caption@if#1\endcsname\@secondoftwo
   }{%
-    \caption@error{Undefined boolean value `#2'}%
+    \caption@Error{Undefined boolean value `#2'}%
   }}}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2125,13 +2125,14 @@
 %
 % \subsubsection*{Errors}
 %
-% \begin{macro}{\caption@error}
+% \begin{macro}{\caption@Error}
 % \changes{v3.0l}{2007/01/20}{This macro added}
+% \changes{v3.0q}{2007/04/11}{Renamed from \cs{caption@error} to \cs{caption@Error}}
 %  This is mainly identical to |\PackageError{caption}{#1}{\caption@eh}|.
 %    \begin{macrocode}
-\newcommand\caption@package{caption}
-\newcommand*\caption@error[1]{%
-  \PackageError\caption@package{#1}\caption@eh}
+\newcommand\caption@Package{caption}
+\newcommand*\caption@Error[1]{%
+  \PackageError\caption@Package{#1}\caption@eh}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2141,7 +2142,7 @@
 %    \begin{macrocode}
 \newcommand\caption@eh{%
   If you do not understand this error, please take a closer look\MessageBreak
-  at the documentation of the `\caption@package' package.\MessageBreak
+  at the documentation of the `\caption@Package' package.\MessageBreak
   \@ehc}
 %    \end{macrocode}
 % \end{macro}
@@ -2214,15 +2215,15 @@
   \ifnum\caption@keydepth=0\relax
     \let\caption@KV@errx\KV@errx
     \let\caption@KV@err\KV@err
-    \let\KV@errx\caption@error
-    \let\KV@err\caption@error
+    \let\KV@errx\caption@Error
+    \let\KV@err\caption@Error
   \fi
   \caption@stepcounter\caption@keydepth
 %
-  \def\caption@package{#1}%
+  \def\caption@Package{#1}%
   \caption@Debug{\protect\setkeys{#2}{#3}}%
   \setkeys{#2}{#3}%
-  \def\caption@package{caption}%
+  \def\caption@Package{caption}%
 %
   \caption@addtocounter\caption@keydepth\m@ne
   \ifnum\caption@keydepth=0\relax
@@ -2568,7 +2569,7 @@
   \@ifstar{\caption@@setstyle\@gobble}{\caption@@setstyle\@firstofone}}
 \newcommand*\caption@@setstyle[2]{%
   \@ifundefined{caption@sty@#2}%
-    {#1{\caption@error{Undefined caption style `#2'}}}%
+    {#1{\caption@Error{Undefined caption style `#2'}}}%
     {\expandafter\let\expandafter\caption@sls\csname caption@sls@#2\endcsname
      \caption@setdefault\caption@esetup{\csname caption@sty@#2\endcsname}}}
 %    \end{macrocode}
@@ -2628,7 +2629,7 @@
 %    \begin{macrocode}
 \newcommand*\caption@setformat[1]{%
   \@ifundefined{caption@fmt@#1}%
-    {\caption@error{Undefined caption format `#1'}}%
+    {\caption@Error{Undefined caption format `#1'}}%
     {\expandafter\let\expandafter\caption@ifh\csname caption@ifh@#1\endcsname
      \expandafter\let\expandafter\caption@fmt\csname caption@fmt@#1\endcsname}}
 %    \end{macrocode}
@@ -2680,7 +2681,7 @@
 %    \begin{macrocode}
 \newcommand*\caption@setlabelformat[1]{%
   \@ifundefined{caption@lfmt@#1}%
-    {\caption@error{Undefined caption label format `#1'}}%
+    {\caption@Error{Undefined caption label format `#1'}}%
     {\expandafter\let\expandafter\caption@lfmt\csname caption@lfmt@#1\endcsname}}
 %    \end{macrocode}
 % \end{macro}
@@ -2730,7 +2731,7 @@
 %    \begin{macrocode}
 \newcommand*\caption@setlabelseparator[1]{%
   \@ifundefined{caption@lsep@#1}%
-    {\caption@error{Undefined caption label separator `#1'}}%
+    {\caption@Error{Undefined caption label separator `#1'}}%
     {\expandafter\let\expandafter\caption@iflf\csname caption@iflf@#1\endcsname
      \expandafter\let\expandafter\caption@lsep\csname caption@lsep@#1\endcsname}}
 %    \end{macrocode}
@@ -2782,7 +2783,7 @@
 %    \begin{macrocode}
 \newcommand*\caption@settextformat[1]{%
   \@ifundefined{caption@tfmt@#1}%
-    {\caption@error{Undefined caption text format `#1'}}%
+    {\caption@Error{Undefined caption text format `#1'}}%
     {\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}}
 %    \end{macrocode}
 % \end{macro}
@@ -2823,7 +2824,7 @@
 %    \begin{macrocode}
 \newcommand*\caption@setjustification[1]{%
   \@ifundefined{caption@hj@#1}%
-    {\caption@error{Undefined caption justification `#1'}}%
+    {\caption@Error{Undefined caption justification `#1'}}%
     {\expandafter\let\expandafter\caption@hj\csname caption@hj@#1\endcsname}}
 %\newcommand\caption@setjustification{\caption@setfont{@hj}}
 %    \end{macrocode}
@@ -2894,6 +2895,8 @@
 %
 % \begin{macro}{\caption@ragged}
 % \changes{v3.0p}{2007/04/07}{The `ragged2e' package will now only been loaded when needed}
+% \changes{v3.0q}{2007/04/11}{Bugfix: Usage of \cs{caption@Info} replaced by \cs{caption@Debug}}
+% \changes{v3.0q}{2007/04/16}{Warnung will be suppressed on first \LaTeX\ run}
 %  |\caption@ragged| will be basically defined as\par
 %  |\AtBeginDocument{\IfFileExists{ragged2e.sty}%|\\
 %  |  {\RequirePackage{ragged2e}\let\caption@ragged\@firstoftwo}%|\\
@@ -2904,7 +2907,7 @@
 %  Furthermore we load the \package{ragged2e} package, if needed and available.
 %    \begin{macrocode}
 \newcommand*\caption@ragged{%
-  \caption@Info{We need ragged2e}%
+  \caption@Debug{We need ragged2e}%
   \protected@write\@auxout{}{\string\caption@newlabel{ragged2e}{}}%
   \global\let\caption@ragged\caption@@ragged
   \caption@@ragged}
@@ -2920,8 +2923,10 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \@ifundefined{caption@ragged2e}{}{%
-    \caption@Info{We load ragged2e}%
+  \@ifundefined{caption@ragged2e}{%
+    \let\caption@@ragged\@secondoftwo % suppress warning above
+  }{%
+    \caption@Debug{We load ragged2e}%
     \IfFileExists{ragged2e.sty}{%
       \RequirePackage{ragged2e}\let\caption@@ragged\@firstoftwo}{}%
   }}
@@ -3080,7 +3085,7 @@
   }{\caption@ifinlist{#1}{a,auto}{%
     \let\caption@position\@undefined
   }{%
-    \caption@error{Undefined caption position `#1'}%
+    \caption@Error{Undefined caption position `#1'}%
   }}}}}
 %    \end{macrocode}
 % \end{macro}
@@ -3519,14 +3524,13 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2007/04/09 v3.0p Customising captions (AR)]
+\ProvidesPackage{caption}[2007/04/16 v3.0q Customising captions (AR)]
 %    \end{macrocode}
 %
 % \subsubsection*{Loading the kernel}
 %
 %    \begin{macrocode}
 \RequirePackage{caption3}[2007/01/31] % needs v3.0l or newer
-\def\caption@package{caption}%
 %    \end{macrocode}
 %
 % \subsection*{Check against the obsolete \package{caption2} package}
@@ -3534,7 +3538,7 @@
 %
 %    \begin{macrocode}
 \@ifpackageloaded{caption2}{%
-  \caption@error{You can't use both the caption *and* caption2 package}%
+  \caption@Error{You can't use both the caption *and* caption2 package}%
   \endinput
 }{}
 %    \end{macrocode}
@@ -4031,10 +4035,12 @@
 % \changes{v3.0h}{2005/08/22}{\cs{PackageInfo} added to \KOMAScript\ support}
 % \changes{v3.0i}{2005/11/17}{\KOMAScript\ compatibility commands added}
 % \changes{v3.0l}{2007/02/18}{\KOMAScript\ compatibility revised}
+% \changes{v3.0q}{2007/04/16}{\KOMAScript\ compatibility revised}
 %
 %    \begin{macrocode}
 \@ifundefined{scr@caption}{}{%
   \caption@Info{KOMA-Script class detected}
+  \AtBeginDocument{\let\scr@caption\caption}
 %    \end{macrocode}
 %
 % \begin{macro}{\onelinecaptionsfalse}
@@ -4042,11 +4048,6 @@
 %    \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}
@@ -4061,7 +4062,6 @@
 %  \newcommand{\captionbelow}{\@captionabovefalse\scr@caption}
 %  \end{verbatim}
 %    \begin{macrocode}
-  \AtBeginDocument{\let\scr@caption\caption}
   \def\captionabove{%
     \caption@setposition{t}\let\caption@setposition\@gobble
     \scr@caption}
@@ -4072,47 +4072,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \iffalse % Not very useful...
-% \begin{macro}{\setcapindent}
-%    \begin{macrocode}
-%  \def\setcapindent{\@ifstar{\@@setcapindent}{\@setcapindent}}
-%  \def\@setcapindent#1{%
-%    \caption@setformat{plain}\setlength\captionindent{#1}}
-%  \def\@@setcapindent#1{%
-%    \caption@error{\string\setcapindent* is not supported yet}}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\setcaphanging}
-%    \begin{macrocode}
-%  \def\setcaphanging{%
-%    \caption@setformat{hang}\setlength\captionindent\@z}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\setcapwidth}
-%    \begin{macrocode}
-%  \renewcommand*\setcapwidth[2][]{%
-%    \PackageWarning{caption}{%
-%      Ignoring optional argument of \string\setcapwidth!\MessageBreak
-%      You're using package caption.\MessageBreak}%
-%    \setcaptionwidth{#2}}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\setcapmargin}
-%    \begin{macrocode}
-%  \renewcommand*\setcapmargin{\@ifstar\@setcapmargin\@@setcapmargin}
-%  \renewcommand*\@setcapmargin[2][\@tempdimb]{%
-%    \setlength\@tempdimb{#2}%
-%    \setlength\@tempdima{#1}%
-%    \setcaptionmargin{\@tempdima,\@tempdimb}}
-%  \renewcommand*\@@setcapmargin[2][\@tempdimb]{%
-%    \caption@error{\string\setcapmargin* is not supported yet}}
-%    \end{macrocode}
-% \end{macro}
-% \fi
-%
 %    \begin{macrocode}
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx
index d2b92bce82f..e25b98a6723 100644
--- a/Master/texmf-dist/source/latex/caption/caption2.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption2.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `caption2.dtx'.
 % 
-% Copyright (C) 1994-2005 Axel Sommerfeldt (caption@sommerfee.de)
+% Copyright (C) 1994-2007 Axel Sommerfeldt (caption@sommerfee.de)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -19,11 +19,11 @@
 % This Current Maintainer of this work is Axel Sommerfeldt.
 % 
 % This work consists of the files caption.ins, caption.dtx,
-% caption2.dtx, caption.xml, and anleitung.tex and the derived files
-% caption.sty, caption2.sty, caption3.sty, and manual.tex.
+% caption2.dtx, manual.tex, and anleitung.tex and the derived
+% files caption.sty, caption2.sty, and caption3.sty.
 % 
 % \fi
-% \CheckSum{837}
+% \CheckSum{836}
 %
 % \iffalse
 %<*driver>
@@ -183,8 +183,8 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2007/04/06 v2.2 Customising captions (AS)]
-\PackageWarning{caption2}{%
+\ProvidesPackage{caption2}[2007/04/11 v2.2a Customising captions (AS)]
+\PackageWarningNoLine{caption2}{%
   *** THIS PACKAGE IS OBSOLETE, PLEASE USE caption ***}
 %    \end{macrocode}
 %
@@ -192,15 +192,15 @@
 %
 %    \begin{macrocode}
 \RequirePackage{caption3}[2007/03/04] % needs v3.0m or newer
-\def\caption@package{caption2}
 %    \end{macrocode}
 %
 % \subsection{Check against the regular \package{caption} package}
 % \changes{v2.2}{2007/04/06}{Check against regular \package{caption} package added}
+% \changes{v2.2a}{2007/04/11}{Bugfix: Usage of \cs{caption@error} replaced by \cs{PackageError}}
 %
 %    \begin{macrocode}
 \@ifpackageloaded{caption}{%
-  \caption@error{You can't use both the caption *and* caption2 package}%
+  \PackageError{caption2}{You can't use both the caption *and* caption2 package}{\caption@eh}%
   \endinput
 }{}
 %    \end{macrocode}
@@ -1145,11 +1145,11 @@
 % Note: \cs{subfigcapmargin} is a command in v2.0 of \textsf{subfigure}.
 % So we make \cs{subfigcapwidth} a command, too.
 %    \begin{macrocode}
-      \newcommand\subfigcapwidth{\z@}
-      \newcommand\setsubcapmargin{%
+      \newcommand*\subfigcapwidth{\z@}
+      \newcommand*\setsubcapmargin{%
         \subfigcapwidthfalse
         \renewcommand*\subfigcapmargin}
-      \newcommand\setsubcapwidth{%
+      \newcommand*\setsubcapwidth{%
         \subfigcapwidthtrue
         \renewcommand*\subfigcapwidth}
 %    \end{macrocode}
@@ -1160,7 +1160,7 @@
 % \begin{macro}{\subcaplabelsep}
 % Analogous to \cs{captionlabelsep} we define \cs{subcaplabelsep}.
 %    \begin{macrocode}
-      \newcommand\subcaplabelsep{\space}
+      \newcommand*\subcaplabelsep{\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1187,10 +1187,10 @@
 % So we make \cs{subfigcapwidth} a length, too.
 %    \begin{macrocode}
       \newdimen\subfigcapwidth
-      \newcommand\setsubcapmargin{%
+      \newcommand*\setsubcapmargin{%
         \subfigcapwidthfalse
         \setlength\subfigcapmargin}
-      \newcommand\setsubcapwidth{%
+      \newcommand*\setsubcapwidth{%
         \subfigcapwidthtrue
         \setlength\subfigcapwidth}
 %    \end{macrocode}
@@ -1201,7 +1201,7 @@
 % \begin{macro}{\subcaplabelsep}
 % Analogous to \cs{captionlabelsep} we define \cs{subcaplabelsep}.
 %    \begin{macrocode}
-      \newcommand\subcaplabelsep{\hskip\subfiglabelskip}
+      \newcommand*\subcaplabelsep{\hskip\subfiglabelskip}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1226,7 +1226,7 @@
 %    \begin{macrocode}
     \newif\ifsubfigcapwidth
     \newdimen\subcapindent
-    \newcommand\subcaplabeldelim{}
+    \newcommand*\subcaplabeldelim{}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}