diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx index 993af958545..9542d63b792 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx +++ b/Master/texmf-dist/source/latex/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 |