caption (28feb22)

git-svn-id: svn://tug.org/texlive/trunk@62290 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 29 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
index 74655d949d6..a452cc5eb5c 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}[2021/06/30 v2.2 Adaption of the caption package to the memoir document class (AR)]
+\ProvidesFile{caption-memoir.sto}[2022/02/28 v2.2a 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}
@@ -63,7 +63,12 @@
 
   \setlength\belowcaptionskip{0pt}%
   \@ifundefined{DeclareCaptionAutoPosition}{}{%
-    \DeclareCaptionAutoPosition{\ifdim\prevdepth>-99\p@#2\else#1\fi}}%
+    \DeclareCaptionAutoPosition{%
+      \ifvmode
+        \ifdim\prevdepth>-99\p@#2\else#1\fi
+      \else
+        #2%
+      \fi}}%
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 74909ecde1d..786bed03f0f 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/20 v3.6 Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/02/28 v3.6a Customizing captions (AR)]
 \RequirePackage{caption3}[2022/01/07] % needs v2.3 or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
@@ -78,21 +78,6 @@
     \else
       #2%
     \fi}}
-\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos
-\SetCaptionDefault{position}{auto}
-\newcommand*\caption@setautoposition[1]{%
-  \renewcommand*\caption@position@auto{%
-    \@nameuse{caption@position@#1}}}
-\newcommand*\caption@autoposition[2]{%
-  \edef\caption@tempa{\the\prevdepth}%
-  \caption@Debug{\string\prevdepth=\caption@tempa}%
-  \ifdim\prevdepth>-\p@
-    #2% position=bottom
-  \else
-    #1% position=top
-  \fi}
-\newcommand*\DeclareCaptionAutoPosition{%
-  \renewcommand*\caption@autoposition[2]}%
 \DeclareCaptionOption*{config}[caption]{%
    \InputIfFileExists{#1.cfg}%
      {\typeout{*** Local configuration file #1.cfg used ***}}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index eb930511d63..5255c82ee77 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/01/07 v2.3 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2022/02/28 v2.3a caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand\l@addto@macro[2]{%
@@ -1013,7 +1013,9 @@
 \DeclareCaptionPosition{bottom}{#2}{#2}
 \def\caption@position@b{\caption@position@bottom}
 \def\caption@position@below{\caption@position@bottom}
-\SetCaptionDefault{position}{bottom}
+\DeclareCaptionPosition{auto}{#2}{\caption@autoposition{#1}{#2}}
+\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos
+\SetCaptionDefault{position}{auto}
 \newcommand*\caption@initposition{%
   \let\caption@@iftop\@undefined}
 \newcommand*\caption@iftop{%
@@ -1026,6 +1028,23 @@
     \caption@position % defines \caption@fallback@position and \caption@regular@position
     #1{\let\caption@@iftop\@firstoftwo}{\let\caption@@iftop\@secondoftwo}%
   \fi}
+\newcommand*\caption@setautoposition[1]{%
+  \renewcommand*\caption@position@auto{%
+    \@nameuse{caption@position@#1}}}
+\newcommand*\caption@autoposition[2]{%
+  \ifvmode
+    \edef\caption@tempa{\the\prevdepth}%
+    \caption@Debug{\string\prevdepth=\caption@tempa}%
+    \ifdim\prevdepth>-\p@
+      #2% position=bottom
+    \else
+      #1% position=top
+    \fi
+  \else
+    #2% position=bottom
+  \fi}
+\newcommand*\DeclareCaptionAutoPosition{%
+  \renewcommand*\caption@autoposition[2]}%
 \newcommand*\caption@beginhook{}
 \newcommand*\caption@endhook{}
 \newcommand*\AtBeginCaption{\l@addto@macro\caption@beginhook}