From 902e0fed7b392801cdb9720aea519c5f388ed7ef Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Mar 2022 20:24:13 +0000 Subject: caption (17mar22) git-svn-id: svn://tug.org/texlive/trunk@62757 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/caption/caption-memoir.sto | 20 +++++++++----------- Master/texmf-dist/tex/latex/caption/caption.sty | 16 ++++++---------- Master/texmf-dist/tex/latex/caption/caption3.sty | 12 ++++++------ .../tex/latex/caption/caption_2020-10-26.sty | 12 ++++++++---- 4 files changed, 29 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/tex/latex/caption') diff --git a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto index a452cc5eb5c..b7746ea5b8c 100644 --- a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto +++ b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto @@ -36,7 +36,7 @@ %% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-memoir.sto}[2022/02/28 v2.2a Adaption of the caption package to the memoir document class (AR)] +\ProvidesFile{caption-memoir.sto}[2022/03/02 v2.2b Adaption of the caption package to the memoir document class (AR)] \providecommand*\AtCaptionSingleLineCheck{\g@addto@macro\caption@prepareslc} % for caption v3.5 \AtCaptionSingleLineCheck{% \let\pagenote\caption@gobble} @@ -60,16 +60,14 @@ \captionsetup{textfont=@conttfont}% \caption@memoir@titlefont} \AtCaptionPackage{% - - \setlength\belowcaptionskip{0pt}% - \@ifundefined{DeclareCaptionAutoPosition}{}{% - \DeclareCaptionAutoPosition{% - \ifvmode - \ifdim\prevdepth>-99\p@#2\else#1\fi - \else - #2% - \fi}}% -} + \setlength\belowcaptionskip{0pt}} +\@ifundefined{DeclareCaptionAutoPosition}{}{% + \DeclareCaptionAutoPosition{% + \ifvmode + \ifdim\prevdepth>-99\p@#2\else#1\fi + \else + #2% + \fi}}% \endinput %% %% End of file `caption-memoir.sto'. diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 786bed03f0f..c3381e7671d 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -46,7 +46,7 @@ \DeclareRelease{v3.4}{2019-11-24}{caption_2020-07-29.sty} \DeclareRelease{v3.5}{2020-08-30}{caption_2020-10-26.sty} \DeclareCurrentRelease{v3.6}{2022-02-20} -\ProvidesPackage{caption}[2022/02/28 v3.6a Customizing captions (AR)] +\ProvidesPackage{caption}[2022/03/01 v3.6b Customizing captions (AR)] \RequirePackage{caption3}[2022/01/07] % needs v2.3 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% @@ -236,13 +236,7 @@ \M@gettitle{#2}} \providecommand\M@gettitle[1]{} \newcommand*\caption@nobreak{} -\newcommand*\caption@parboxrestore{% - \caption@before@parboxrestore - \caption@@parboxrestore - \caption@after@parboxrestore} -\newcommand*\caption@before@parboxrestore{} -\newcommand*\caption@@parboxrestore{\@parboxrestore} -\newcommand*\caption@after@parboxrestore{} +\newcommand*\caption@parboxrestore{\@parboxrestore} \long\def\caption@makecaption#1#2{% \caption@nobreak \caption@make@above @@ -619,9 +613,10 @@ \caption@setfnum{#1}} \newcommand\caption@beginex[3]{% \caption@begin{#1}% - \let\lst@@caption\relax + \caption@beginex@hook \caption@addcontentsline{#1}{#2}% \caption@ifempty{#3}{}} +\newcommand*\caption@beginex@hook{} \newcommand*\caption@end{% \endgroup} \newcommand*\caption@normalsize{% @@ -845,7 +840,7 @@ \providecommand*\caption@set@adjustwidth{% \caption@adjustwidth@hsize\hsize \caption@adjustwidth@linewidth\linewidth - \l@addto@macro\caption@before@parboxrestore\caption@test@adjustwidth}% + \l@addto@macro\caption@beginex@hook\caption@test@adjustwidth}% \providecommand*\caption@patch@changepage[1]{% \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname \expandafter\renewcommand\csname #1\endcsname[2]{% @@ -1126,6 +1121,7 @@ \def\lst@makecaption{\caption@starfalse\@makecaption}% \def\lst@maketitle{\caption@startrue\@makecaption\@empty}% \providecommand*\ext@lstlisting{lol}% + \l@addto@macro\caption@beginex@hook{\let\lst@@caption\relax}% }{} \providecommand*\LTcaptype{table} \providecommand*\caption@LT@array{} diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 5255c82ee77..f6e1f859bab 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -45,7 +45,7 @@ \DeclareRelease{v1.13}{2019-11-24}{caption3_2020-07-29.sty} % for caption v3.4 \DeclareRelease{v2.0} {2020-08-30}{caption3_2020-10-26.sty} % for caption v3.5 \DeclareCurrentRelease{v2.3}{2022-02-20} % for caption v3.6 -\ProvidesPackage{caption3}[2022/02/28 v2.3a caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/03/17 v2.3b caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} \providecommand\l@addto@macro[2]{% @@ -241,15 +241,15 @@ \captionsetup@startrue#1\captionsetup@starfalse \@ifnextchar[%] \caption@setup@options\caption@setup} -\newcommand*\caption@setup{\caption@setkeys{caption}} +\newcommand*\caption@setup{% + \caption@setkeys{caption}} \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}}} -\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}} \newcommand*\caption@setup@options@[2]{% \@bsphack diff --git a/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty b/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty index 3de2631ae4c..37212b522fd 100644 --- a/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty +++ b/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty @@ -36,7 +36,7 @@ %% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2020/10/26 v3.5g Customizing captions (AR)] +\ProvidesPackage{caption}[2022/03/01 v3.5h Customizing captions (AR)] \RequirePackage{caption3}[=2020/10/06] % needs v2.2b or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% @@ -231,6 +231,8 @@ {\ignorespaces\caption@makeanchor{#3}}\par \caption@if@minipage\@minipagetrue\@minipagefalse}% \caption@end} +\newcommand*\caption@before@parboxrestore{} +\newcommand*\caption@after@parboxrestore{} \providecommand\memcaptioninfo[4]{} \newcommand*\caption@prepareanchor[2]{% \caption@makecurrent{#1}{#2}% @@ -544,9 +546,10 @@ \caption@setfnum{#1}} \newcommand\caption@beginex[3]{% \caption@begin{#1}% - \let\lst@@caption\relax + \caption@beginex@hook \caption@addcontentsline{#1}{#2}% \caption@ifempty{#3}{}} +\newcommand*\caption@beginex@hook{} \newcommand*\caption@end{% \endgroup} \newcommand*\caption@setfnum[1]{% @@ -787,7 +790,8 @@ \newdimen\caption@adjustwidth@linewidth \providecommand*\caption@set@adjustwidth{% \caption@adjustwidth@hsize\hsize - \caption@adjustwidth@linewidth\linewidth}% + \caption@adjustwidth@linewidth\linewidth + \l@addto@macro\caption@beginex@hook\caption@test@adjustwidth}% \providecommand*\caption@patch@changepage[1]{% \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname \expandafter\renewcommand\csname #1\endcsname[2]{% @@ -802,7 +806,6 @@ \hsize=\linewidth \fi \fi}% - \AtBeginCaption{\caption@test@adjustwidth}% }{}% \caption@IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{% \caption@ifdefined\chkfloat@addcontentsline{% @@ -1065,6 +1068,7 @@ \def\lst@makecaption{\caption@starfalse\@makecaption}% \def\lst@maketitle{\caption@startrue\@makecaption\@empty}% \providecommand*\ext@lstlisting{lol}% + \l@addto@macro\caption@beginex@hook{\let\lst@@caption\relax}% }{} \providecommand*\LTcaptype{table} \providecommand*\caption@LT@array{} -- cgit v1.2.3