summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-01 20:11:11 +0000
committerKarl Berry <karl@freefriends.org>2023-10-01 20:11:11 +0000
commitd4f1baaa0628bf1f27ff54687e54707424ebba7b (patch)
tree68e586893d523dfc50179c5063a0fe9c7409ede8 /Master/texmf-dist/tex/latex/caption
parentf23e2c912dde2844552bcce852da26d62d527b04 (diff)
caption (1oct23)
git-svn-id: svn://tug.org/texlive/trunk@68425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption-koma.sto33
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption-memoir.sto16
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty6
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty5
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty8
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty8
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty8
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty8
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty8
9 files changed, 61 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption-koma.sto b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
index 143b867423e..a79452c1f18 100644
--- a/Master/texmf-dist/tex/latex/caption/caption-koma.sto
+++ b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
@@ -6,7 +6,7 @@
%%
%% caption-koma.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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.sto}[2022/12/27 v2.0c Adaption of the caption package to the KOMA-Script document classes (AR)]
+\ProvidesFile{caption-koma.sto}[2023/09/08 v2.0e 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,14 +97,16 @@
\newcommand*\caption@setcapindent{%
\captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
\caption@ifdefined\cap@indent{\caption@setcapindent}{}
-\g@addto@macro\onelinecaptionstrue{\caption@setsinglelinecheck{true}}%
-\g@addto@macro\onelinecaptionsfalse{\caption@setsinglelinecheck{false}}%
-\ifonelinecaptions
- \onelinecaptionstrue
-\else
- \onelinecaptionsfalse
-\fi
-\DeclareCaptionFormat{default}[#1#2#3\par]{%
+\DeclareCaptionSinglelinecheck{koma}{%
+ \ifonelinecaptions
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\SetCaptionDefault{singlelinecheck}{koma}
+\g@addto@macro\onelinecaptionstrue{\caption@setsinglelinecheck{koma}}
+\g@addto@macro\onelinecaptionsfalse{\caption@setsinglelinecheck{koma}}
+\DeclareCaptionFormat{koma}[#1#2#3\par]{%
\ifdofullc@p
\caption@useformat{hang}{#1}{#2}{#3}%
\else
@@ -117,8 +119,11 @@
\fi\fi
#3\par
\fi}
-\SetCaptionFallback{labelformat}{autodot}
-\DeclareCaptionLabelSeparator{default}{\captionformat}
+\SetCaptionDefault{format}{koma}
+\DeclareCaptionLabelFormat{koma}{\bothIfFirst{#1}{\nobreakspace}#2\autodot}
+\SetCaptionFallback{labelformat}{koma}
+\DeclareCaptionLabelSeparator{koma}{\captionformat}
+\SetCaptionDefault{labelseparator}{koma}
\DeclareCaptionFont{scr@font}{\scr@fnt@caption}
\DeclareCaptionFont{scr@labelfont}{\scr@fnt@captionlabel}
\SetCaptionDefault{font}{scr@font}
@@ -140,14 +145,14 @@
\else
\@tablecaptionabovefalse
\fi
-\caption@ifdefined\@figurecaptionabovetrue{%
+\@ifundefined{@figurecaptionabovetrue}{}{%
\g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}%
\g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}%
\if@figurecaptionabove
\@figurecaptionabovetrue
\else
\@figurecaptionabovefalse
- \fi}{}
+ \fi}
\AtCaptionPackage{%
\let\caption@koma@figureposition\KV@caption@figureposition
\DeclareCaptionOption{figureposition}{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
index b7746ea5b8c..e9ea84d9bd6 100644
--- a/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
+++ b/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
@@ -6,7 +6,7 @@
%%
%% caption-memoir.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.sto}[2022/03/02 v2.2b Adaption of the caption package to the memoir document class (AR)]
+\ProvidesFile{caption-memoir.sto}[2023/09/08 v2.2c 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}
@@ -68,6 +68,18 @@
\else
#2%
\fi}}%
+\AtBeginDocument{\renewcommand*\endsidecaption{%
+ \m@mscapend@fbox
+ \caption@refstepcounter\@captype
+ \m@mscaplabel
+ \csname m@mscapcheckside\endcsname %<--- added 2012/08/19
+ \begin{lrbox}{\m@mscap@capbox}%
+ \begin{minipage}[c]{\sidecapwidth}%
+ \sidecapstyle
+ \@caption\@captype[\m@mscap@fortoc]{\m@mscap@forcap}
+ \end{minipage}%
+ \end{lrbox}%
+ \m@mscapopboxes}}
\endinput
%%
%% End of file `caption-memoir.sto'.
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index d1b54cae5e0..12303a3de3a 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}[2023/07/31 v3.6n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.6o Customizing captions (AR)]
\RequirePackage{caption3}[2023/07/31] % needs v2.4d or newer
\caption@ifdocumentclass{unknown}%
{\caption@WarningNoLine{%
@@ -628,8 +628,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\caption@ifdefined\NR@gettitle
- {\NR@gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR@gettitle{#1}}% % support for recent versions of nameref package
+ {\caption@ifdefined\NR@sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\subcaptionsetup{%
\caption@teststar\@subcaptionsetup*{}}
\newcommand*\@subcaptionsetup[1]{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index aa618a68df9..37717649f6e 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -405,6 +405,11 @@
\@onlypreamble\caption@SetupOptions
\newcommand*\caption@SetupOptions@list{}
\@onlypreamble\caption@SetupOptions@list
+%% Unfortunately we have to patch internal \LaTeX\ code here
+%% to get rid of unnecessary ``Option clash'' error messages.
+%% I have asked Frank Mittelbach and David Carlisle in 2018
+%% and have asked Frank again in 2020 for a proper interface instead of
+%% this dirty hack, but my requests got declined.
\let\caption@onefilewithoptions\@onefilewithoptions
\def\@onefilewithoptions#1[#2]{%
\begingroup
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 04f6b589bec..9559fadb740 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
@@ -6,7 +6,7 @@
%%
%% fallback/v3.1/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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.1n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.1o Customizing captions (AR)]
\newcommand*\caption@Info[1]{\PackageInfo{caption}{#1\@gobble}}
\@onlypreamble\caption@Info
\RequirePackage{caption3}[=2008/08/24] % needs v1.1j or newer
@@ -435,8 +435,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\@ifundefined{NR@gettitle}%
- {\def\@currentlabelname{#1}}%
- {\NR@gettitle{#1}}}
+ {\@ifundefined{NR@sect}{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR@gettitle{#1}}} % support for recent versions of nameref package
\def\caption@caption{%
\caption@iftype
{\caption@checkgrouplevel\@empty\caption
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 8db308d38cb..8a6d8d0ca10 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
@@ -6,7 +6,7 @@
%%
%% fallback/v3.2/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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.2f Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.2g Customizing captions (AR)]
\RequirePackage{caption3}[=2011/08/30] % needs v1.4 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -900,8 +900,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\caption@ifundefined\NR@gettitle
- {\def\@currentlabelname{#1}}%
- {\NR@gettitle{#1}}}
+ {\caption@ifundefined\NR@sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR@gettitle{#1}}} % support for recent versions of nameref package
\def\caption@DeclareSubType sub#1\@nil{%
\caption@Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption@c@#1}{0}%
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 0d148a31070..340ebc7ae26 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
@@ -6,7 +6,7 @@
%%
%% fallback/v3.3/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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.3e Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.3f Customizing captions (AR)]
\RequirePackage{caption3}[=2019/09/01] % needs v1.8d or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1053,8 +1053,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\caption@ifundefined\NR@gettitle
- {\def\@currentlabelname{#1}}%
- {\NR@gettitle{#1}}}
+ {\caption@ifundefined\NR@sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR@gettitle{#1}}} % support for recent versions of nameref package
\def\caption@DeclareSubType sub#1\@nil{%
\caption@Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption@beginsub#1}{\caption@beginsubfloat{#1}}}
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 6067c422a27..0b4277f63b7 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
@@ -6,7 +6,7 @@
%%
%% fallback/v3.4/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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.4o Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.4p Customizing captions (AR)]
\RequirePackage{caption3}[=2020/07/29] % needs v1.13 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -666,8 +666,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\caption@ifdefined\NR@gettitle
- {\NR@gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR@gettitle{#1}}% % support for recent versions of nameref package
+ {\caption@ifdefined\NR@sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\caption@subtypehook{%
\ifx\caption\caption@subcaption \else
\caption@warmup
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 a558a929150..d2368f149e7 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
@@ -6,7 +6,7 @@
%%
%% fallback/v3.5/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
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.5i Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.5j Customizing captions (AR)]
\RequirePackage{caption3}[=2020/10/06] % needs v2.2b or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -568,8 +568,8 @@
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
\caption@ifdefined\NR@gettitle
- {\NR@gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR@gettitle{#1}}% % support for recent versions of nameref package
+ {\caption@ifdefined\NR@sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\caption@subtypehook{%
\ifx\caption\caption@subcaption \else
\caption@warmup