caption (17mar22) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62758 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 115 insertions, 89 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index e29c6134aa9..a14b3742e5a 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,7 +1,7 @@
 ==========================================================================
 
 The `caption' package bundle
-Release 2022-02-28
+Release 2022-03-17
 Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 
 License: LPPL = LaTeX Project Public Licence
diff --git a/Master/texmf-dist/doc/latex/caption/bicaption.pdf b/Master/texmf-dist/doc/latex/caption/bicaption.pdf
index 8d61aa6a925..4e6d3efaab8 100644
--- a/Master/texmf-dist/doc/latex/caption/bicaption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/bicaption.pdf
diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx
index f999ec94559..8d51567a6cb 100644
--- a/Master/texmf-dist/source/latex/caption/bicaption.dtx
+++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `bicaption.dtx'.
 % 
-% Copyright (C) 2010-2021 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2010-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -36,7 +36,7 @@
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{bicaption.drv}[2022/01/07 v1.5 Adds a bilingual caption feature to the caption package]
+\ProvidesFile{bicaption.drv}[2022/03/06 v1.5 Adds a bilingual caption feature to the caption package]
 \hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
 %\errorcontextlines=3
 %
@@ -269,9 +269,14 @@
 %   making the first language the second one and vice versa. (The default is |false|.)
 %
 %   \item[bi-separator=]
-%   \begin{quote}|\captionsetup{bi-separator=|\meta{name}|}|\end{quote}
 %   \NEWfeature{v1.3}
-%   will select a separator between first and second bilingual caption.
+%   The vertical distance between the first and second bilingual caption is usually
+%   determined by the \TeX\ skips set by |\normal|\-|size| which is applied right
+%   before both captions get typesetted.
+%   (This behaviour is inherited from the original \LaTeX\ code for |\caption| which
+%   applies |\normal|\-|size| right before |\@make|\-|caption|, too.)
+%   \begin{quote}|\captionsetup{bi-separator=|\meta{name}|}|\end{quote}
+%   will select an additional separator between first and second bilingual caption.
 %   You could choose one of the following: `none' (which is the default one
 %   and could also be addressed as `default'), `smallskip', `medskip',
 %   `largeskip', or a self-defined one using
@@ -291,7 +296,15 @@
 %     |\DeclareBiCaptionSeparator{3pt}{\vspace{3pt}}|\\
 %     |\captionsetup{bi-separator=3pt}|
 %   \end{quote}
-%   will put |3pt| vertical space between the two bilingual captions.
+%   will place |3pt| extra vertical space between the two bilingual captions.
+%   \par\medskip
+%   \textit{Note:} In contrast to the original \LaTeX\ code for |\caption| the
+%   \package{caption} package does not apply |\normal|\-|size| directly
+%   but will apply the caption font definition |normal|\-|size| instead
+%   (which is usually defined as |\normal|\-|size|).
+%   Therefore the vertical space between both captions
+%   could also be influenced by redefining it, e.g.:
+%   |\Declare|\-|Caption|\-|Font{normal|\-|size}{|\ldots|}|
 % \end{Options}
 %
 % \section{The \cs{bicaption} commands}
diff --git a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
index 6905415fb11..4e341cb42ce 100644
--- a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
@@ -183,7 +183,7 @@
 %
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \section{Adaptions already included in the caption package}
@@ -278,10 +278,6 @@
 %
 % \section{Vertical spaces before and after captions}
 %
-%    \begin{macrocode}
-\AtCaptionPackage{%
-%    \end{macrocode}
-
 % The \class{memoir} document classes uses |\above|\-|caption|\-|skip| and |\below|\-|caption|\-|skip|
 % different than the standard document classes and the \package{caption} package:
 % They always typeset |\above|\-|caption|\-|skip| before the caption and
@@ -291,25 +287,22 @@
 % package is used, so no extra vertical space will be created.
 %
 %    \begin{macrocode}
-  \setlength\belowcaptionskip{0pt}%
+\AtCaptionPackage{%
+  \setlength\belowcaptionskip{0pt}}
 %    \end{macrocode}
 %
 % Furthermore we adapt the `auto' positioning algorithm to match the one implemented
 % in the \class{memoir} document class.
-% (Note: This needs at least \package{caption} \version{3.6}.)
-%
-%    \begin{macrocode}
-  \@ifundefined{DeclareCaptionAutoPosition}{}{%
-    \DeclareCaptionAutoPosition{%
-      \ifvmode
-        \ifdim\prevdepth>-99\p@#2\else#1\fi
-      \else
-        #2%
-      \fi}}%
-%    \end{macrocode}
+% (Note: This needs at least \package{caption3} \version{2.3}.)
 %
 %    \begin{macrocode}
-}
+\@ifundefined{DeclareCaptionAutoPosition}{}{%
+  \DeclareCaptionAutoPosition{%
+    \ifvmode
+      \ifdim\prevdepth>-99\p@#2\else#1\fi
+    \else
+      #2%
+    \fi}}%
 %    \end{macrocode}
 %
 % \section{TODO}
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index e56e11633a9..14392efea80 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -31,7 +31,7 @@
 % 
 % \fi
 %
-% \CheckSum{2840}
+% \CheckSum{2836}
 %
 % \iffalse
 %<*driver>
@@ -4593,7 +4593,7 @@
 %
 % Identify the current version of the package.
 %    \begin{macrocode}
-\ProvidesPackage{caption}[2022/02/28 v3.6a Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/03/01 v3.6b Customizing captions (AR)]
 %    \end{macrocode}
 %
 % \subsection{Loading the kernel}
@@ -5140,19 +5140,9 @@
 % \changes{v3.2}{2010/11/07}{Support of option \opt{parboxrestore} added}
 % \changes{v3.5g}{2020/10/26}{New implementation; renamed from \cs{caption@boxrestore} to \cs{caption@parboxrestore}}
 % \changes{v3.6}{2021/01/02}{Always uses \cs{@parboxrestore} now}
-% \changes{v3.6}{2022/02/13}{Hooks added}
-% |\caption@parboxrestore| simply expands to |\@par|\-|box|\-|restore|,
-% surrounded by `before' and `after' hooks.
+% |\caption@parboxrestore| simply expands to |\@par|\-|box|\-|restore|.
 %    \begin{macrocode}
-\newcommand*\caption@parboxrestore{%
-  \caption@before@parboxrestore
-  \caption@@parboxrestore
-  \caption@after@parboxrestore}
-%    \end{macrocode}
-%    \begin{macrocode}
-\newcommand*\caption@before@parboxrestore{}
-\newcommand*\caption@@parboxrestore{\@parboxrestore}
-\newcommand*\caption@after@parboxrestore{}
+\newcommand*\caption@parboxrestore{\@parboxrestore}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6205,20 +6195,24 @@
 % \changes{v3.0l}{2007/02/04}{Takes now 3 args instead of 2, check for empty heading added}
 % \changes{v3.1}{2007/07/01}{Makes lst-entry now instead of redefining \cs{addcontentsline}}
 % \changes{v3.2}{2010/10/26}{Bugfix 09-05-15: Setting of \cs{lst@@caption} added}
+% \changes{v3.5h}{2022/03/01}{Hook added, setting of \cs{lst@@caption} removed}
 %  |\caption@beginex|\marg{type}\marg{list entry}\marg{heading}\par
 %  performs the same tasks as |\caption@begin| and additionally:
 %  \begin{enumerate}
-%  \item[4.] Set |\lst@@caption|, so |\fnum@lstlisting| will include a numbering.
+%  \item[4.] Apply the hook |\caption@beginex@hook|
 %  \item[5.] Make an entry in the list-of-whatever.
 %  \item[6.] Set |\caption@ifempty| according argument \meta{heading}.
 % \end{enumerate}
 %    \begin{macrocode}
 \newcommand\caption@beginex[3]{%
   \caption@begin{#1}%
-  \let\lst@@caption\relax
+  \caption@beginex@hook
   \caption@addcontentsline{#1}{#2}%
   \caption@ifempty{#3}{}}
 %    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*\caption@beginex@hook{}
+%    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\caption@end}
@@ -6806,13 +6800,13 @@
 %
 % \begin{macro}{\caption@set@adjustwidth}
 % \changes{v3.4k}{2020/05/30}{This macro definition added}
-% \changes{v3.6}{2022/02/13}{Usage of \cs{AtBeginCaption} replaced by \cs{l@addto@macro}\cs{caption@before@parboxrestore}}
+% \changes{v3.5h}{2022/03/01}{Usage of \cs{AtBeginCaption} replaced by \cs{l@addto@macro}\cs{caption@beginex@hook}}
 % Store the values of \cs{hsize} and \cs{linewidth}.
 %    \begin{macrocode}
   \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}%
 %    \end{macrocode}
 %    \begin{macrocode}
   \providecommand*\caption@patch@changepage[1]{%
@@ -7723,7 +7717,17 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\lst@@caption}
+% \changes{v3.1}{2007/03/03}{This macro added}
 % \changes{v3.1a}{2007/07/13}{Bugfix 07-09-13: \cs{lst@@caption} will not be re-defined anymore}
+% \changes{v3.2}{2010/10/26}{Bugfix 09-05-15: Setting of \cs{lst@@caption} added to \cs{caption@beginex}}
+% \changes{v3.5h}{2022/03/01}{Re-definition of \cs{lst@@caption} moved from \cs{caption@beginex} to \cs{caption@beginex@hook}}
+% We define |\lst@@caption| to non-|\@empty|, so |\fnum@lst|\-|listing| will
+% include a numbering.
+%    \begin{macrocode}
+  \l@addto@macro\caption@beginex@hook{\let\lst@@caption\relax}%
+%    \end{macrocode}
+% \end{macro}
 %
 %    \begin{macrocode}
 }{}
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx
index 2f6e4f113ab..8e4506202a9 100644
--- a/Master/texmf-dist/source/latex/caption/caption3.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption3.dtx
@@ -31,7 +31,7 @@
 % 
 % \fi
 %
-% \CheckSum{3814}
+% \CheckSum{3813}
 %
 % \iffalse
 %<*driver>
@@ -264,7 +264,7 @@
 %
 % Identify the current version of the package.
 %    \begin{macrocode}
-\ProvidesPackage{caption3}[2022/02/28 v2.3a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2022/03/17 v2.3b caption3 kernel (AR)]
 %    \end{macrocode}
 %
 % \section{Generic helpers}
@@ -832,6 +832,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.3b}{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
@@ -850,19 +851,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}
diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx
index c1cf692b743..463e9052fa0 100644
--- a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `caption.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{2692}
+% \CheckSum{2702}
 %
 % \iffalse
 %<*driver>
@@ -241,7 +241,7 @@
 %
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \section{Loading the kernel}
@@ -768,6 +768,10 @@
       \caption@if@minipage\@minipagetrue\@minipagefalse}%
   \caption@end}
 %    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*\caption@before@parboxrestore{}
+\newcommand*\caption@after@parboxrestore{}
+%    \end{macrocode}
 % \class{memoir} document class stuff:
 %    \begin{macrocode}
 \providecommand\memcaptioninfo[4]{}
@@ -1610,20 +1614,24 @@
 % \changes{v3.0l}{2007/02/04}{Takes now 3 args instead of 2, check for empty heading added}
 % \changes{v3.1}{2007/07/01}{Makes lst-entry now instead of redefining \cs{addcontentsline}}
 % \changes{v3.2}{2010/10/26}{Bugfix 09-05-15: Setting of \cs{lst@@caption} added}
+% \changes{v3.5h}{2022/03/01}{Hook added, setting of \cs{lst@@caption} removed}
 %  |\caption@beginex|\marg{type}\marg{list entry}\marg{heading}\par
 %  performs the same tasks as |\caption@begin| and additionally:
 %  \begin{enumerate}
-%  \item[4.] Set |\lst@@caption|, so |\fnum@lstlisting| will include a numbering.
+%  \item[4.] Apply the hook |\caption@beginex@hook|
 %  \item[5.] Make an entry in the list-of-whatever.
 %  \item[6.] Set |\caption@ifempty| according argument \meta{heading}.
 % \end{enumerate}
 %    \begin{macrocode}
 \newcommand\caption@beginex[3]{%
   \caption@begin{#1}%
-  \let\lst@@caption\relax
+  \caption@beginex@hook
   \caption@addcontentsline{#1}{#2}%
   \caption@ifempty{#3}{}}
 %    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*\caption@beginex@hook{}
+%    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\caption@end}
@@ -2243,11 +2251,13 @@
 %
 % \begin{macro}{\caption@set@adjustwidth}
 % \changes{v3.4k}{2020/05/30}{This macro and its usage added}
+% \changes{v3.5h}{2022/03/01}{Usage of \cs{AtBeginCaption} replaced by \cs{l@addto@macro}\cs{caption@beginex@hook}}
 % Store the values of \cs{hsize} and \cs{linewidth}.
 %    \begin{macrocode}
   \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}%
 %    \end{macrocode}
 %    \begin{macrocode}
   \providecommand*\caption@patch@changepage[1]{%
@@ -2274,9 +2284,6 @@
       \fi
     \fi}%
 %    \end{macrocode}
-%    \begin{macrocode}
-  \AtBeginCaption{\caption@test@adjustwidth}%
-%    \end{macrocode}
 % \end{macro}
 %
 %    \begin{macrocode}
@@ -3154,7 +3161,17 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\lst@@caption}
+% \changes{v3.1}{2007/03/03}{This macro added}
 % \changes{v3.1a}{2007/07/13}{Bugfix 07-09-13: \cs{lst@@caption} will not be re-defined anymore}
+% \changes{v3.2}{2010/10/26}{Bugfix 09-05-15: Setting of \cs{lst@@caption} added to \cs{caption@beginex}}
+% \changes{v3.5h}{2022/03/01}{Re-definition of \cs{lst@@caption} moved from \cs{caption@beginex} to \cs{caption@beginex@hook}}
+% We define |\lst@@caption| to non-|\@empty|, so |\fnum@lst|\-|listing| will
+% include a numbering.
+%    \begin{macrocode}
+  \l@addto@macro\caption@beginex@hook{\let\lst@@caption\relax}%
+%    \end{macrocode}
+% \end{macro}
 %
 %    \begin{macrocode}
 }{}
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{}