From 3e9a44ea155766214d8657ed79db2206592b6e8e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 1 Mar 2022 03:01:11 +0000 Subject: CTAN sync 202203010301 --- macros/latex/contrib/caption/README | 2 +- macros/latex/contrib/caption/bicaption.dtx | 2 +- macros/latex/contrib/caption/caption-ams-smf.dtx | 2 +- macros/latex/contrib/caption/caption-beamer.dtx | 2 +- .../latex/contrib/caption/caption-elsarticle.dtx | 2 +- macros/latex/contrib/caption/caption-koma.dtx | 2 +- macros/latex/contrib/caption/caption-light.dtx | 2 +- macros/latex/contrib/caption/caption-memoir.dtx | 13 ++-- macros/latex/contrib/caption/caption-ntg.dtx | 2 +- macros/latex/contrib/caption/caption-thesis.dtx | 2 +- macros/latex/contrib/caption/caption.dtx | 65 +------------------ macros/latex/contrib/caption/caption3.dtx | 72 ++++++++++++++++++++-- .../contrib/caption/fallback/v3.0/caption.dtx | 2 +- .../contrib/caption/fallback/v3.1/caption.dtx | 2 +- .../contrib/caption/fallback/v3.2/caption.dtx | 2 +- .../contrib/caption/fallback/v3.2/caption3.dtx | 2 +- .../contrib/caption/fallback/v3.3/caption.dtx | 2 +- .../contrib/caption/fallback/v3.3/caption3.dtx | 2 +- .../contrib/caption/fallback/v3.4/caption.dtx | 2 +- .../contrib/caption/fallback/v3.4/caption3.dtx | 2 +- .../contrib/caption/fallback/v3.5/caption.dtx | 2 +- .../contrib/caption/fallback/v3.5/caption3.dtx | 2 +- macros/latex/contrib/caption/ltcaption.dtx | 2 +- macros/latex/contrib/caption/subcaption.dtx | 2 +- 24 files changed, 99 insertions(+), 93 deletions(-) (limited to 'macros/latex/contrib/caption') diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README index 832f0f160d..e29c6134aa 100644 --- a/macros/latex/contrib/caption/README +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/bicaption.dtx b/macros/latex/contrib/caption/bicaption.dtx index fba7724ff3..f999ec9455 100644 --- a/macros/latex/contrib/caption/bicaption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-ams-smf.dtx b/macros/latex/contrib/caption/caption-ams-smf.dtx index f0f8cebe43..6b3b19ced6 100644 --- a/macros/latex/contrib/caption/caption-ams-smf.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-beamer.dtx b/macros/latex/contrib/caption/caption-beamer.dtx index 64d215bb03..fdbfb57402 100644 --- a/macros/latex/contrib/caption/caption-beamer.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-elsarticle.dtx b/macros/latex/contrib/caption/caption-elsarticle.dtx index 6fb731cf97..cb7733c9d7 100644 --- a/macros/latex/contrib/caption/caption-elsarticle.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-koma.dtx b/macros/latex/contrib/caption/caption-koma.dtx index 84f2f61d3f..c4daad26fa 100644 --- a/macros/latex/contrib/caption/caption-koma.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-light.dtx b/macros/latex/contrib/caption/caption-light.dtx index 697f8233ab..985c4ee95e 100644 --- a/macros/latex/contrib/caption/caption-light.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-memoir.dtx b/macros/latex/contrib/caption/caption-memoir.dtx index 918669964e..6905415fb1 100644 --- a/macros/latex/contrib/caption/caption-memoir.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-ntg.dtx b/macros/latex/contrib/caption/caption-ntg.dtx index 1285bbab92..782d576a8f 100644 --- a/macros/latex/contrib/caption/caption-ntg.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption-thesis.dtx b/macros/latex/contrib/caption/caption-thesis.dtx index aa0694668b..e91145a307 100644 --- a/macros/latex/contrib/caption/caption-thesis.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx index 4b59565b22..e56e11633a 100644 --- a/macros/latex/contrib/caption/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx index 5c91c87aa6..2f6e4f113a 100644 --- a/macros/latex/contrib/caption/caption3.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.0/caption.dtx b/macros/latex/contrib/caption/fallback/v3.0/caption.dtx index 7f7b4a49d1..bbdedad42c 100644 --- a/macros/latex/contrib/caption/fallback/v3.0/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.1/caption.dtx b/macros/latex/contrib/caption/fallback/v3.1/caption.dtx index 4bc736fdb9..17322ede2b 100644 --- a/macros/latex/contrib/caption/fallback/v3.1/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.2/caption.dtx b/macros/latex/contrib/caption/fallback/v3.2/caption.dtx index 7f31da44f2..0936d97306 100644 --- a/macros/latex/contrib/caption/fallback/v3.2/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx index f61d0be004..47e2c25afc 100644 --- a/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.3/caption.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption.dtx index 721ca9c371..7ab24aeaac 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx index bdffdcc66a..645c190d78 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.4/caption.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption.dtx index 2c9dc62be3..1e3f79d752 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx index 2843145c18..5bf40979cb 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.5/caption.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption.dtx index c573255554..c1cf692b74 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx index 5918f4a540..993af95854 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/ltcaption.dtx b/macros/latex/contrib/caption/ltcaption.dtx index 1b6c813a53..5d06fb0845 100644 --- a/macros/latex/contrib/caption/ltcaption.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/caption/subcaption.dtx b/macros/latex/contrib/caption/subcaption.dtx index 38104d18ce..31b76d94fd 100644 --- a/macros/latex/contrib/caption/subcaption.dtx +++ b/macros/latex/contrib/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} -- cgit v1.2.3