diff options
Diffstat (limited to 'macros/latex/contrib/caption/caption2.dtx')
-rw-r--r-- | macros/latex/contrib/caption/caption2.dtx | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/macros/latex/contrib/caption/caption2.dtx b/macros/latex/contrib/caption/caption2.dtx index 345fff610c..2b6f3c73c2 100644 --- a/macros/latex/contrib/caption/caption2.dtx +++ b/macros/latex/contrib/caption/caption2.dtx @@ -2,7 +2,7 @@ % % This is file `caption2.dtx'. % -% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -18,14 +18,17 @@ % % This Current Maintainer of this work is Axel Sommerfeldt. % -% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -% the derived files caption.sty, caption2.sty, caption3.sty, -% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +% This work consists of the files +% caption.ins, caption.dtx, caption2.dtx, caption3.dtx, +% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx, +% the derived files +% caption.sty, caption2.sty, caption3.sty, +% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty, +% and the user manuals +% caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{853} +% \CheckSum{868} % % \iffalse %<*driver> @@ -204,7 +207,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption2}[2015/09/15 v2.2d Customising captions (AR)] +\ProvidesPackage{caption2}[2020/01/02 v2.2e Customising captions (AR)] % \end{macrocode} % % \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying} @@ -223,7 +226,16 @@ % \subsection{Loading the caption3 kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2007/09/01] % needs v3.1 or newer +\RequirePackage{caption3}[2019/12/31] % should be used with v1.8f or newer +% \end{macrocode} +% We undefine user commands offered by \package{caption} but not by \package{caption2} +% since they should not be used together with \package{caption2}. +% \begin{macrocode} +\let\captionsetup\@undefined +\let\clearcaptionsetup\@undefined +\let\showcaptionsetup\@undefined +\let\DeclareCaptionType\@undefined +\let\DeclareCaptionSubType\@undefined % \end{macrocode} % % \subsection{Check against the regular caption package} @@ -694,7 +706,7 @@ % \begin{macro}{debug} % This option will put additional debug information in the log file. % \begin{macrocode} -\DeclareOption{debug}{\captionsetup{debug}} +\DeclareOption{debug}{\caption@setup{debug}} % \end{macrocode} % \end{macro} % |