CTAN sync 202202210301

1 files changed, 27 insertions, 9 deletions

diff --git a/macros/latex/contrib/caption/caption-memoir.dtx b/macros/latex/contrib/caption/caption-memoir.dtx
index 1f29e68cb8..918669964e 100644
--- a/macros/latex/contrib/caption/caption-memoir.dtx
+++ b/macros/latex/contrib/caption/caption-memoir.dtx
@@ -27,17 +27,16 @@
 %   caption.sty, caption-light.sty, caption2.sty, caption3.sty,
 %   caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
 %   caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
-%   caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
-% and the user manuals
-%   caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%   caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
 % 
 % \fi
-% \CheckSum{56}
+%
+% \CheckSum{66}
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.drv}[2020/10/10 v2.1 Implementation of the caption-memoir package]
+\ProvidesFile{caption-memoir.drv}[2020/10/10 v2.2 Implementation of the caption-memoir package]
 \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
 %\errorcontextlines=3
 %
@@ -139,6 +138,7 @@
 % \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
 % \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
 % \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\kernel@ifnextchar}
 % \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
 % \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
 % \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
@@ -183,7 +183,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.sto}[2020/10/10 v2.1 Adaption of the caption package to the memoir document class (AR)]
+\ProvidesFile{caption-memoir.sto}[2021/06/30 v2.2 Adaption of the caption package to the memoir document class (AR)]
 %    \end{macrocode}
 %
 % \section{Adaptions already included in the caption package}
@@ -201,11 +201,12 @@
 %
 % \section{Single-line-check}
 %
-% \begin{macro}{\caption@prepareslc}
+% \begin{macro}{\pagenote}
 % \changes{v1.4a}{2011/10/21}{Re-definition of \cs{pagenote} added}
 %   We re-define \cs{pagenote} here so it won't disturb the single-line-check.
 %    \begin{macrocode}
-\g@addto@macro\caption@prepareslc{%
+\providecommand*\AtCaptionSingleLineCheck{\g@addto@macro\caption@prepareslc} % for caption v3.5
+\AtCaptionSingleLineCheck{%
   \let\pagenote\caption@gobble}
 %    \end{macrocode}
 % \end{macro}
@@ -277,6 +278,10 @@
 %
 % \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
@@ -286,7 +291,20 @@
 % package is used, so no extra vertical space will be created.
 %
 %    \begin{macrocode}
-\AtCaptionPackage{\setlength\belowcaptionskip{0pt}}
+  \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{\ifdim\prevdepth>-99\p@#2\else#1\fi}}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+}
 %    \end{macrocode}
 %
 % \section{TODO}