texlive[56374] Master/texmf-dist: caption (18sep20)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 18 23:31:05 CEST 2020
Revision: 56374
http://tug.org/svn/texlive?view=revision&revision=56374
Author: karl
Date: 2020-09-18 23:31:05 +0200 (Fri, 18 Sep 2020)
Log Message:
-----------
caption (18sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex
trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG 2020-09-18 21:31:05 UTC (rev 56374)
@@ -120,7 +120,7 @@
v3.5 (2020/08/30)
- If a document class defines \caption at documentclass, an adaption to the caption package will be loaded as caption-<documentclass>.sto
-- New commands \SetCaptionDefault and \AtCaptionPackage for usage in document classes or document class adaptions
+- New commands \SetCaptionDefault, \AtCaptionPackage, and \AfterCaptionPackage for usage in document classes or document class adaptions
- Document class support re-written (using the new commands above)
- New commands \caption at switchdefault and \caption at restoredefault for usage in babel language packages
- Babel language support re-written (using the new commands above); furthermore it's independent on the load order now
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2020-09-18 21:31:05 UTC (rev 56374)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-09-11
+Release 2020-09-17
Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
Modified: trunk/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex 2020-09-18 21:31:05 UTC (rev 56374)
@@ -31,7 +31,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-eng.tex}[2020/08/30 v3.5 The caption package]
+\ProvidesFile{caption-eng.tex}[2020/09/12 v3.5 The caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up.
%\errorcontextlines=3
@@ -4184,7 +4184,7 @@
But some adaptions have to be done for the \package{caption} package,
and for this reason the hook
-\begin{quote}|\At|\-|Caption|\-|Package|\marg{code}\end{quote}
+\begin{quote}|\AtCaptionPackage|\marg{code}\end{quote}
is offered to authors of adaption files.
The \meta{code} inside the hook will be executed right before the given package
options will be evaluated.
@@ -4192,8 +4192,15 @@
For example the adaption file for the \KOMAScript\ document classes
uses |\At|\-|Begin|\-|Caption| to re-define the \package{caption} package
options |figure|\-|position| and |table|\-|position| to issue a warning
-that using these options has little effect here.
+that using these options have little effect here.
+\DescribeMacro{\AfterCaptionPackage}
+The additional hook
+\begin{quote}|\AfterCaptionPackage|\marg{code}\end{quote}
+is offered to authors of adaption files as well.
+The \meta{code} inside the hook will be executed at the very end of the
+\package{caption} package.
+
% --------------------------------------------------------------------------- %
\clearpage
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2020-09-18 21:31:05 UTC (rev 56374)
@@ -193,7 +193,7 @@
%
% \begin{macrocode}
\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)]
% \end{macrocode}
%
% \section{Margin resp. width}
@@ -408,13 +408,14 @@
% Furthermore we take over the caption related settings from the \KOMAScript\ classes.
%
% \begin{macro}{\if at captionabove}
-% \changes{v1.0j}{2006/03/21}{Bugfix 06-03-21: \cs{let}\cs{caption at setposition}\cs{@gobble} added}
+% \changes{v1.0j}{2006/03/21}{Bugfix 2006-03-21: \cs{let}\cs{caption at setposition}\cs{@gobble} added}
% \changes{v1.0n}{2006/03/09}{Accidentally this got broken in \version{1.0m}, fixed}
% \changes{v1.1}{2007/03/31}{We redefine \cs{captionabovetrue/false} now instead of \cs{captionabove/below}}
-% \changes{v1.1a}{2007/09/14}{Bugfix 07-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} for \env{longtable} added}
+% \changes{v1.1a}{2007/09/14}{Bugfix 2007-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} for \env{longtable} added}
% \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g at addto@macro}}
% \changes{v1.1k}{2009/10/09}{\opt{figureposition} and \opt{tableposition} will issue a warning now}
% \changes{v1.8e}{2019/09/11}{\opt{figureposition} and \opt{tableposition} will now set the position anyway since it could be used by other packages}
+% \changes{v2.0a}{2020/09/12}{Faulty \cs{AtBeginCaption} replaced with correct \cs{AfterCaptionPackage}}
% Patch |\@captionabovetrue| and |\@captionabovefalse| so they will set the \package{caption3} position setting, too.
% Note that these are stronger than the \opt{position} setting, therefore we override the options
% \opt{figureposition} and \opt{tableposition} to typeout a warning.
@@ -431,7 +432,7 @@
% \end{macrocode}
% |\captionabove| \& |\captionbelow| for longtable:
% \begin{macrocode}
-\AtBeginCaption{\caption at AtBeginLongtable{%
+\AfterCaptionPackage{\caption at AtBeginLongtable{%
\def\@captionabovetrue{\LT at captionsetup{position=t}}%
\def\@captionabovefalse{\LT at captionsetup{position=b}}}}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2020-09-18 21:31:05 UTC (rev 56374)
@@ -32,7 +32,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{2690}
+% \CheckSum{2697}
%
% \iffalse
%<*driver>
@@ -217,13 +217,13 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/09/02 v3.5a Customizing captions (AR)]
+\ProvidesPackage{caption}[2020/09/12 v3.5b Customizing captions (AR)]
% \end{macrocode}
%
% \section{Loading the kernel}
%
% \begin{macrocode}
-\RequirePackage{caption3}[2020/08/30] % needs v2.0 or newer
+\RequirePackage{caption3}[2020/09/12] % needs v2.1 or newer
% \end{macrocode}
%
% \section{Check against unknown document classes}
@@ -519,9 +519,10 @@
%
% \section{Document class support}
%
-% Execute the code declared with |\AtCaptionPackage|.
+% Execute the code declared with |\At|\-|Caption|\-|Package|.
% We do this right before processing the options so stuff done with
% |\At|\-|Caption|\-|Package| could be overwritten by user options.
+%
% \begin{macrocode}
\caption at documentclass@code
\let\caption at documentclass@code\@undefined
@@ -4127,6 +4128,16 @@
}{}
% \end{macrocode}
%
+% \section{That's all Folks!}
+%
+% Execute the code declared with |\After|\-|Caption|\-|Package|.
+%
+% \begin{macrocode}
+\caption at endtitles@code
+\let\caption at endtitles@code\@undefined
+\let\AfterCaptionPackage\@firstofone
+% \end{macrocode}
+%
% \iffalse
%</package>
% \fi
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-09-18 21:31:05 UTC (rev 56374)
@@ -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 at parbox}}
% \changes{v1.5}{2012/03/15}{\cs{caption at 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 at boxcolor{%
+ \colorbox{\caption at boxcolor}{%
\setlength\caption at tempdima{#1}%
\addtolength\caption at tempdima{-2\fboxsep}%
\linewidth\caption at 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 at addto@macro\caption at 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 at addto@macro\caption at endtitles@code}
+\@onlypreamble\AfterCaptionPackage
+% \end{macrocode}
+% \begin{macrocode}
+\providecommand*\caption at endtitles@code{}
+\@onlypreamble\caption at endtitles@code
+% \end{macrocode}
+% \end{macro}
+%
% \section{Babel support}
%
% \begin{macro}{\caption at IfBabelPackageLoaded}
@@ -3120,7 +3139,6 @@
%
% \begin{macrocode}
\ifFBOldFigTabCaptions
- \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption at ifdefined\extrasfrench{%
\addto\extrasfrench{%
\caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
@@ -3128,18 +3146,11 @@
\addto\extrasacadian{%
\caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
\else
- \typeout{OldFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed
\ifFBCustomiseFigTabCaptions
- \typeout{CustomiseFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption at AtBeginDocument{%
\ifFB at 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}
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto 2020-09-18 21:31:05 UTC (rev 56374)
@@ -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 at koma@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
@@ -146,7 +146,7 @@
\else
\@captionabovefalse
\fi
-\AtBeginCaption{\caption at AtBeginLongtable{%
+\AfterCaptionPackage{\caption at AtBeginLongtable{%
\def\@captionabovetrue{\LT at captionsetup{position=t}}%
\def\@captionabovefalse{\LT at captionsetup{position=b}}}}
\g at addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2020-09-18 21:31:05 UTC (rev 56374)
@@ -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 at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
Unknown document class (or package),\MessageBreak
@@ -1382,6 +1382,9 @@
%%% \caption at setoptions{wrap}%
\caption at setoptions{wrap#1}}%
}{}
+\caption at endtitles@code
+\let\caption at endtitles@code\@undefined
+\let\AfterCaptionPackage\@firstofone
\endinput
%%
%% End of file `caption.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-09-18 21:30:44 UTC (rev 56373)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-09-18 21:31:05 UTC (rev 56374)
@@ -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 at addto@macro[2]{%
@@ -651,7 +651,7 @@
\DeclareCaptionBox{none}{#2}
\DeclareCaptionBox{parbox}{\parbox[b]{#1}{#2}}
\DeclareCaptionBox{colorbox}{%
- \colorbox\caption at boxcolor{%
+ \colorbox{\caption at boxcolor}{%
\setlength\caption at tempdima{#1}%
\addtolength\caption at tempdima{-2\fboxsep}%
\linewidth\caption at tempdima
@@ -1123,6 +1123,11 @@
\@onlypreamble\AtCaptionPackage
\providecommand*\caption at documentclass@code{}
\@onlypreamble\caption at documentclass@code
+\newcommand*\AfterCaptionPackage{%
+ \g at addto@macro\caption at endtitles@code}
+\@onlypreamble\AfterCaptionPackage
+\providecommand*\caption at endtitles@code{}
+\@onlypreamble\caption at endtitles@code
\newcommand*\caption at IfBabelPackageLoaded[4]{%
\caption at ifdefined#2\@firstofone\caption at AtBeginDocument{%
\caption at if@bool{\@nameuse{caption at ifbabel@#1}}%
@@ -1157,7 +1162,6 @@
\providecommand\caption at french@labelseparator{\CaptionSeparator}%
\DeclareCaptionLabelSeparator{colon}{\autospace at beforeFDP : }%
\ifFBOldFigTabCaptions
- \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption at ifdefined\extrasfrench{%
\addto\extrasfrench{%
\caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
@@ -1165,18 +1169,11 @@
\addto\extrasacadian{%
\caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
\else
- \typeout{OldFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed
\ifFBCustomiseFigTabCaptions
- \typeout{CustomiseFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed
\caption at AtBeginDocument{%
\ifFB at 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
}{}
More information about the tex-live-commits
mailing list.