From 47b11301be338c7faaf09e7a692102606959db1d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Feb 2022 21:04:36 +0000 Subject: caption (28feb22) git-svn-id: svn://tug.org/texlive/trunk@62290 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/caption/README | 2 +- .../texmf-dist/source/latex/caption/bicaption.dtx | 2 +- .../source/latex/caption/caption-ams-smf.dtx | 2 +- .../source/latex/caption/caption-beamer.dtx | 2 +- .../source/latex/caption/caption-elsarticle.dtx | 2 +- .../source/latex/caption/caption-koma.dtx | 2 +- .../source/latex/caption/caption-light.dtx | 2 +- .../source/latex/caption/caption-memoir.dtx | 13 ++-- .../source/latex/caption/caption-ntg.dtx | 2 +- .../source/latex/caption/caption-thesis.dtx | 2 +- Master/texmf-dist/source/latex/caption/caption.dtx | 65 +------------------ .../texmf-dist/source/latex/caption/caption3.dtx | 72 ++++++++++++++++++++-- .../source/latex/caption/fallback/v3.0/caption.dtx | 2 +- .../source/latex/caption/fallback/v3.1/caption.dtx | 2 +- .../source/latex/caption/fallback/v3.2/caption.dtx | 2 +- .../latex/caption/fallback/v3.2/caption3.dtx | 2 +- .../source/latex/caption/fallback/v3.3/caption.dtx | 2 +- .../latex/caption/fallback/v3.3/caption3.dtx | 2 +- .../source/latex/caption/fallback/v3.4/caption.dtx | 2 +- .../latex/caption/fallback/v3.4/caption3.dtx | 2 +- .../source/latex/caption/fallback/v3.5/caption.dtx | 2 +- .../latex/caption/fallback/v3.5/caption3.dtx | 2 +- .../texmf-dist/source/latex/caption/ltcaption.dtx | 2 +- .../texmf-dist/source/latex/caption/subcaption.dtx | 2 +- .../tex/latex/caption/caption-memoir.sto | 9 ++- Master/texmf-dist/tex/latex/caption/caption.sty | 17 +---- Master/texmf-dist/tex/latex/caption/caption3.sty | 23 ++++++- 27 files changed, 128 insertions(+), 113 deletions(-) diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index 832f0f160d1..e29c6134aa9 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-20 +Release 2022-02-28 Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx index fba7724ff39..f999ec94559 100644 --- a/Master/texmf-dist/source/latex/caption/bicaption.dtx +++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx @@ -1027,7 +1027,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx b/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx index f0f8cebe431..6b3b19ced6b 100644 --- a/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx @@ -126,7 +126,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption-beamer.dtx b/Master/texmf-dist/source/latex/caption/caption-beamer.dtx index 64d215bb035..fdbfb574026 100644 --- a/Master/texmf-dist/source/latex/caption/caption-beamer.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-beamer.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx b/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx index 6fb731cf979..cb7733c9d7c 100644 --- a/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption-koma.dtx b/Master/texmf-dist/source/latex/caption/caption-koma.dtx index 84f2f61d3fc..c4daad26fa7 100644 --- a/Master/texmf-dist/source/latex/caption/caption-koma.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-koma.dtx @@ -125,7 +125,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption-light.dtx b/Master/texmf-dist/source/latex/caption/caption-light.dtx index 697f8233ab9..985c4ee95ea 100644 --- a/Master/texmf-dist/source/latex/caption/caption-light.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-light.dtx @@ -204,7 +204,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx index 918669964ec..6905415fb11 100644 --- a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx @@ -31,7 +31,7 @@ % % \fi % -% \CheckSum{66} +% \CheckSum{69} % % \iffalse %<*driver> @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -183,7 +183,7 @@ % % \begin{macrocode} \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)] % \end{macrocode} % % \section{Adaptions already included in the caption package} @@ -300,7 +300,12 @@ % % \begin{macrocode} \@ifundefined{DeclareCaptionAutoPosition}{}{% - \DeclareCaptionAutoPosition{\ifdim\prevdepth>-99\p@#2\else#1\fi}}% + \DeclareCaptionAutoPosition{% + \ifvmode + \ifdim\prevdepth>-99\p@#2\else#1\fi + \else + #2% + \fi}}% % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/caption-ntg.dtx b/Master/texmf-dist/source/latex/caption/caption-ntg.dtx index 1285bbab926..782d576a8fb 100644 --- a/Master/texmf-dist/source/latex/caption/caption-ntg.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-ntg.dtx @@ -123,7 +123,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption-thesis.dtx b/Master/texmf-dist/source/latex/caption/caption-thesis.dtx index aa0694668b7..e91145a3077 100644 --- a/Master/texmf-dist/source/latex/caption/caption-thesis.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-thesis.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 4b59565b22c..e56e11633a9 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{2869} +% \CheckSum{2840} % % \iffalse %<*driver> @@ -4481,7 +4481,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -4593,7 +4593,7 @@ % % Identify the current version of the package. % \begin{macrocode} -\ProvidesPackage{caption}[2022/02/20 v3.6 Customizing captions (AR)] +\ProvidesPackage{caption}[2022/02/28 v3.6a Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} @@ -4664,65 +4664,6 @@ #2% \fi}} % \end{macrocode} -% \begin{macrocode} -\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos -% \end{macrocode} -% -% \begin{macrocode} -\SetCaptionDefault{position}{auto} -% \end{macrocode} -% -% \begin{macro}{\caption@setautoposition} -% \changes{v3.1}{2007/06/10}{This macro added} -% \changes{v3.5}{2020/07/27}{Adapted to current implementation of `auto'} -% \changes{v3.6}{2021/01/03}{Adapted to current implementation of `auto'} -% |\caption@setautoposition|\marg{position}\\ -% replaces the above algorithm by a different one (or a fixed position setting). -% \begin{macrocode} -\newcommand*\caption@setautoposition[1]{% - \renewcommand*\caption@position@auto{% - \@nameuse{caption@position@#1}}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@autoposition} -% \changes{v3.0a}{2004/01/23}{\cs{ifvmode} added} -% \changes{v3.0b}{2004/05/16}{Split into \cs{caption@fixposition} & \cs{caption@autoposition}} -% \changes{v3.5}{2020/07/27}{Adapted to current implementation of `auto'} -% \changes{v3.6}{2021/01/05}{Adapted to current implementation of `auto'; \cs{ifvmode} moved into definition of `auto'} -% We try to guess the current position of the caption by checking |\prev|\-|depth|. -% -% A different solution would be setting the |\space|\-|factor| to something -% not much less than 1000 (for example 994) in |\caption@start| and -% checking this value here by |\ifnum\space|\-|factor=994|. -% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.) -% -% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages -% typeset the caption within a simple |\vbox| this does not seem to be a good one. -% \begin{macrocode} -\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} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@autoposition} -% \changes{v3.6}{2021/01/05}{This macro added} -% |\DeclareCaptionAutoPosition|\marg{code with \#1 and \#2}\\ -% replaces the inner algorithm of |position=auto| with a custom one. -% If \#1 is applied the skip will be typeset below the caption -% (like |position=t|), if \#2 is applied the skip will by typeset -% above the caption (like |position=b|). -% \begin{macrocode} -\newcommand*\DeclareCaptionAutoPosition{% - \renewcommand*\caption@autoposition[2]}% -% \end{macrocode} -% \end{macro} % % \subsection{Declaration of options} % diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index 5c91c87aa69..2f6e4f113ab 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{3781} +% \CheckSum{3814} % % \iffalse %<*driver> @@ -179,7 +179,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -264,7 +264,7 @@ % % Identify the current version of the package. % \begin{macrocode} -\ProvidesPackage{caption3}[2022/01/07 v2.3 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/02/28 v2.3a caption3 kernel (AR)] % \end{macrocode} % % \section{Generic helpers} @@ -2838,12 +2838,15 @@ \def\caption@position@b{\caption@position@bottom} \def\caption@position@below{\caption@position@bottom} % \end{macrocode} +% \begin{macrocode} +\DeclareCaptionPosition{auto}{#2}{\caption@autoposition{#1}{#2}} +\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos +% \end{macrocode} % % \changes{v1.1}{2007/05/08}{Default position changed from `bottom' to `auto'} -% \changes{v1.3}{2021/01/02}{Default position changed back from `auto' to `bottom'} -% `default' usually maps to `bottom'. +% `default' usually maps to `auto'. % \begin{macrocode} -\SetCaptionDefault{position}{bottom} +\SetCaptionDefault{position}{auto} % \end{macrocode} % % \begin{macro}{\caption@initposition} @@ -2896,6 +2899,63 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\caption@setautoposition} +% \changes{v1.1}{2007/06/10}{This macro added} +% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'} +% \changes{v2.3}{2021/01/03}{Adapted to current implementation of `auto'} +% |\caption@setautoposition|\marg{position}\\ +% replaces the above algorithm by a different one (or a fixed position setting). +% \begin{macrocode} +\newcommand*\caption@setautoposition[1]{% + \renewcommand*\caption@position@auto{% + \@nameuse{caption@position@#1}}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\caption@autoposition} +% \changes{v1.0a}{2004/01/23}{\cs{ifvmode} added} +% \changes{v1.0b}{2004/05/16}{Split into \cs{caption@fixposition} & \cs{caption@autoposition}} +% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'} +% \changes{v2.3}{2021/01/05}{Adapted to current implementation of `auto'; \cs{ifvmode} moved into definition of `auto'} +% \changes{v2.3a}{2022/02/28}{\cs{ifvmode} moved back into this macro} +% We try to guess the current position of the caption by checking |\prev|\-|depth|. +% +% A different solution would be setting the |\space|\-|factor| to something +% not much less than 1000 (for example 994) in |\caption@start| and +% checking this value here by |\ifnum\space|\-|factor=994|. +% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.) +% +% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages +% typeset the caption within a simple |\vbox| this does not seem to be a good one. +% \begin{macrocode} +\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} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\DeclareCaptionAutoPosition} +% \changes{v2.3}{2021/01/05}{This macro added} +% |\DeclareCaptionAutoPosition|\marg{code with \#1 and \#2}\\ +% replaces the inner algorithm of |position=auto| with a custom one. +% If \#1 is applied the skip will be typeset below the caption +% (like |position=t|), if \#2 is applied the skip will by typeset +% above the caption (like |position=b|). +% \begin{macrocode} +\newcommand*\DeclareCaptionAutoPosition{% + \renewcommand*\caption@autoposition[2]}% +% \end{macrocode} +% \end{macro} +% % \section{Hooks} % % \begin{macro}{\AtBeginCaption} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.0/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.0/caption.dtx index 7f7b4a49d1b..bbdedad42c7 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.0/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.0/caption.dtx @@ -56,7 +56,7 @@ % \usepackage{caption}[2005/08/24] \DeclareCaptionLabelSeparator{endash}{\space\textendash\space} -\usepackage{hyperref} +\usepackage{hypdoc} % \DeclareCaptionFont{red}{\color{red}} \DeclareCaptionFont{green}{\color{green}} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx index 4bc736fdb9c..17322ede2bc 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx @@ -164,7 +164,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx index 7f31da44f24..0936d973067 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx @@ -150,7 +150,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption3.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption3.dtx index f61d0be0047..47e2c25afce 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption3.dtx @@ -136,7 +136,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx index 721ca9c3719..7ab24aeaac7 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx @@ -150,7 +150,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption3.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption3.dtx index bdffdcc66a1..645c190d78d 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption3.dtx @@ -134,7 +134,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx index 2c9dc62be3b..1e3f79d752b 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx @@ -151,7 +151,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption3.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption3.dtx index 2843145c183..5bf40979cb9 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption3.dtx @@ -129,7 +129,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} 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 c573255554c..c1cf692b743 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 @@ -174,7 +174,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx b/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx index 5918f4a540c..993af958545 100644 --- a/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption3.dtx @@ -181,7 +181,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/Master/texmf-dist/source/latex/caption/ltcaption.dtx b/Master/texmf-dist/source/latex/caption/ltcaption.dtx index 1b6c813a53f..5d06fb0845c 100644 --- a/Master/texmf-dist/source/latex/caption/ltcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/ltcaption.dtx @@ -407,7 +407,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 38104d18ce3..31b76d94fd4 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -1700,7 +1700,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} 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} -- cgit v1.2.3