diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption2.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption2.sty | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty index 0fd4bd37639..bedf31d09ed 100644 --- a/Master/texmf-dist/tex/latex/caption/caption2.sty +++ b/Master/texmf-dist/tex/latex/caption/caption2.sty @@ -27,13 +27,12 @@ %% caption.sty, caption2.sty, caption3.sty, and manual.tex. %% \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 ***} \RequirePackage{caption3}[2007/03/04] % needs v3.0m or newer -\def\caption@package{caption2} \@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 }{} \newcommand*\captionlabeldelim{} @@ -379,30 +378,30 @@ \ifx\subcapfont\undefined \PackageInfo{caption2}{subfigure package v2.0 detected} \let\subcapfont\@empty - \newcommand\subfigcapwidth{\z@} - \newcommand\setsubcapmargin{% + \newcommand*\subfigcapwidth{\z@} + \newcommand*\setsubcapmargin{% \subfigcapwidthfalse \renewcommand*\subfigcapmargin} - \newcommand\setsubcapwidth{% + \newcommand*\setsubcapwidth{% \subfigcapwidthtrue \renewcommand*\subfigcapwidth} - \newcommand\subcaplabelsep{\space} + \newcommand*\subcaplabelsep{\space} \let\caption@subfig@hss\hfil \else \PackageInfo{caption2}{subfigure package v2.1 (or newer) detected} \newdimen\subfigcapwidth - \newcommand\setsubcapmargin{% + \newcommand*\setsubcapmargin{% \subfigcapwidthfalse \setlength\subfigcapmargin} - \newcommand\setsubcapwidth{% + \newcommand*\setsubcapwidth{% \subfigcapwidthtrue \setlength\subfigcapwidth} - \newcommand\subcaplabelsep{\hskip\subfiglabelskip} + \newcommand*\subcaplabelsep{\hskip\subfiglabelskip} \let\caption@subfig@hss\hss \fi \newif\ifsubfigcapwidth \newdimen\subcapindent - \newcommand\subcaplabeldelim{} + \newcommand*\subcaplabeldelim{} \newcommand*\subcapstyle[1]{% \expandafter\ifx\csname caption@@#1\endcsname\relax \PackageError{caption2}{Undefined caption style `#1'}{\caption@eh}% |