summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/caption2.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-04-22 17:15:40 +0000
committerKarl Berry <karl@freefriends.org>2007-04-22 17:15:40 +0000
commit5fdc1983dd12ec0b4ec68aad3d0c6ab016207208 (patch)
tree311bff8fcc0120fb4167bf670643f85e65c861b4 /Master/texmf-dist/source/latex/caption/caption2.dtx
parent520623ea11cabc166b0d623ece2e85129da61cbd (diff)
caption 3.0q (17apr07)
git-svn-id: svn://tug.org/texlive/trunk@4173 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption2.dtx')
-rw-r--r--Master/texmf-dist/source/latex/caption/caption2.dtx32
1 files changed, 16 insertions, 16 deletions
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}