summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-18 21:31:05 +0000
committerKarl Berry <karl@freefriends.org>2020-09-18 21:31:05 +0000
commit0479a07f9b8bf820dc913d5d467aaf6d877cff79 (patch)
tree66fa0eb1a98946fab3f2c485387756e1e9d86e5c /Master/texmf-dist/tex/latex/caption
parenta6ec80836fdb61ba50f1d39a9d0662e54735308c (diff)
caption (18sep20)
git-svn-id: svn://tug.org/texlive/trunk@56374 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.sto4
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty7
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty17
3 files changed, 14 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption-koma.sto b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
index 81fa13cf223..3a89f0355df 100644
--- a/Master/texmf-dist/tex/latex/caption/caption-koma.sto
+++ b/Master/texmf-dist/tex/latex/caption/caption-koma.sto
@@ -38,7 +38,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.sto}[2020/08/22 v2.0 Adaption of the caption package to the KOMA-Script document classes (AR)]
+\ProvidesFile{caption-koma.sto}[2020/09/12 v2.0a 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{%
@@ -146,7 +146,7 @@
\else
\@captionabovefalse
\fi
-\AtBeginCaption{\caption@AtBeginLongtable{%
+\AfterCaptionPackage{\caption@AtBeginLongtable{%
\def\@captionabovetrue{\LT@captionsetup{position=t}}%
\def\@captionabovefalse{\LT@captionsetup{position=b}}}}
\g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 2a9beffc938..8cfb55e3e1b 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -38,8 +38,8 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/09/02 v3.5a Customizing captions (AR)]
-\RequirePackage{caption3}[2020/08/30] % needs v2.0 or newer
+\ProvidesPackage{caption}[2020/09/12 v3.5b Customizing captions (AR)]
+\RequirePackage{caption3}[2020/09/12] % needs v2.1 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
Unknown document class (or package),\MessageBreak
@@ -1382,6 +1382,9 @@
%%% \caption@setoptions{wrap}%
\caption@setoptions{wrap#1}}%
}{}
+\caption@endtitles@code
+\let\caption@endtitles@code\@undefined
+\let\AfterCaptionPackage\@firstofone
\endinput
%%
%% End of file `caption.sty'.
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 625d1165586..278723d83dc 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -38,7 +38,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/09/11 v2.0b caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/09/17 v2.1b caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l@addto@macro[2]{%
@@ -651,7 +651,7 @@
\DeclareCaptionBox{none}{#2}
\DeclareCaptionBox{parbox}{\parbox[b]{#1}{#2}}
\DeclareCaptionBox{colorbox}{%
- \colorbox\caption@boxcolor{%
+ \colorbox{\caption@boxcolor}{%
\setlength\caption@tempdima{#1}%
\addtolength\caption@tempdima{-2\fboxsep}%
\linewidth\caption@tempdima
@@ -1123,6 +1123,11 @@
\@onlypreamble\AtCaptionPackage
\providecommand*\caption@documentclass@code{}
\@onlypreamble\caption@documentclass@code
+\newcommand*\AfterCaptionPackage{%
+ \g@addto@macro\caption@endtitles@code}
+\@onlypreamble\AfterCaptionPackage
+\providecommand*\caption@endtitles@code{}
+\@onlypreamble\caption@endtitles@code
\newcommand*\caption@IfBabelPackageLoaded[4]{%
\caption@ifdefined#2\@firstofone\caption@AtBeginDocument{%
\caption@if@bool{\@nameuse{caption@ifbabel@#1}}%
@@ -1157,7 +1162,6 @@
\providecommand\caption@french@labelseparator{\CaptionSeparator}%
\DeclareCaptionLabelSeparator{colon}{\autospace@beforeFDP : }%
\ifFBOldFigTabCaptions
- \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption@ifdefined\extrasfrench{%
\addto\extrasfrench{%
\caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}%
@@ -1165,18 +1169,11 @@
\addto\extrasacadian{%
\caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}%
\else
- \typeout{OldFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed
\ifFBCustomiseFigTabCaptions
- \typeout{CustomiseFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption@AtBeginDocument{%
\ifFB@mainlanguage@FR
- \typeout{mainlanguage=FR}%
\SetCaptionDefault{labelseparator}{french}%
- \else
- \typeout{mainlanguage=other}% %%%%%%%%%%% <= needs to be removed
\fi}%
- \else
- \typeout{CustomiseFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed
\fi
\fi
}{}