summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/caption/bicaption.sty35
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption-koma.sto16
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty228
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty101
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3_2019-09-01.sty16
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3_2020-07-29.sty26
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3_2020-10-26.sty26
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2007-04-16.sty4
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty93
14 files changed, 317 insertions, 253 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index a151898ae34..1948a15f752 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -6,7 +6,7 @@
%%
%% bicaption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -39,7 +39,7 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
\DeclareCurrentRelease{v1}{2011/07/13}
-\ProvidesPackage{bicaption}[2021/05/02 v1.5b Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2023/02/19 v1.6 Bilingual Captions (AR)]
\RequirePackage{caption}[2011/11/10] % we need at least v3.2e
\newcommand*\bicaption@Info[1]{%
\PackageInfo{bicaption}{#1}}
@@ -138,7 +138,7 @@
\bicaption@setmainlanguage
\fi
\ifcsname captionmainlanguage\endcsname
- \captionsetup[bi-first]{lang=\captionmainlanguage}%
+ \captionsetup*[bi-first]{lang=\captionmainlanguage}%
\else
\ifcsname bicaption@language@value\endcsname % option "lang=" was used
\expandafter\bicaption@Warning
@@ -158,7 +158,7 @@
\let\captionmainlanguage\xpg@main@language
\fi\fi}
\@onlypreamble\bicaption@setmainlanguage
-\caption@SetupOptions{bicaption}{\captionsetup[bi-second]{#2}}%
+\caption@SetupOptions{bicaption}{\captionsetup*[bi-second]{#2}}%
\caption@ProcessOptions*{bicaption}
\let\bicaption@addcontentsline@ORI\caption@addcontentsline
\renewcommand*\caption@addcontentsline[2]{%
@@ -236,6 +236,17 @@
{\newcommand\bicaption@slc[2]{\caption@@slc{#1}{#2}{\captionwidth}}}
\providecommand*\caption@setsinglelinecheck{%
\caption@set@bool\caption@ifslc}
+\newcommand*\bicaptionsetup{%
+ \caption@teststar\@bicaptionsetup*{}}
+\newcommand*\@bicaptionsetup[1]{%
+ \kernel@ifnextchar[%]
+ {\bicaption@setup@options{#1}}%
+ {\bicaption@setup*}}
+\def\bicaption@setup@options#1[#2]{%
+ \bicaption@setup{#1[{#2}]}}
+\newcommand*\bicaption@setup[2]{%
+ \captionsetup#1[bi-first]{#2}%
+ \captionsetup#1[bi-second]}
\newcommand\bicaption{\@bicaption\caption}
\newcommand\bicaptionbox{\@bicaption\captionbox}
\newcommand\bisubcaption{\@bicaption\subcaption}
@@ -255,9 +266,9 @@
\long\def\@@@@bicaption#1#2[#3]#4{%
\bicaption@getlabel{#2}%
\bicaption@ifswap
- {\bicaption@setup{#1}{#2}%
+ {\bicaption@set{#1}{#2}%
\bicaption@cmd[{#3}]{#4}}%
- {\bicaption@setup{#3}{#4}%
+ {\bicaption@set{#3}{#4}%
\bicaption@cmd[{#1}]{#2}}}
\long\def\bicaption@star#1[#2]{#1*}
\@ifundefined{caption@getlabel}{%
@@ -300,7 +311,7 @@
}{%
\newcommand*\bicaption@clrlabel{\caption@clrlabel} % caption3 >= v2.3
}
-\newcommand\bicaption@setup[2]{%
+\newcommand\bicaption@set[2]{%
\def\bicaption@lentry{#1}%
\def\bicaption@text{\ignorespaces #2}}
\newcommand*\bicaption@clear{%
@@ -313,7 +324,7 @@
\def\bicaption{%
\caption@withoptargs\caption@SC@bicaption}%
\long\def\caption@SC@bicaption#1#2{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\caption@SC@bi@caption{#1}{#2}}%
{\caption@SC@bi@caption@{#1}{#2}}}%
\long\def\caption@SC@bi@caption#1#2[#3]#4{%
@@ -329,14 +340,14 @@
\lst@Key{caption1}\relax{%
\lstKV@OptArg[{#1}]{#1}{%
\bicaption@ifswap
- {\bicaption@setup{##1}{##2}}%
+ {\bicaption@set{##1}{##2}}%
{\def\lst@@caption{##1}\def\lst@caption{##2}}}%
\let\lst@title\@empty}%
\lst@Key{caption2}\relax{%
\lstKV@OptArg[{#1}]{#1}{%
\bicaption@ifswap
{\def\lst@@caption{##1}\def\lst@caption{##2}}%
- {\bicaption@setup{##1}{##2}}}%
+ {\bicaption@set{##1}{##2}}}%
\let\lst@title\@empty}%
\lst@AddToHookExe{TextStyle}{%
\bicaption@clear}%
@@ -358,8 +369,8 @@
\bicaption@LT@setup}%
\gdef\bicaption@LT@setup{%
\bicaption@ifswap
- {\bicaption@setup{#1}{#2}}%
- {\bicaption@setup{#3}{#4}}}%
+ {\bicaption@set{#1}{#2}}%
+ {\bicaption@set{#3}{#4}}}%
\bicaption@ifswap
{\egroup\bicaption@cmd[{#3}]{#4}}%
{\egroup\bicaption@cmd[{#1}]{#2}}}
diff --git a/Master/texmf-dist/tex/latex/caption/caption-koma.sto b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
index 2b76e5edc47..143b867423e 100644
--- a/Master/texmf-dist/tex/latex/caption/caption-koma.sto
+++ b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.sto}[2020/09/21 v2.0b Adaption of the caption package to the KOMA-Script document classes (AR)]
+\ProvidesFile{caption-koma.sto}[2022/12/27 v2.0c Adaption of the caption package to the KOMA-Script document classes (AR)]
\expandafter\let\expandafter\caption@koma@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
@@ -97,20 +97,6 @@
\newcommand*\caption@setcapindent{%
\captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
\caption@ifdefined\cap@indent{\caption@setcapindent}{}
-\let\caption@koma@parindent\KV@caption@parindent
-\DeclareCaptionOption{parindent}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parindent' ignored}%
- \else
- \caption@koma@parindent{#1}%
- \fi}%
-\let\caption@koma@parskip\KV@caption@parskip
-\DeclareCaptionOption{parskip}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parskip' ignored}%
- \else
- \caption@koma@parskip{#1}%
- \fi}%
\g@addto@macro\onelinecaptionstrue{\caption@setsinglelinecheck{true}}%
\g@addto@macro\onelinecaptionsfalse{\caption@setsinglelinecheck{false}}%
\ifonelinecaptions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index c3381e7671d..656d39a32db 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -6,7 +6,7 @@
%%
%% caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -46,8 +46,8 @@
\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/03/01 v3.6b Customizing captions (AR)]
-\RequirePackage{caption3}[2022/01/07] % needs v2.3 or newer
+\ProvidesPackage{caption}[2023/03/12 v3.6j Customizing captions (AR)]
+\RequirePackage{caption3}[2022/04/06] % needs v2.4 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
Unknown document class (or package),\MessageBreak
@@ -104,10 +104,12 @@
please use either \string\usepackage{caption}[=v1]\MessageBreak
or \string\usepackage{caption-light} instead}%
}{\caption@ifinlist{#1}{0,false,no,off}{%
- % nothing to do
+ \let\caption@ifcompatibility\@secondoftwo % not used; for backward compatibility only
}{%
\caption@Error{Undefined compatibility value `#1'}%
}}}
+\@onlypreamble@key{caption}{compatibility}
+\caption@setbool{compatibility}{0} % default: Try not to be compatible to v1.x
\DeclareCaptionOptionNoValue*{normal}{%
\caption@setup{format=plain,justification=justified}}
\DeclareCaptionOptionNoValue*{isu}{%
@@ -268,6 +270,7 @@
\def\caption@xfloat#1[#2]{%
\caption@ORI@xfloat{#1}[#2]%
\caption@settype{#1}%
+ \caption@setanchor
\caption@xfloat@hook}
\newcommand*\caption@xfloat@hook{}
\def\caption@xdblfloat#1[#2]{%
@@ -282,57 +285,56 @@
\DeclareCaptionOptionNoValue{subtype*}{\setcaptionsubtype*}%
}
\def\setcaptiontype{%
+ \caption@teststar\@setcaptiontype\@gobble\@iden}
+\newcommand*\@setcaptiontype[1]{%
+ \kernel@ifnextchar[%]
+ {\@setcaptiontype@#1}%
+ {\@@setcaptiontype#1\relax}}
+\def\@setcaptiontype@#1[#2]{%
+ \@@setcaptiontype{#1}{\caption@setoptions{#2}}}
+\newcommand*\@@setcaptiontype[3]{%
+ \caption@settype{#3}#2%
\caption@parboxrestore@light
- \caption@settype}
+ #1\caption@setanchor}
\newcommand*\caption@settype{%
\caption@initposition
\caption@clrflags
\aftergroup\flushsubcaptionlistentries
- \caption@@settype}
-\newcommand*\caption@@settype{%
- \caption@teststar\caption@@settype@\@firstoftwo\@secondoftwo}
-\newcommand*\caption@@settype@[1]{%
- \@ifnextchar[%]
- {\caption@@settype@@{#1}}%
- {\caption@@@settype{}{#1}}}
-\def\caption@@settype@@#1[#2]#3{%
- \caption@@@settype{}{#1}{#3}%
- \caption@setoptions{#2}}
-\newcommand*\setcaptionsubtype{%
- \caption@setsubtype}
-\newcommand*\caption@setsubtype{% used by the floatrow package
- \caption@teststar\caption@@setsubtype\@firstoftwo\@secondoftwo}
-\newcommand*\caption@@setsubtype[1]{%
- \caption@iftype
- {\caption@ifsubtype
- {\caption@Debug{subtype=\@subcaptype}}%
- {\caption@@@settype{sub}{#1}{sub\@captype}}}%
- {\caption@OutsideFloat\setcaptionsubtype}}
-\newcommand*\caption@@@settype[3]{%
- \caption@Debug{#1type:=#3}%
- \@nameuse{caption@check#1type}{#3}%
- {\caption@checkgrouplevel{#1}{%
- \captionsetup{#1type#2*\@empty=...}#2{ or
- \@backslashchar#1captionof}{}}%
- \edef\caption@tempa{#3}%
+ \caption@@settype{}}
+\newcommand*\caption@@settype[2]{%
+ \caption@Debug{#1type:=#2}%
+ \@nameuse{caption@check#1type}{#2}%
+ {\caption@checkgrouplevel{#1}{\setcaption#1type}%
+ \edef\caption@tempa{#2}%
\expandafter\ifx\csname @#1captype\endcsname\caption@tempa \else
- \ifcaptionsetup@star\else\@nameuse{caption@#1type@warning}\fi
+ \@nameuse{caption@#1type@warning}%
\fi
\expandafter\let\csname @#1captype\endcsname\caption@tempa
\@nameuse{caption@#1typehook}%
- \caption@setoptions{#3}%
+ \caption@setoptions{#2}%
\ifx\caption@opt\relax
\@nameundef{caption@#1type@warning}%
\else
\@namedef{caption@#1type@warning}{\caption@Warning{%
The #1type was already set to
`\csname @#1captype\endcsname'\MessageBreak}}%
- \fi
- #2{}{\caption@reset@currentlabel\caption@start}}}
+ \fi}}
+\newcommand*\setcaptionsubtype{%
+ \caption@teststar\@setcaptionsubtype\@gobble\@iden}
+\newcommand*\@setcaptionsubtype[1]{%
+ \caption@iftype
+ {\caption@ifsubtype
+ {\caption@Debug{type=\@captype, subtype=\@subcaptype}}%
+ {\caption@@settype{sub}{sub\@captype}%
+ #1\caption@setanchor}}%
+ {\caption@OutsideFloat\setcaptionsubtype}}
\newcommand*\caption@parboxrestore@light{%
\let\par\@@par
\parindent\z@ \parskip\z@skip
\sloppy}
+\newcommand*\caption@setanchor{%
+ \caption@reset@currentlabel
+ \caption@start}
\newcommand*\caption@reset@currentlabel{%
\let\@currentlabel\caption@undefinedlabel
\ifx\caption@x@label\@undefined
@@ -349,15 +351,11 @@
\newcommand*\caption@checksubtype[1]{%
\caption@ifdefined@subtype{#1}%
\@firstofone
- {\caption@ifin@list\sf@counterlist{#1}%
- {\caption@Warning{%
- \noexpand\setcaptionsubtype without \string\DeclareCaptionSubType.\MessageBreak
- This is not designed to work; you could try replacing\MessageBreak
- the `subfig' package with `subcaption' to resolve\MessageBreak
- this problem which occurred}%
- \@firstofone}%
- {\caption@Error{Undefined subtype `#1'}%
- \@gobble}}}
+ {\@ifundefined{c@#1}%
+ {\caption@Error{Undefined counter `#1'}}%
+ {\caption@subtypesource\caption@subtype@source{#1}%
+ \caption@Error{The counter `#1' was defined by\MessageBreak\caption@subtype@source}}%
+ \@gobble}}
\newcommand*\caption@checkgrouplevel[2]{%
\@ifundefined{#1caption@grouplevel}{%
\caption@ifundefined\caption@grouplevel{\let\caption@grouplevel\z@}{}%
@@ -397,7 +395,7 @@
\newcommand*\captionlistentry{%
\caption@teststar\caption@listentry\@firstoftwo\@secondoftwo}
\newcommand*\caption@listentry[1]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\caption@listentry@{#1}}%
{\caption@@listentry{#1}}}
\def\caption@listentry@#1[#2]{%
@@ -598,7 +596,6 @@
{\let\caption@next\@firstoftwo}%
#3%
\caption@next}
-\@ifundefined{kernel@ifnextchar}{\let\kernel@ifnextchar\@ifnextchar}{}
\newcommand\caption@dblarg[1]{%
\kernel@ifnextchar[%]
{\caption@ydblarg{#1}}%
@@ -648,36 +645,16 @@
\caption@iflist{}{\let\caption@setlist\@gobble}%
\caption@setoptions{sub}%
\caption@setoptions{subfloat}% for subfig-package compatibility
- \def\caption@settype{\caption@withoptargs\caption@sub@settype}%
- \def\caption@sub@settype##1##2{%
- \edef\caption@tempa{##2}%
- \ifx\caption@tempa\@captype
-%%% \caption@setsubtype##1\relax
- \else
- \caption@Error{##2 inside \@subcaptype}%
- \fi}%
+ \renewcommand*\caption@settype[1]{%
+ \caption@Error{##1 inside \@subcaptype}}%
\let\caption\caption@subcaption
\let\@caption\caption@@caption
\let\phantomcaption\caption@subphantom
\let\captionlistentry\caption@sublistentry
\let\captiontext\caption@subtext
\let\caption@refstepcounter\caption@refstepcounter@
- \if@subfloatrow
- \caption@Debug{Keeping \string\@makecaption}%
- \else
- \let\@makecaption\caption@makecaption
- \fi
+ \let\@makecaption\caption@makecaption
\fi}%
-\caption@AtBeginDocument{%
- \caption@ifundefined\@subfloatrowtrue
- {\newif\if@subfloatrow
- \caption@ifundefined\subfloatrow
- {}%
- {\caption@Debug{Patching subfloatrow environment}%
- \g@addto@macro\capsubrowsettings{\@subfloatrowtrue}%
- \g@addto@macro\killfloatstyle{%
- \ifx\c@FRobj\c@FRsobj\@subfloatrowtrue\fi}}}%
- {\caption@Debug{\string\if@subfloatrow is already defined}}}%
\newcommand*\caption@subcaption{%
\caption@checkgrouplevel{sub}\subcaption
\caption@star
@@ -773,7 +750,7 @@
\caption@AtBeginDocument*{%
\caption@ifneedfreeze{%
\newcommand*\caption@freezetype[1]{%
- \caption@settype*{#1}%
+ \caption@settype{#1}%
\captionsetup*[sub]{hypcap=true}% Note: This is just a (q&d) workaround!
\caption@freeze}%
\newcommand*\caption@freeze{%
@@ -823,7 +800,7 @@
\newcommand*\caption@freeze@error{%
\caption@Error{Only one \noexpand\caption can be placed in this environment}}
\newcommand*\caption@prepare@defrost{%
- \let\caption@settype\caption@@settype}
+ \def\caption@settype{\caption@@settype{}}}
\newcommand*\caption@defrost{%
\ifx\caption@frozen@caption\@undefined
\caption@frozen@content
@@ -835,20 +812,21 @@
\caption@undefbool{needfreeze}}
\let\caption@warmup\relax
\caption@IfPackageLoaded{changepage}[2008/07/23 memoir-v3.7k]{%
+ \providecommand*\caption@patch@adjustwidth[1]{%
+ \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\renewcommand\csname #1\endcsname[2]{%
+ \@nameuse{caption@#1}{##1}{##2}%
+ \caption@set@adjustwidth
+ \ignorespaces}}%
+ \caption@patch@adjustwidth{adjustwidth}%
+ \caption@patch@adjustwidth{adjustwidth*}%
+ \let\caption@patch@adjustwidth\relax
\newdimen\caption@adjustwidth@hsize
\newdimen\caption@adjustwidth@linewidth
\providecommand*\caption@set@adjustwidth{%
\caption@adjustwidth@hsize\hsize
\caption@adjustwidth@linewidth\linewidth
\l@addto@macro\caption@beginex@hook\caption@test@adjustwidth}%
- \providecommand*\caption@patch@changepage[1]{%
- \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname
- \expandafter\renewcommand\csname #1\endcsname[2]{%
- \@nameuse{caption@#1}{##1}{##2}%
- \caption@set@adjustwidth}}%
- \caption@patch@changepage{adjustwidth}%
- \caption@patch@changepage{adjustwidth*}%
- \let\caption@patch@changepage\relax
\providecommand\caption@test@adjustwidth{%
\ifdim\hsize=\caption@adjustwidth@hsize
\ifdim\linewidth=\caption@adjustwidth@linewidth
@@ -893,9 +871,12 @@
\caption@ORI@float@makebox{#1\relax \caption@defrostHref}}%
}%
\newcommand*\caption@float@setname[1]{%
- \expandafter\ifx\csname #1name\endcsname\relax
- \expandafter\let\csname #1name\expandafter\endcsname\csname fname@#1\endcsname
+ \expandafter\ifx\csname #1name\endcsname\relax % either undefined or \relax
+ \@namedef{#1name}{\@nameuse{fname@#1}}%
\fi}%
+ \renewcommand*\caption@setname[2]{%
+ \@ifundefined{fname@#1}{}{\caption@ifdefined\floatname\floatname\@gobbletwo{#1}{#2}}%
+ \@namedef{#1name}{#2}}%
\g@addto@macro\fs@plaintop{\def\@fs@mid{\vspace\abovecaptionskip\relax}}%
\g@addto@macro\fs@boxed{\def\@fs@mid{\kern\abovecaptionskip\relax}}%
\providecommand*\float@getstyle[2]{%
@@ -933,7 +914,25 @@
\newcommand*\caption@floatflt[1]{%
\caption@settype{#1}%
\caption@clearmargin
- \caption@setoptions{floating#1}}%
+ \caption@setoptions{floating#1}%
+ \caption@setanchor}%
+}{}
+\caption@IfPackageLoaded{floatrow}[2008/08/02 v0.3b]{%
+ \renewcommand\captionlabel[1]{{\def\FR@tmp{\@captype}\ifnum\floatbox@depth>\@ne
+ \def\FR@tmp{sub\@captype}\setcaptionsubtype*\stepcounter{\FR@tmp}\fi
+ \caption@@@make{\caption@fnum\FR@tmp}{#1}}}
+ \renewenvironment{subfloatrow}{\capsubrowsettings
+ \caption@subfloatrow@hook % as replacement for \captionsetup{subtype}
+ \@nameuse{subfloatrow*}}{\@nameuse{endsubfloatrow*}}
+ \providecommand*\caption@subfloatrow@hook{}
+ \renewenvironment{subfloatrow*}[1][2]{\let\flrow@to\empty
+ \let\Xhsize\sXhsize%\let\Zhsize\sZhsize
+ \FR@ifunloc{\let\FR@ifcountH\@firstoftwo}\let\c@FRobj\c@FRsobj
+ \def\FRleftmargin{}\def\FRrightmargin{}\let\floatrowsep\subfloatrowsep
+ \floatrow[#1]\killfloatstyle
+ \let\caption@makecaption\flrow@makecaption}% <- This line added
+ {\ifdim\lastskip>\z@\unskip\fi
+ \@ifundefined{adjustsubfloats}\relax\adjustsubfloats\endfloatrow}
}{}
\caption@IfPackageLoaded{fltpage}[1998/10/29 v.0.3]{%
\caption@setbool{needfreeze}{1}%
@@ -1142,7 +1141,7 @@
\@ifstar\@captionsetup\@captionsetup}% gobble *
\def\@captionsetup#1{\LT@captionsetup{#1}\egroup}%
\def\LT@captionsetup#1{%
- \captionsetup@startrue\caption@setup@options[@longtable]{#1}%
+ \caption@setup@options\@gobble[@longtable]{#1}%
\global\let\caption@opt@@longtable\caption@opt@@longtable}%
\def\captionlistentry{%
\noalign\bgroup
@@ -1180,7 +1179,7 @@
\caption@listentry\@firstoftwo[{#1}]{#2}%
\endgroup\ignorespaces}%
\newcommand*\caption@LT@settype[1]{%
- \caption@settype*{#1}%
+ \caption@settype{#1}%
\ifdim\LTcapwidth=4in \else
\caption@setwidth\LTcapwidth
\fi
@@ -1215,7 +1214,8 @@
\let\@makecaption\caption@@make
\caption@setautoposition b%
\caption@settype{#1}%
- \caption@clearmargin}%
+ \caption@clearmargin
+ \caption@setanchor}%
\newcommand\caption@wincaption[1]{%
\ifdim\picwd=\z@
\let\caption@makecurrent\@gobbletwo
@@ -1256,6 +1256,7 @@
\caption@clearmargin
\caption@setoptions{parpic}%
\caption@setautoposition b%
+ \caption@setanchor
\expandafter\expandafter\expandafter\caption@ORI
\expandafter\expandafter\expandafter[%
\expandafter\expandafter\expandafter{%
@@ -1290,6 +1291,33 @@
\caption@@make{#1}{#2}}%
\nobreak\hspace{12pt}}%
}{}
+\caption@ifdefined\scr@caption{%
+ \long\def\caption@IfKomaPackageLoaded#1[#2]#3#4{%
+ \caption@InfoNoLine{KOMA-Script #1 package detected}
+ #3}}{%
+ \let\caption@IfKomaPackageLoaded\caption@IfPackageLoaded
+ }
+\caption@IfKomaPackageLoaded{scrextend}[2002/07/01 v3.0]{%
+ \let\caption@addmargin@env\@addmargin
+ \renewcommand*\@addmargin{%
+ \@testopt\caption@@addmargin\@tempa}%
+ \def\caption@@addmargin[#1]#2{%
+ \caption@addmargin@env[{#1}]{#2}%
+ \caption@set@addmargin
+ \ignorespaces}%
+ \newdimen\caption@addmargin@hsize
+ \newdimen\caption@addmargin@linewidth
+ \providecommand*\caption@set@addmargin{%
+ \caption@addmargin@hsize\hsize
+ \caption@addmargin@linewidth\linewidth
+ \l@addto@macro\caption@beginex@hook\caption@test@addmargin}%
+ \providecommand\caption@test@addmargin{%
+ \ifdim\hsize=\caption@addmargin@hsize
+ \ifdim\linewidth=\caption@addmargin@linewidth
+ \hsize=\linewidth
+ \fi
+ \fi}%
+ }{}%
\caption@IfPackageLoaded{sidecap}[2003/06/06 v1.6f]{%
\caption@setbool{needfreeze}{1}%
\let\caption@ORI@SC@zfloat\SC@zfloat
@@ -1297,7 +1325,8 @@
\caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\SC@RestoreCommands
\caption@freezetype{#2}%
- \let\SC@label\label}%
+ \let\SC@label\label
+ \ignorespaces}%
\providecommand*\SC@RestoreCommands{%
\let\caption=\SC@orig@caption \let\label=\SC@orig@label}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
@@ -1346,7 +1375,7 @@
\caption@gettitle{#2}%
\caption@ORI@xtablecaption[{#1}]{#2}}%
\long\def\ST@caption#1[#2]#3{\par%
- \caption@settype*{#1}%
+ \caption@settype{#1}%
\caption@setoptions{supertabular}%
\caption@setposition{\if@topcaption t\else b\fi}%
\caption@beginex{#1}{#2}{#3}%
@@ -1365,7 +1394,7 @@
\caption@gettitle{#2}%
\caption@ORI@xtablecaption[{#1}]{#2}}%
\long\def\ST@caption#1[#2]#3{\par%
- \caption@settype*{#1}%
+ \caption@settype{#1}%
\caption@setoptions{xtabular}%
\caption@set{position}{\if@topcaption t\else b\fi}%
\@initisotab
@@ -1380,18 +1409,22 @@
\caption@IfPackageLoaded{threeparttable}[2003/06/13 v3.0]{%
\let\caption@ORI@threeparttable\threeparttable
\renewcommand*\threeparttable{%
- \caption@settype{\@ifundefined{@captype}{table}{\@captype}}%
-%%% \caption@setposition{auto}% ?
- \caption@clearmargin
- \caption@setoptions{threeparttable}%
+ \caption@setthreeparttabletype{threepart}{table}%
\caption@ORI@threeparttable}%
\let\caption@ORI@measuredfigure\measuredfigure
\renewcommand*\measuredfigure{%
- \caption@settype{\@ifundefined{@captype}{figure}{\@captype}}%
+ \caption@setthreeparttabletype{measured}{figure}%
+ \caption@ORI@measuredfigure}%
+ \newcommand*\caption@setthreeparttabletype[2]{%
+ \caption@ifsubtype
+ {\def\caption@threeparttabletype{#1sub#2}%
+ \let\caption@setanchor\relax}%
+ {\caption@settype{\@ifundefined{@captype}{#2}{\@captype}}%
+ \def\caption@threeparttabletype{#1#2}}%
%%% \caption@setposition{auto}% ?
\caption@clearmargin
- \caption@setoptions{measuredfigure}%
- \caption@ORI@measuredfigure}%
+ \caption@setoptions\caption@threeparttabletype
+ \caption@setanchor}%
\def\TPT@caption#1[#2]#3{%
\gdef\TPT@docapt{%
\global\let\TPT@docapt\@undefined
@@ -1430,7 +1463,8 @@
\caption@settype{#1}%
\caption@clearmargin
%%% \caption@setoptions{wrap}%
- \caption@setoptions{wrap#1}}%
+ \caption@setoptions{wrap#1}%
+ \caption@setanchor}%
}{}
\newcommand*\caption@checkcounter[1]{%
\caption@check{\the#1}{\@nameuse{the#1}}}
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index f6e1f859bab..1957aa5167c 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,7 +6,7 @@
%%
%% caption3.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -45,7 +45,8 @@
\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/03/17 v2.3b caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/03/12 v2.4 caption3 kernel (AR)]
+\@ifundefined{kernel@ifnextchar}{\let\kernel@ifnextchar\@ifnextchar}{}
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l@addto@macro[2]{%
@@ -155,7 +156,7 @@
{\def\caption@tempa{*}\caption@@withoptargs{#1}}%
{\def\caption@tempa{}\caption@@withoptargs{#1}}}
\def\caption@@withoptargs#1{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\caption@@@withoptargs{#1}}%
{\caption@@@@withoptargs{#1}}}
\def\caption@@@withoptargs#1[#2]{%
@@ -234,28 +235,27 @@
\KV@err{No value allowed for #1}%
\expandafter\@gobble
\fi}
-\newif\ifcaptionsetup@star
\newcommand*\captionsetup{%
\caption@teststar@\@captionsetup\@gobble\@firstofone}
\newcommand*\@captionsetup[1]{%
- \captionsetup@startrue#1\captionsetup@starfalse
- \@ifnextchar[%]
- \caption@setup@options\caption@setup}
+ \kernel@ifnextchar[%]
+ {\caption@setup@options#1}%
+ {\caption@setup}}
\newcommand*\caption@setup{%
\caption@setkeys{caption}}
-\def\caption@setup@options[#1]{%
- \@ifnextchar[%]
+\def\caption@setup@options#1[#2]{%
+ \kernel@ifnextchar[%]
{\caption@stepthecounter
- \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}%
- {\caption@setup@options@{#1}}}
-\def\caption@setup@options@@#1#2[#3]#4{%
- \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}%
- \caption@setup@options@{#1}{#2}}
-\newcommand*\caption@setup@options@[2]{%
+ \@expandtwoargs\caption@setup@options@@{#2}{@\caption@thecounter}#1}%
+ {\caption@setup@options@#1{#2}}}
+\def\caption@setup@options@@#1#2#3[#4]#5{%
+ \caption@declare@option{#2}[]{\caption@setup@options@\@gobble{#4}{#5}}%
+ \caption@setup@options@#3{#1}{#2}}
+\newcommand*\caption@setup@options@[3]{%
\@bsphack
- \ifcaptionsetup@star\captionsetup@starfalse\else\caption@addtooptlist{#1}\fi
- \caption@checkoptions{#2}%
- \expandafter\caption@l@addto@list\csname caption@opt@#1\endcsname{#2}%
+ #1{\caption@addtooptlist{#2}}%
+ \caption@checkoptions{#3}%
+ \expandafter\caption@l@addto@list\csname caption@opt@#2\endcsname{#3}%
\@esphack}
\newcommand*\caption@checkoptions[1]{%
\begingroup
@@ -363,7 +363,6 @@
\expandafter\let\expandafter\KV@err\csname ORI@KV@err\caption@keydepth\endcsname
\expandafter\let\expandafter\KV@errx\csname ORI@KV@errx\caption@keydepth\endcsname
\expandafter\let\expandafter\XKV@err\csname ORI@XKV@err\caption@keydepth\endcsname
- \ifx\caption@keydepth\@empty \captionsetup@starfalse \fi
\@esphack}
\let\caption@keydepth\@empty
\newcommand*\caption@ExecuteOptions[2]{%
@@ -480,7 +479,7 @@
{\caption@@set{#1}{#2@fallback}{#3}}}
\@onlypreamble\caption@@setfallback
\newcommand*\caption@decl@package[2]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\caption@declare@package{#1}{#2}}%
{\caption@declarepackage{#1}{#2}}}
\@onlypreamble\caption@decl@package
@@ -577,7 +576,8 @@
\newcommand*\caption@stepthecounter{%
\@tempcnta\caption@thecounter
\advance\@tempcnta\@ne\relax
- \xdef\caption@thecounter{\the\@tempcnta}}
+ \xdef\caption@thecounter{\the\@tempcnta}%
+ \global\let\caption@ifoddpage\caption@ifoddpage@}
\newcommand*\caption@newlabel{\@newl@bel{caption@r}}
\newcommand*\caption@thepage{\the\c@page}
\newcommand*\caption@label[1]{%
@@ -591,20 +591,20 @@
\newcommand*\caption@pageref[1]{%
\expandafter\ifx\csname caption@r@#1\endcsname\relax
\G@refundefinedtrue % => 'There are undefined references.'
- \@latex@warning{Reference `#1' on page \thepage \space undefined}%
+ \@latex@warning{Reference `caption@#1' on page \thepage \space undefined}%
\else
\expandafter\let\expandafter\caption@thepage\csname caption@r@#1\endcsname
\fi}
-\newcommand*\caption@ifoddpage{%
+\newcommand*\caption@ifoddpage@{%
\caption@iftwoside{%
\caption@label\caption@thecounter
\caption@pageref\caption@thecounter
\ifodd\caption@thepage
- \let\caption@ifoddpage\@firstoftwo
+ \global\let\caption@ifoddpage\@firstoftwo
\else
- \let\caption@ifoddpage\@secondoftwo
+ \global\let\caption@ifoddpage\@secondoftwo
\fi
- }{\let\caption@ifoddpage\@firstoftwo}%
+ }{\global\let\caption@ifoddpage\@firstoftwo}%
\caption@ifoddpage}
\newcommand*\caption@setoptcmd[2]{%
\caption@ifinlist{#2}{0,false,no,off}{\let#1\@undefined}{\def#1{#2}}}
@@ -1607,36 +1607,36 @@
\let\glsunset\@gobble
}
\newcommand*\caption@footnote{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xfootnote
{\caption@l@stepcounter\@mpfn
\protected@xdef\@thefnmark{\thempfn}%
\@footnotemark\@footnotetext}}
\newcommand*\caption@footnotemark{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xfootnotemark
{\caption@l@stepcounter{footnote}%
\protected@xdef\@thefnmark{\thefootnote}%
\@footnotemark}}
\newcommand*\caption@footnotetext{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xfootnotenext
{\protected@xdef\@thefnmark{\thempfn}%
\@footnotetext}}
\newcommand*\caption@endnote{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xendnote
{\caption@l@stepcounter{endnote}%
\protected@xdef\@theenmark{\theendnote}%
\@endnotemark\@endnotetext}}
\newcommand*\caption@endnotemark{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xendnotemark
{\caption@l@stepcounter{endnote}%
\protected@xdef\@theenmark{\theendnote}%
\@endnotemark}}
\newcommand*\caption@endnotetext{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
\@xendnotenext
{\protected@xdef\@theenmark{\theendnote}%
\@endnotetext}}
@@ -1761,7 +1761,7 @@
\caption@teststar\caption@declaresubtype\@firstoftwo\@secondoftwo}
\@onlypreamble\DeclareCaptionSubType
\newcommand*\caption@declaresubtype[1]{%
- \@testopt{\caption@@declaresubtype{#1}}{alph}}
+ \@testopt{\caption@@declaresubtype#1}{alph}}
\@onlypreamble\caption@declaresubtype
\def\caption@@declaresubtype#1[#2]#3{%
\@ifundefined{c@#3}%
@@ -1770,23 +1770,26 @@
\@onlypreamble\caption@@declaresubtype
\newcommand*\caption@@@declaresubtype[4]{%
\caption@ifdefined@subtype{#4}%
- {\caption@Debug{Modify subtype `#4'}}%
- {\caption@Debug{New subtype `#4'}%
- \newcounter{#4}[{#3}]%
- \@namedef{ext@#4}{\csname ext@#3\endcsname}%
- \caption@declaresublistentry{#3}%
- \caption@l@addto@list\caption@subtypelist{#4}%
- \caption@subtype@hook{#4}}%
- \caption@ifdefined\contentsuse{%
- \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
- \@namedef{#4name}{}%
- \@namedef{#4autorefname}{\csname #3autorefname\endcsname}%
- #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
+ {\caption@Info{Modify subtype `#4'}}%
+ {\caption@Info{New subtype `#4'}%
+ \@ifundefined{c@#4}%
+ {\newcounter{#4}[#3]%
+ \@namedef{#4name}{}%
+ \@namedef{#4autorefname}{\csname #3autorefname\endcsname}%
+ \@namedef{ext@#4}{\csname ext@#3\endcsname}%
+ \caption@declaresublistentry{#3}%
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
+ \caption@l@addto@list\caption@subtypelist{#4}%
+ \caption@subtype@hook{#4}}%
+ {\caption@subtypesource\caption@subtype@source{#4}%
+ \caption@Error{The counter `#4' was already defined by\MessageBreak\caption@subtype@source}}}%
+ #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
{\@namedef{p@#4}{}%
\@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}%
{\@namedef{p@#4}{\csname the#3\endcsname}%
\@namedef{the#4}{\@nameuse{#2}{#4}}}%
- \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
+ \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
\@onlypreamble\caption@@@declaresubtype
\newcommand*\caption@declaresublistentry{%
\caption@ifdefined\l@chapter
@@ -1833,6 +1836,12 @@
\newcommand*\caption@subtypelist{}
\newcommand*\caption@ifdefined@subtype{%
\caption@ifin@list\caption@subtypelist}
+\newcommand*\caption@subtypesource[2]{%
+ \caption@ifdefined@subtype{#2}%
+ {\def#1{\noexpand\DeclareCaptionSubType (offered by the caption package)}}%
+ {\caption@ifin@list\sf@counterlist{#2}%
+ {\def#1{\noexpand\newsubfloat (offered by the subfig package)}}%
+ {\def#1{an unknown document class or package}}}}
\newcommand*\ForEachCaptionSubType{%
\@ifstar
{\caption@foreach@subtype\@gobble}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3_2019-09-01.sty b/Master/texmf-dist/tex/latex/caption/caption3_2019-09-01.sty
index bbdd12811b4..017eb9781eb 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3_2019-09-01.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3_2019-09-01.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2019/09/01 v1.8d caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2022/03/17 v1.8i caption3 kernel (AR)]
\providecommand\caption@FixArabTeX{%
\def\caption@tempa##1{}%
\ifx\caption@tempa\@gobble
@@ -259,16 +259,16 @@
\newcommand*\@captionsetup[1]{%
\captionsetup@startrue#1\captionsetup@starfalse
\@ifnextchar[\caption@setup@options\caption@setup}
-\newcommand*\caption@setup{\caption@setkeys{caption}}
+\newcommand*\caption@setup{%
+ \caption@setkeys{caption}}
\def\caption@setup@options[#1]{%
- \@ifnextchar[%
+ \@ifnextchar[%]
{\caption@stepthecounter
- \caption@withoptargs{\@expandtwoargs
- \caption@setup@options@i{#1}{@\caption@thecounter}}}%
+ \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}%
{\caption@setup@options@{#1}}}
-\newcommand*\caption@setup@options@i[4]{%
- \caption@setup@options@{#1}{#2}%
- \caption@declare@option{#2}[]{\captionsetup#3{#4}}}
+\def\caption@setup@options@@#1#2[#3]#4{%
+ \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}%
+ \caption@setup@options@{#1}{#2}}
\newcommand*\caption@setup@options@[2]{%
\@bsphack
\ifcaptionsetup@star\captionsetup@starfalse\else\caption@addtooptlist{#1}\fi
diff --git a/Master/texmf-dist/tex/latex/caption/caption3_2020-07-29.sty b/Master/texmf-dist/tex/latex/caption/caption3_2020-07-29.sty
index 2ae1ed58ce7..a50bf03e7b9 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3_2020-07-29.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3_2020-07-29.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/07/29 v1.13 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2022/04/06 v1.13b caption3 kernel (AR)]
\providecommand\caption@FixArabTeX{%
\def\caption@tempa##1{}%
\ifx\caption@tempa\@gobble
@@ -247,15 +247,15 @@
\captionsetup@startrue#1\captionsetup@starfalse
\@ifnextchar[%]
\caption@setup@options\caption@setup}
-\newcommand*\caption@setup{\caption@setkeys{caption}}
+\newcommand*\caption@setup{%
+ \caption@setkeys{caption}}
\def\caption@setup@options[#1]{%
\@ifnextchar[%]
{\caption@stepthecounter
- \caption@withoptargs{\@expandtwoargs
- \caption@setup@options@i{#1}{@\caption@thecounter}}}%
+ \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}%
{\caption@setup@options@{#1}}}
-\newcommand*\caption@setup@options@i[4]{%
- \caption@declare@option{#2}[]{\captionsetup#3{#4}}%
+\def\caption@setup@options@@#1#2[#3]#4{%
+ \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}%
\caption@setup@options@{#1}{#2}}
\newcommand*\caption@setup@options@[2]{%
\@bsphack
@@ -1642,17 +1642,17 @@
\@namedef{ext@#4}{\csname ext@#3\endcsname}%
\caption@declaresublistentry{#3}%
\caption@l@addto@list\caption@subtypelist{#4}%
- \caption@subtype@hook{#4}}%
- \caption@ifdefined\contentsuse{%
- \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
- \@namedef{#4name}{}%
- \@namedef{#4autorefname}{\csname #3autorefname\endcsname}%
- #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
+ \caption@subtype@hook{#4}%
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
+ \@namedef{#4name}{}%
+ \@namedef{#4autorefname}{\csname #3autorefname\endcsname}}%
+ #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
{\@namedef{p@#4}{}%
\@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}%
{\@namedef{p@#4}{\csname the#3\endcsname}%
\@namedef{the#4}{\@nameuse{#2}{#4}}}%
- \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
+ \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
\@onlypreamble\caption@@@declaresubtype
\newcommand*\caption@declaresublistentry{%
\caption@ifdefined\l@chapter
diff --git a/Master/texmf-dist/tex/latex/caption/caption3_2020-10-26.sty b/Master/texmf-dist/tex/latex/caption/caption3_2020-10-26.sty
index 98d8612ca45..b5cd17ba268 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3_2020-10-26.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3_2020-10-26.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/10/26 v2.2f caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2022/04/06 v2.2h caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l@addto@macro[2]{%
@@ -232,15 +232,15 @@
\captionsetup@startrue#1\captionsetup@starfalse
\@ifnextchar[%]
\caption@setup@options\caption@setup}
-\newcommand*\caption@setup{\caption@setkeys{caption}}
+\newcommand*\caption@setup{%
+ \caption@setkeys{caption}}
\def\caption@setup@options[#1]{%
\@ifnextchar[%]
{\caption@stepthecounter
- \caption@withoptargs{\@expandtwoargs
- \caption@setup@options@i{#1}{@\caption@thecounter}}}%
+ \@expandtwoargs\caption@setup@options@@{#1}{@\caption@thecounter}}%
{\caption@setup@options@{#1}}}
-\newcommand*\caption@setup@options@i[4]{%
- \caption@declare@option{#2}[]{\captionsetup#3{#4}}%
+\def\caption@setup@options@@#1#2[#3]#4{%
+ \caption@declare@option{#2}[]{\caption@setup@options@{#3}{#4}}%
\caption@setup@options@{#1}{#2}}
\newcommand*\caption@setup@options@[2]{%
\@bsphack
@@ -1677,17 +1677,17 @@
\@namedef{ext@#4}{\csname ext@#3\endcsname}%
\caption@declaresublistentry{#3}%
\caption@l@addto@list\caption@subtypelist{#4}%
- \caption@subtype@hook{#4}}%
- \caption@ifdefined\contentsuse{%
- \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
- \@namedef{#4name}{}%
- \@namedef{#4autorefname}{\csname #3autorefname\endcsname}%
- #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
+ \caption@subtype@hook{#4}%
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
+ \@namedef{#4name}{}%
+ \@namedef{#4autorefname}{\csname #3autorefname\endcsname}}%
+ #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
{\@namedef{p@#4}{}%
\@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}%
{\@namedef{p@#4}{\csname the#3\endcsname}%
\@namedef{the#4}{\@nameuse{#2}{#4}}}%
- \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
+ \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
\@onlypreamble\caption@@@declaresubtype
\newcommand*\caption@declaresublistentry{%
\caption@ifdefined\l@chapter
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2007-04-16.sty b/Master/texmf-dist/tex/latex/caption/caption_2007-04-16.sty
index 2e0a89931a4..f7e2927a2af 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2007-04-16.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2007-04-16.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2007/04/16 v3.0q Customising captions (AR)]
+\ProvidesPackage{caption}[2022/07/10 v3.0r Customising captions (AR)]
\RequirePackage{caption3}[=2007/01/31] % needs v1.0l or newer
\@ifpackageloaded{caption2}{%
\caption@Error{You can't use both the caption *and* caption2 package}%
@@ -411,7 +411,7 @@
\def\captionsetup##1{\g@addto@macro\SC@CAPsetup{,##1}}%
\let\caption@SC\caption
\def\caption{\caption@caption\caption@SC}%
- }%
+ \ignorespaces}%
\let\caption@endSC@FLOAT\endSC@FLOAT
\def\endSC@FLOAT{%
\let\@captype\SC@captype
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty b/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty
index a3252632f01..04f6b589bec 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2010/01/09 v3.1m Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/07/10 v3.1n Customizing captions (AR)]
\newcommand*\caption@Info[1]{\PackageInfo{caption}{#1\@gobble}}
\@onlypreamble\caption@Info
\RequirePackage{caption3}[=2008/08/24] % needs v1.1j or newer
@@ -1452,7 +1452,8 @@
\caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\let\caption\caption@ORI
\caption@settype*{#2}%
- \caption@freeze*}%
+ \caption@freeze*%
+ \ignorespaces}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
\def\endSC@FLOAT{%
\let\caption@ORI@settype\caption@settype
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty b/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty
index ad78a2452e2..8db308d38cb 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2011/11/10 v3.2e Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/07/10 v3.2f Customizing captions (AR)]
\RequirePackage{caption3}[=2011/08/30] % needs v1.4 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1573,7 +1573,8 @@
\SC@RestoreCommands
\caption@settype*{#2}%
\caption@freeze
- \let\SC@label\label}%
+ \let\SC@label\label
+ \ignorespaces}%
\providecommand*\SC@RestoreCommands{%
\let\caption=\SC@orig@caption \let\label=\SC@orig@label}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty b/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty
index 0ab687fe055..0d148a31070 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2019/09/01 v3.3d Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/07/10 v3.3e Customizing captions (AR)]
\RequirePackage{caption3}[=2019/09/01] % needs v1.8d or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1722,7 +1722,8 @@
\caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\SC@RestoreCommands
\caption@freezetype{#2}%
- \let\SC@label\label}%
+ \let\SC@label\label
+ \ignorespaces}%
\providecommand*\SC@RestoreCommands{%
\let\caption=\SC@orig@caption \let\label=\SC@orig@label}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty b/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty
index 318253fe30b..6067c422a27 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/09/28 v3.4n Customizing captions (AR)] % Backport of commit 43567491e5b075d661c080bca298f5428f289758 from 2020/09/28
+\ProvidesPackage{caption}[2022/07/10 v3.4o Customizing captions (AR)]
\RequirePackage{caption3}[=2020/07/29] % needs v1.13 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1362,7 +1362,8 @@
\caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\SC@RestoreCommands
\caption@freezetype{#2}%
- \let\SC@label\label}%
+ \let\SC@label\label
+ \ignorespaces}%
\providecommand*\SC@RestoreCommands{%
\let\caption=\SC@orig@caption \let\label=\SC@orig@label}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
diff --git a/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty b/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty
index 37212b522fd..a558a929150 100644
--- a/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/03/01 v3.5h Customizing captions (AR)]
+\ProvidesPackage{caption}[2022/07/10 v3.5i Customizing captions (AR)]
\RequirePackage{caption3}[=2020/10/06] % needs v2.2b or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1244,7 +1244,8 @@
\caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\SC@RestoreCommands
\caption@freezetype{#2}%
- \let\SC@label\label}%
+ \let\SC@label\label
+ \ignorespaces}%
\providecommand*\SC@RestoreCommands{%
\let\caption=\SC@orig@caption \let\label=\SC@orig@label}%
\let\caption@ORI@endSC@FLOAT\endSC@FLOAT
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 01eaf2de762..b55af9c980f 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -6,7 +6,7 @@
%%
%% subcaption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -39,8 +39,10 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
\DeclareCurrentRelease{v1}{2007/12/06}
-\ProvidesPackage{subcaption}[2022/01/07 v1.5 Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2023/02/19 v1.6 Sub-captions (AR)]
\RequirePackage{caption}[2010/01/09] % we need at least v3.1m
+\newcommand*\subcaption@Info{%
+ \PackageInfo{subcaption}}
\newcommand*\subcaption@Warning{%
\PackageWarning{subcaption}}
\newcommand*\subcaption@Error[1]{%
@@ -51,22 +53,8 @@
section about errors.\MessageBreak\@ehc}
\newcommand*\subcaption@OutsideFloat[1]{%
\subcaption@Error{\string#1 outside float}}
-\newcommand*\subcaption@CheckCompatibility{%
- \@ifpackageloaded{subfigure}{%
- \subcaption@Error
- {This package can't be used in cooperation\MessageBreak
- with the subfigure package}%
- \endinput}{}%
- \@ifpackageloaded{subfig}{%
- \subcaption@Error
- {This package can't be used in cooperation\MessageBreak
- with the subfig package}%
- \endinput}{}%
-}
-\subcaption@CheckCompatibility
-\caption@AtBeginDocument{%
- \subcaption@CheckCompatibility
- \let\subcaption@CheckCompatibility\@undefined}
+\newcommand*\subcaptionsetup[1][]{%
+ \@ifstar{\captionsetup*[{sub#1}]}{\captionsetup[{sub#1}]}}
\providecommand\setcaptionsubtype{%
\caption@iftype
{\@ifstar{\captionsetup{subtype*}}{\captionsetup{subtype}}}%
@@ -82,7 +70,9 @@
{\subcaption@OutsideFloat{subcaptiongroup*}}}
{}
\newcommand*\subcaption@minipage{%
- \@testopt\subcaption@iminipage b}
+ \kernel@ifnextchar[%]
+ \subcaption@iminipage
+ {\caption@ifcaption{\subcaption@iminipage[t]}{\subcaption@iminipage[b]}}}
\def\subcaption@iminipage[#1]{%
\def\subcaption@tempa{\subcaption@iiminipage{#1}}%
\caption@withoptargs\subcaption@tempa}
@@ -103,6 +93,8 @@
\subcaption@endminipage@hook
\endminipage}
\providecommand*\@subfloatboxreset{}
+\providecommand*\caption@ifcaption{\caption@ifflag2} % caption >= v3.3 < v3.6
+\providecommand*\caption@ifflag[1]{\@secondoftwo} % caption < v3.3
\newenvironment{subcaptionblock}{\subcaption@minipage}{\subcaption@endminipage}
\newcommand*\subcaption@newminipage[1]{%
\newenvironment{#1}{\subcaption@minipage@{#1}}{\subcaption@endminipage}}
@@ -222,8 +214,8 @@
\DeclareCaptionLabelFormat{subparens}{(#2)}
\let\caption@setkeys@ORI\caption@setkeys
\@ifundefined{caption@SetupOptions} % caption3 v1.3
- {\renewcommand\caption@setkeys[2]{\captionsetup[sub]{#2}}}
- {\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}}
+ {\renewcommand\caption@setkeys[2]{\subcaptionsetup{#2}}}
+ {\caption@SetupOptions{subcaption}{\subcaptionsetup{#2}}}
\@ifundefined{caption@smaller} % caption3 v1.7-169
{\caption@ExecuteOptions{subcaption}{%
font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}}
@@ -232,13 +224,19 @@
\caption@ProcessOptions*{subcaption}
\let\caption@setkeys\caption@setkeys@ORI
\let\caption@setkeys@ORI\@undefined
+\newcommand*\subcaption@DeclareType[1]{%
+ \@ifundefined{c@sub#1}%
+ {\DeclareCaptionSubType{#1}}%
+ {\caption@subtypesource\caption@subtype@source{sub#1}%
+ \subcaption@Info{The counter `sub#1' was already defined by\MessageBreak\caption@subtype@source}}}
+\providecommand*\caption@subtypesource[2]{\def#1{a different package}} % caption3 v2.4
\@ifundefined{ForEachCaptionType} % caption3 v1.13
{\@ifundefined{caption@ForEachType} % caption3 v1.4a
- {\@ifundefined{c@figure}{}{\DeclareCaptionSubType{figure}}%
- \@ifundefined{c@table}{}{\DeclareCaptionSubType{table}}%
- \caption@For{typelist}{\DeclareCaptionSubType{#1}}}
- {\caption@ForEachType{\DeclareCaptionSubType{#1}}}}
- {\ForEachCaptionType{\DeclareCaptionSubType{#1}}}
+ {\@ifundefined{c@figure}{}{\subcaption@DeclareType{figure}}%
+ \@ifundefined{c@table}{}{\subcaption@DeclareType{table}}%
+ \caption@For{typelist}{\subcaption@DeclareType{#1}}}
+ {\caption@ForEachType{\subcaption@DeclareType{#1}}}}
+ {\ForEachCaptionType{\subcaption@DeclareType{#1}}}
\newcommand*\subcaption@newabbreviation[3]{%
\newcommand*{#1}{%
\caption@iftype
@@ -255,19 +253,40 @@
\subcaption@newabbreviation\phantomsubcaption\phantomcaption\relax
\subcaption@newabbreviation\subcaptionlistentry\captionlistentry\caption@gobble
\subcaption@newabbreviation\subcaptiontext\captiontext\caption@gobble
-\@ifclassloaded{memoir}{\let\subfloat\undefined\let\endsubfloat\undefined}{}
+\providecommand*\caption@subfloatrow@hook{} % caption < v3.7
+\g@addto@macro\caption@subfloatrow@hook{%
+ \let\caption\subcaption
+ \let\phantomcaption\phantomsubcaption
+ \let\captionlistentry\subcaptionlistentry
+ \let\captiontext\subcaptiontext}
\caption@AtBeginDocument{%
- \providecommand*\subfloat{%
- \kernel@ifnextchar[%]
- \subcaption@subfloat
- \subcaption@subfloat@}}
-\long\def\subcaption@subfloat[#1]{%
+ \begingroup
+ \newenvironment{subcaption@memoir@subfloat}{}{}%
+ \ifx\subfloat\subcaption@memoir@subfloat
+ \endgroup
+ % "subfloat" = empty environment, defined by memoir
+ \renewcommand*\subfloat{%
+ \def\subcaption@currenvir{subfloat}%
+ \ifx\@currenvir\subcaption@currenvir
+ % emulate (empty) subfloat environment
+ \else
+ \expandafter\subcaption@subfloat
+ \fi}%
+ \else
+ \endgroup
+ \providecommand*\subfloat{\subcaption@subfloat}%
+ \fi}
+\newcommand*\subcaption@subfloat{%
+ \kernel@ifnextchar[%]
+ \subcaption@@subfloat
+ \subcaption@subfloat@}
+\long\def\subcaption@@subfloat[#1]{%
\kernel@ifnextchar[%]
- {\subcaption@@subfloat{#1}}%
- {\subcaption@@@subfloat\subcaptionbox{#1}}}
-\long\def\subcaption@@subfloat#1[#2]{%
- \subcaption@@@subfloat{\subcaptionbox[{#1}]}{#2}}
-\long\def\subcaption@@@subfloat#1#2#3{%
+ {\subcaption@@@subfloat{#1}}%
+ {\subcaption@@subfloat@\subcaptionbox{#1}}}
+\long\def\subcaption@@@subfloat#1[#2]{%
+ \subcaption@@subfloat@{\subcaptionbox[{#1}]}{#2}}
+\long\def\subcaption@@subfloat@#1#2#3{%
\subcaption@getlabel{#3}%
#1{#2\caption@thelabel}{\let\label\caption@gobble#3}%
\subcaption@clrlabel