diff options
Diffstat (limited to 'macros/latex/contrib/caption/fallback')
9 files changed, 109 insertions, 65 deletions
diff --git a/macros/latex/contrib/caption/fallback/v3.0/caption.dtx b/macros/latex/contrib/caption/fallback/v3.0/caption.dtx index bbdedad42c..e6e4434187 100644 --- a/macros/latex/contrib/caption/fallback/v3.0/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.0/caption.dtx @@ -23,7 +23,7 @@ % caption.sty, caption2.sty, caption3.sty, and manual.tex. % % \fi -% \CheckSum{2178} +% \CheckSum{2179} % % \iffalse %<*driver> @@ -3506,7 +3506,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2007/04/16 v3.0q Customising captions (AR)] +\ProvidesPackage{caption}[2022/07/10 v3.0r Customising captions (AR)] % \end{macrocode} % % \subsubsection*{Loading the kernel} @@ -4893,8 +4893,9 @@ % \begin{macro}{\SC@zfloat} % \changes{v3.0b}{2004/05/16}{Local definition of \cs{captionsetup} added} % \changes{v3.0c}{2004/07/16}{Bugfix 04-07-15: Check for \cs{caption@caption} removed} +% \changes{v3.0r}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good -% opportunity to do some adaptations to |\caption| and |\captionsetup|. +% opportunity to do some adaptations to |\caption| and |\caption|\-|setup|. % \begin{macrocode} \let\caption@SC@zfloat\SC@zfloat \def\SC@zfloat#1#2#3[#4]{% @@ -4907,7 +4908,7 @@ % \end{macrocode} % % Since the sidecap package uses our |\caption| code outside the -% floating environment the regular |\captionsetup| will not work. +% floating environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % \begin{macrocode} @@ -4920,7 +4921,12 @@ \let\caption@SC\caption % \def\caption{\renewcommand\captionsetup[1]{}\caption@caption\caption@SC}% \def\caption{\caption@caption\caption@SC}% - }% +% \end{macrocode} +% +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/caption/fallback/v3.1/caption.dtx b/macros/latex/contrib/caption/fallback/v3.1/caption.dtx index 17322ede2b..533adf3449 100644 --- a/macros/latex/contrib/caption/fallback/v3.1/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.1/caption.dtx @@ -24,7 +24,7 @@ % user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{7218} +% \CheckSum{7219} % % \iffalse %<*driver> @@ -3757,7 +3757,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2010/01/09 v3.1m Customizing captions (AR)] +\ProvidesPackage{caption}[2022/07/10 v3.1n Customizing captions (AR)] %\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}} % \end{macrocode} % @@ -7324,6 +7324,7 @@ % \changes{v3.0b}{2004/05/16}{Local definition of \cs{captionsetup} added} % \changes{v3.0c}{2004/07/16}{Bugfix 04-07-15: Check for \cs{caption@star} removed} % \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now} +% \changes{v3.1n}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good % opportunity to do some adaptations to |\caption| and |\captionsetup|. % \begin{macrocode} @@ -7338,13 +7339,18 @@ \let\caption\caption@ORI % \end{macrocode} % Since the sidecap package uses our |\caption| code outside the -% environment the regular |\captionsetup| will not work. +% environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % Furthermore we need to make |\caption*| work. % \begin{macrocode} \caption@settype*{#2}% - \caption@freeze*}% + \caption@freeze*% +% \end{macrocode} +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/caption/fallback/v3.2/caption.dtx b/macros/latex/contrib/caption/fallback/v3.2/caption.dtx index 0936d97306..e2d7d08ea7 100644 --- a/macros/latex/contrib/caption/fallback/v3.2/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.2/caption.dtx @@ -25,7 +25,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3534} +% \CheckSum{3535} % % \iffalse %<*driver> @@ -220,7 +220,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2011/11/10 v3.2e Customizing captions (AR)] +\ProvidesPackage{caption}[2022/07/10 v3.2f Customizing captions (AR)] %\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}} % \end{macrocode} % @@ -3955,6 +3955,7 @@ % \changes{v3.0c}{2004/07/16}{Bugfix 04-07-15: Check for \cs{caption@star} removed} % \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now} % \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption@freeze} instead of \cs{caption@freeze*} now} +% \changes{v3.2f}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good % opportunity to do some adaptations to |\caption| and |\captionsetup|. % \begin{macrocode} @@ -3968,7 +3969,7 @@ \SC@RestoreCommands % \end{macrocode} % Since the sidecap package uses our |\caption| code outside the -% environment the regular |\captionsetup| will not work. +% environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % Furthermore we need to make |\caption*| work. @@ -3979,7 +3980,12 @@ % The sidecap package uses |\ifx\label\SC@label| to test if it is just inside a % |SC|\-|figure| or not. So we redefine |\SC@label| here so this test will still work. % \begin{macrocode} - \let\SC@label\label}% + \let\SC@label\label +% \end{macrocode} +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \begin{macrocode} \providecommand*\SC@RestoreCommands{% diff --git a/macros/latex/contrib/caption/fallback/v3.3/caption.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption.dtx index 7ab24aeaac..b311022734 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.3/caption.dtx @@ -25,7 +25,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3694} +% \CheckSum{3695} % % \iffalse %<*driver> @@ -220,7 +220,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2019/09/01 v3.3d Customizing captions (AR)] +\ProvidesPackage{caption}[2022/07/10 v3.3e Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} @@ -4411,6 +4411,7 @@ % \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now} % \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption@freeze} instead of \cs{caption@freeze*} now} % \changes{v3.3}{2013/05/01}{Usage of \cs{caption@freeze} replaced by \cs{caption@freezetype}} +% \changes{v3.3e}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good % opportunity to do some adaptations to |\caption| and |\captionsetup|. % \begin{macrocode} @@ -4424,7 +4425,7 @@ \SC@RestoreCommands % \end{macrocode} % Since the sidecap package uses our |\caption| code outside the -% environment the regular |\captionsetup| will not work. +% environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % Furthermore we need to make |\caption*| work. @@ -4434,7 +4435,12 @@ % The sidecap package uses |\ifx\label\SC@label| to test if it is just inside a % |SC|\-|figure| or not. So we redefine |\SC@label| here so this test will still work. % \begin{macrocode} - \let\SC@label\label}% + \let\SC@label\label +% \end{macrocode} +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \begin{macrocode} \providecommand*\SC@RestoreCommands{% diff --git a/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx index 645c190d78..aa26366333 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -25,7 +25,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3961} +% \CheckSum{3960} % % \iffalse %<*driver> @@ -198,7 +198,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2019/09/01 v1.8d caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/03/17 v1.8i caption3 kernel (AR)] % \end{macrocode} % % \subsection{Workaround for bug in package \package{arabtex}} @@ -765,6 +765,7 @@ % \changes{v1.2}{2007/11/16}{Bugfix 07-11-09: `space hack' added} % \changes{v1.2a}{2008/01/12}{\cs{ifcaptionsetup@star} will be set now} % \changes{v1.5}{2012/04/09}{Support of multiple optional arguments added} +% \changes{v1.8i}{2022/03/17}{Usage of \cs{captionsetup} inside \cs{caption@setup@options@@} replaced by \cs{caption@setup@options@}} % |\captionsetup|\oarg{type}\ldots\marg{keyval-list of options}\\ % |\captionsetup*|\oarg{type}\ldots\marg{keyval-list of options}\par % If the optional argument `type' is specified, we simply save or append @@ -782,20 +783,20 @@ \@ifnextchar[\caption@setup@options\caption@setup} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup{\caption@setkeys{caption}} +\newcommand*\caption@setup{% + \caption@setkeys{caption}} % \end{macrocode} % \begin{macrocode} \def\caption@setup@options[#1]{% - \@ifnextchar[% + \@ifnextchar[%] {\caption@stepthecounter - \caption@withoptargs{\@expandtwoargs - \caption@setup@options@i{#1}{@\caption@thecounter}}}% + \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}% {\caption@setup@options@{#1}}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup@options@i[4]{% - \caption@setup@options@{#1}{#2}% - \caption@declare@option{#2}[]{\captionsetup#3{#4}}} +\def\caption@setup@options@@#1#2[#3]#4{% + \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}% + \caption@setup@options@{#1}{#2}} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@setup@options@[2]{% diff --git a/macros/latex/contrib/caption/fallback/v3.4/caption.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption.dtx index 1e3f79d752..baab32006e 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.4/caption.dtx @@ -218,8 +218,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -%\ProvidesPackage{caption}[2020/07/29 v3.4m Customizing captions (AR)] -\ProvidesPackage{caption}[2020/09/28 v3.4n Customizing captions (AR)] % Backport of commit 43567491e5b075d661c080bca298f5428f289758 from 2020/09/28 +\ProvidesPackage{caption}[2022/07/10 v3.4o Customizing captions (AR)] % \end{macrocode} % % \section{Loading the kernel} @@ -3981,6 +3980,7 @@ % \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now} % \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption@freeze} instead of \cs{caption@freeze*} now} % \changes{v3.3}{2013/05/01}{Usage of \cs{caption@freeze} replaced by \cs{caption@freezetype}} +% \changes{v3.4o}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good % opportunity to do some adaptations to |\caption| and |\captionsetup|. % \begin{macrocode} @@ -3994,7 +3994,7 @@ \SC@RestoreCommands % \end{macrocode} % Since the sidecap package uses our |\caption| code outside the -% environment the regular |\captionsetup| will not work. +% environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % Furthermore we need to make |\caption*| work. @@ -4004,7 +4004,12 @@ % The sidecap package uses |\ifx\label\SC@label| to test if it is just inside a % |SC|\-|figure| or not. So we redefine |\SC@label| here so this test will still work. % \begin{macrocode} - \let\SC@label\label}% + \let\SC@label\label +% \end{macrocode} +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \begin{macrocode} \providecommand*\SC@RestoreCommands{% diff --git a/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx index 5bf40979cb..e48179022b 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -28,7 +28,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{3607} +% \CheckSum{3606} % % \iffalse %<*driver> @@ -191,7 +191,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2020/07/29 v1.13 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/04/06 v1.13b caption3 kernel (AR)] % \end{macrocode} % % \section{Workaround for bug in package \package{arabtex}} @@ -728,6 +728,7 @@ % \changes{v1.2a}{2008/01/12}{\cs{ifcaptionsetup@star} will be set now} % \changes{v1.5}{2012/04/09}{Support of multiple optional arguments added} % \changes{v1.8h}{2020/01/03}{Syntax check of saved options added} +% \changes{v1.13a}{2022/03/17}{Usage of \cs{captionsetup} inside \cs{caption@setup@options@@} replaced by \cs{caption@setup@options@}} % |\captionsetup|\oarg{type}\ldots\marg{keyval-list of options}\\ % |\captionsetup*|\oarg{type}\ldots\marg{keyval-list of options}\par % If the optional argument `type' is specified, we simply save or append @@ -746,19 +747,19 @@ \caption@setup@options\caption@setup} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup{\caption@setkeys{caption}} +\newcommand*\caption@setup{% + \caption@setkeys{caption}} % \end{macrocode} % \begin{macrocode} \def\caption@setup@options[#1]{% \@ifnextchar[%] {\caption@stepthecounter - \caption@withoptargs{\@expandtwoargs - \caption@setup@options@i{#1}{@\caption@thecounter}}}% + \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}% {\caption@setup@options@{#1}}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup@options@i[4]{% - \caption@declare@option{#2}[]{\captionsetup#3{#4}}% +\def\caption@setup@options@@#1#2[#3]#4{% + \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}% \caption@setup@options@{#1}{#2}} % \end{macrocode} % \begin{macrocode} @@ -3979,6 +3980,7 @@ % \changes{v1.13}{2020/07/28}{Uses \cs{caption@l@addto@list} instead of \cs{@cons} now} % \changes{v1.13}{2020/07/29}{Usage of \cs{caption@subtype@hook} added} % \changes{v1.13}{2020/07/29}{We don't re-use existing counters anymore (This was a bad idea anyway)} +% \changes{v1.13b}{2022/04/06}{We don't re-use existing counters anymore (Part 2)} % |\DeclareCaptionSubType|\oarg{numbering scheme}\marg{type}\\ % |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\par % The starred variant provides the numbering format @@ -4015,22 +4017,24 @@ \@namedef{ext@#4}{\csname ext@#3\endcsname}% \caption@declaresublistentry{#3}% \caption@l@addto@list\caption@subtypelist{#4}% - \caption@subtype@hook{#4}}% + \caption@subtype@hook{#4}% % \end{macrocode} % Support of \package{titletoc} package % \begin{macrocode} - \caption@ifdefined\contentsuse{% - \contentsuse{#4}{\csname ext@#4\endcsname}}{}% + \caption@ifdefined\contentsuse{% + \contentsuse{#4}{\csname ext@#4\endcsname}}{}% % \end{macrocode} % \begin{macrocode} - \@namedef{#4name}{}% - \@namedef{#4autorefname}{\csname #3autorefname\endcsname}% - #1% is \@firstoftwo in star form, and \@secondoftwo otherwise + \@namedef{#4name}{}% + \@namedef{#4autorefname}{\csname #3autorefname\endcsname}}% +% \end{macrocode} +% \begin{macrocode} + #1% is \@firstoftwo in star form, and \@secondoftwo otherwise {\@namedef{p@#4}{}% \@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}% {\@namedef{p@#4}{\csname the#3\endcsname}% \@namedef{the#4}{\@nameuse{#2}{#4}}}% - \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}} + \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}} % \end{macrocode} % \begin{macrocode} \@onlypreamble\caption@@@declaresubtype diff --git a/macros/latex/contrib/caption/fallback/v3.5/caption.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption.dtx index 463e9052fa..f5d5569ed8 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.5/caption.dtx @@ -32,7 +32,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{2702} +% \CheckSum{2703} % % \iffalse %<*driver> @@ -241,7 +241,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2022/03/01 v3.5h Customizing captions (AR)] +\ProvidesPackage{caption}[2022/07/10 v3.5i Customizing captions (AR)] % \end{macrocode} % % \section{Loading the kernel} @@ -3762,6 +3762,7 @@ % \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now} % \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption@freeze} instead of \cs{caption@freeze*} now} % \changes{v3.3}{2013/05/01}{Usage of \cs{caption@freeze} replaced by \cs{caption@freezetype}} +% \changes{v3.5i}{2022/07/10}{\cs{ignorespaces} appended} % This macro will be called at the start of the environment, here is a good % opportunity to do some adaptations to |\caption| and |\captionsetup|. % \begin{macrocode} @@ -3775,7 +3776,7 @@ \SC@RestoreCommands % \end{macrocode} % Since the sidecap package uses our |\caption| code outside the -% environment the regular |\captionsetup| will not work. +% environment the regular |\caption|\-|setup| will not work. % So we need a special version here which saves the given argument list % which will be executed later on. % Furthermore we need to make |\caption*| work. @@ -3785,7 +3786,12 @@ % The sidecap package uses |\ifx\label\SC@label| to test if it is just inside a % |SC|\-|figure| or not. So we redefine |\SC@label| here so this test will still work. % \begin{macrocode} - \let\SC@label\label}% + \let\SC@label\label +% \end{macrocode} +% Since the original definition of |\SC@zfloat| ends with |\begin{lrbox}| which ends with |\ignore|\-|spaces|, +% we do have to end our re-definition of |\SC@zfloat| with |\ignore|\-|spaces| as well. +% \begin{macrocode} + \ignorespaces}% % \end{macrocode} % \begin{macrocode} \providecommand*\SC@RestoreCommands{% diff --git a/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx index 993af95854..9542d63b79 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -32,7 +32,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{3674} +% \CheckSum{3673} % % \iffalse %<*driver> @@ -242,7 +242,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2020/10/26 v2.2f caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/04/06 v2.2h caption3 kernel (AR)] % \end{macrocode} % % \section{Generic helpers} @@ -810,6 +810,7 @@ % \changes{v1.2a}{2008/01/12}{\cs{ifcaptionsetup@star} will be set now} % \changes{v1.5}{2012/04/09}{Support of multiple optional arguments added} % \changes{v1.8h}{2020/01/03}{Syntax check of saved options added} +% \changes{v2.2g}{2022/03/17}{Usage of \cs{captionsetup} inside \cs{caption@setup@options@@} replaced by \cs{caption@setup@options@}} % |\captionsetup*|\oarg{type}\ldots\marg{keyval-list of options}\\ % applies the given list of options. % If the optional argument `type' is specified, we simply save or append @@ -828,19 +829,19 @@ \caption@setup@options\caption@setup} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup{\caption@setkeys{caption}} +\newcommand*\caption@setup{% + \caption@setkeys{caption}} % \end{macrocode} % \begin{macrocode} \def\caption@setup@options[#1]{% \@ifnextchar[%] {\caption@stepthecounter - \caption@withoptargs{\@expandtwoargs - \caption@setup@options@i{#1}{@\caption@thecounter}}}% + \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}% {\caption@setup@options@{#1}}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@setup@options@i[4]{% - \caption@declare@option{#2}[]{\captionsetup#3{#4}}% +\def\caption@setup@options@@#1#2[#3]#4{% + \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}% \caption@setup@options@{#1}{#2}} % \end{macrocode} % \begin{macrocode} @@ -4431,6 +4432,7 @@ % \changes{v1.13}{2020/07/28}{Uses \cs{caption@l@addto@list} instead of \cs{@cons} now} % \changes{v1.13}{2020/07/29}{Usage of \cs{caption@subtype@hook} added} % \changes{v1.13}{2020/07/29}{We don't re-use existing counters anymore (This was a bad idea anyway)} +% \changes{v1.13b}{2022/04/06}{We don't re-use existing counters anymore (Part 2)} % |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\\ % The starred variant provides the numbering format % \meta{type}|.|\meta{subtype} while the non-starred variant simply uses @@ -4466,22 +4468,24 @@ \@namedef{ext@#4}{\csname ext@#3\endcsname}% \caption@declaresublistentry{#3}% \caption@l@addto@list\caption@subtypelist{#4}% - \caption@subtype@hook{#4}}% + \caption@subtype@hook{#4}% % \end{macrocode} % Support of \package{titletoc} package % \begin{macrocode} - \caption@ifdefined\contentsuse{% - \contentsuse{#4}{\csname ext@#4\endcsname}}{}% + \caption@ifdefined\contentsuse{% + \contentsuse{#4}{\csname ext@#4\endcsname}}{}% % \end{macrocode} % \begin{macrocode} - \@namedef{#4name}{}% - \@namedef{#4autorefname}{\csname #3autorefname\endcsname}% - #1% is \@firstoftwo in star form, and \@secondoftwo otherwise + \@namedef{#4name}{}% + \@namedef{#4autorefname}{\csname #3autorefname\endcsname}}% +% \end{macrocode} +% \begin{macrocode} + #1% is \@firstoftwo in star form, and \@secondoftwo otherwise {\@namedef{p@#4}{}% \@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}% {\@namedef{p@#4}{\csname the#3\endcsname}% \@namedef{the#4}{\@nameuse{#2}{#4}}}% - \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}} + \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}} % \end{macrocode} % \begin{macrocode} \@onlypreamble\caption@@@declaresubtype |