summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/caption/caption3.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/caption/caption3.dtx')
-rw-r--r--macros/latex/contrib/caption/caption3.dtx37
1 files changed, 24 insertions, 13 deletions
diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx
index 956cc40eb8..ea759a3c87 100644
--- a/macros/latex/contrib/caption/caption3.dtx
+++ b/macros/latex/contrib/caption/caption3.dtx
@@ -32,12 +32,12 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3646}
+% \CheckSum{3648}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption3.drv}[2019/09/10 v2.0 Implementation of the caption kernel]
+\ProvidesFile{caption3.drv}[2020/09/12 v2.1 Implementation of the caption kernel]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -61,7 +61,7 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
%
-\usepackage{caption3}[2020/07/27]
+\usepackage{caption3}[2020/09/12]
%
\DeclareRobustCommand*\eTeX{\texorpdfstring
{\leavevmode\hbox{$\varepsilon$}-\TeX}%
@@ -192,7 +192,7 @@
%
% \begin{macrocode}
\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)]
% \end{macrocode}
%
% \section{Generic helpers}
@@ -1853,12 +1853,13 @@
% \changes{v1.2}{2007/11/11}{\cs{captionbox} renamed to \cs{caption@parbox}}
% \changes{v1.5}{2012/03/15}{\cs{caption@parbox} adapted to \cs{DeclareCaptionBox}}
% \changes{v1.6}{2013/05/02}{Option \opt{boxsep=} added}
+% \changes{v2.1b}{2020/09/17}{Missing braces re-added to \opt{colorbox} option code}
% \begin{macrocode}
\DeclareCaptionBox{empty}{}
\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
@@ -2992,6 +2993,7 @@
% |\AtCaptionPackage|\marg{code}\\
% can be used by the document class adaption packages to execute extra code
% if the \package{caption} package is loaded (later on).
+% This code will by applied right before the package options are evaluated.
% \begin{macrocode}
\newcommand*\AtCaptionPackage{%
\g@addto@macro\caption@documentclass@code}
@@ -3003,6 +3005,23 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\AfterCaptionPackage}
+% \changes{v2.1}{2020/09/12}{This macro added}
+% |\AfterCaptionPackage|\marg{code}\\
+% can be used by the document class adaption packages to execute extra code
+% if the \package{caption} package is loaded (later on).
+% This code will by applied at the very end.
+% \begin{macrocode}
+\newcommand*\AfterCaptionPackage{%
+ \g@addto@macro\caption@endtitles@code}
+\@onlypreamble\AfterCaptionPackage
+% \end{macrocode}
+% \begin{macrocode}
+\providecommand*\caption@endtitles@code{}
+\@onlypreamble\caption@endtitles@code
+% \end{macrocode}
+% \end{macro}
+%
% \section{Babel support}
%
% \begin{macro}{\caption@IfBabelPackageLoaded}
@@ -3120,7 +3139,6 @@
%
% \begin{macrocode}
\ifFBOldFigTabCaptions
- \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption@ifdefined\extrasfrench{%
\addto\extrasfrench{%
\caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}%
@@ -3128,18 +3146,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
% \end{macrocode}