1 files changed, 11 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
index d74cdddae99..74655d949d6 100644
--- a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
+++ b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
@@ -6,7 +6,7 @@
 %%
 %% caption-memoir.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -33,13 +33,12 @@
 %%   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.
 %% 
 \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)]
-\g@addto@macro\caption@prepareslc{%
+\ProvidesFile{caption-memoir.sto}[2021/06/30 v2.2 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}
 \DeclareCaptionLabelSeparator{@contdelim}{\@contdelim}
 \SetCaptionDefault{labelseparator}{@contdelim}
@@ -60,7 +59,12 @@
 \renewcommand\captiontitlefont{%
   \captionsetup{textfont=@conttfont}%
   \caption@memoir@titlefont}
-\AtCaptionPackage{\setlength\belowcaptionskip{0pt}}
+\AtCaptionPackage{%
+
+  \setlength\belowcaptionskip{0pt}%
+  \@ifundefined{DeclareCaptionAutoPosition}{}{%
+    \DeclareCaptionAutoPosition{\ifdim\prevdepth>-99\p@#2\else#1\fi}}%
+}
 \endinput
 %%
 %% End of file `caption-memoir.sto'.