From 0479a07f9b8bf820dc913d5d467aaf6d877cff79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Sep 2020 21:31:05 +0000 Subject: caption (18sep20) git-svn-id: svn://tug.org/texlive/trunk@56374 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/caption/CHANGELOG | 2 +- Master/texmf-dist/doc/latex/caption/README | 2 +- .../texmf-dist/doc/latex/caption/caption-eng.pdf | Bin 402305 -> 402642 bytes .../source/latex/caption/caption-eng.tex | 13 ++++++-- .../source/latex/caption/caption-koma.dtx | 9 ++--- Master/texmf-dist/source/latex/caption/caption.dtx | 19 ++++++++--- .../texmf-dist/source/latex/caption/caption3.dtx | 37 +++++++++++++-------- .../texmf-dist/tex/latex/caption/caption-koma.sto | 4 +-- Master/texmf-dist/tex/latex/caption/caption.sty | 7 ++-- Master/texmf-dist/tex/latex/caption/caption3.sty | 17 ++++------ 10 files changed, 70 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/caption/CHANGELOG b/Master/texmf-dist/doc/latex/caption/CHANGELOG index d228e251766..089a3caa595 100644 --- a/Master/texmf-dist/doc/latex/caption/CHANGELOG +++ b/Master/texmf-dist/doc/latex/caption/CHANGELOG @@ -120,7 +120,7 @@ v3.4 (2019/09/11) v3.5 (2020/08/30) - If a document class defines \caption@documentclass, an adaption to the caption package will be loaded as caption-.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@switchdefault and \caption@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 diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index c89bc341d75..fc4002ca499 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Release 2020-09-11 +Release 2020-09-17 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf index d7744c25d0a..781d10e0c4b 100644 Binary files a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf and b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf differ diff --git a/Master/texmf-dist/source/latex/caption/caption-eng.tex b/Master/texmf-dist/source/latex/caption/caption-eng.tex index 8a10baffd00..a26aa0ca3b3 100644 --- a/Master/texmf-dist/source/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex @@ -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 @@ and \package{subfig} packages even if the \package{caption} package isn't loaded 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,7 +4192,14 @@ options will be evaluated. 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. % --------------------------------------------------------------------------- % diff --git a/Master/texmf-dist/source/latex/caption/caption-koma.dtx b/Master/texmf-dist/source/latex/caption/caption-koma.dtx index 1cd5f856716..dc76dbad1cb 100644 --- a/Master/texmf-dist/source/latex/caption/caption-koma.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-koma.dtx @@ -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@captionabove} -% \changes{v1.0j}{2006/03/21}{Bugfix 06-03-21: \cs{let}\cs{caption@setposition}\cs{@gobble} added} +% \changes{v1.0j}{2006/03/21}{Bugfix 2006-03-21: \cs{let}\cs{caption@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@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@AtBeginLongtable{% +\AfterCaptionPackage{\caption@AtBeginLongtable{% \def\@captionabovetrue{\LT@captionsetup{position=t}}% \def\@captionabovefalse{\LT@captionsetup{position=b}}}} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 1068796a870..3e79199f558 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -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@documentclass@code \let\caption@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@endtitles@code +\let\caption@endtitles@code\@undefined +\let\AfterCaptionPackage\@firstofone +% \end{macrocode} +% % \iffalse % % \fi diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index 956cc40eb89..ea759a3c87b 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/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} 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 }{} -- cgit v1.2.3