texlive[56321] Master/texmf-dist: caption (10sep20)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 11 22:51:53 CEST 2020
Revision: 56321
http://tug.org/svn/texlive?view=revision&revision=56321
Author: karl
Date: 2020-09-11 22:51:53 +0200 (Fri, 11 Sep 2020)
Log Message:
-----------
caption (10sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2020-09-11 20:51:24 UTC (rev 56320)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2020-09-11 20:51:53 UTC (rev 56321)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-09-02
+Release 2020-09-11
Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-09-11 20:51:24 UTC (rev 56320)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-09-11 20:51:53 UTC (rev 56321)
@@ -32,7 +32,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3636}
+% \CheckSum{3646}
%
% \iffalse
%<*driver>
@@ -192,7 +192,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/08/30 v2.0 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/09/11 v2.0b caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Generic helpers}
@@ -3078,13 +3078,12 @@
% \changes{v1.1}{2006/05/14}{\package{frenchb} babel support added}
% \changes{v2.0}{2020/08/01}{\package{french} babel support updated}
%
-% We provide a dummy `french' caption label separator (so |labelsep=french| works fine);
-% it will be re-defined dependant on the `french' package used later on.
+% We provide a `french' caption label separator.
+% |\caption at french@label|\-|separator| will be defined later on,
+% dependent on the `french' package used later on.
+%
% \begin{macrocode}
-\caption at ifdecl{labelseparator}{french}
- {\let\caption at french@labelseparator\@undefined}%
- {\caption@@set{labelseparator}{labelseparator at french}{default}%
- \let\caption at french@labelseparator\caption at labelseparator@french}
+\DeclareCaptionLabelSeparator{french}{\caption at french@labelseparator}
% \end{macrocode}
%
% \begin{macro}{\caption at IfBabelFrench}
@@ -3103,29 +3102,49 @@
\caption at IfBabelFrench{%
% \end{macrocode}
%
-% If the language `french' is selected, we switch the default label separator to `french'
-% which uses |\if|\-|FB|\-|Customise|\-|Fig|\-|Tab|\-|Captions| and |\Caption|\-|Separator|.
+% The \package{babel-french} package uses |\Caption|\-|Separator| as label separator.
%
% \begin{macrocode}
- \ifx\caption at french@labelseparator\caption at labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{%
- \ifFBCustomiseFigTabCaptions
- \CaptionSeparator
- \else
- \space : %
- \fi}%
- \fi
- \caption at ifdefined\extrasfrench{%
- \addto\extrasfrench{%
- \caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
+ \providecommand\caption at french@labelseparator{\CaptionSeparator}%
% \end{macrocode}
%
-% Suppress the warning about load order (since it's not longer valid anymore).
+% Add a space before the label separator `colon' in French
+% in order to avoid problems when |Auto|\-|Space|\-|Punctuation| is set to |false|.
+%
% \begin{macrocode}
- \caption at AtBeginDocument{\@nameuse{@FBwarning at capsepfalse}}%
+ \DeclareCaptionLabelSeparator{colon}{\autospace at beforeFDP : }%
% \end{macrocode}
%
+% We switch the default label separator to `french', dependant on the switches
+% |Customise|\-|Fig|\-|Tab|\-|Captions| and |Old|\-|Fig|\-|Tab|\-|Captions|.
+%
% \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}}}{}%
+ \caption at ifdefined\extrasacadian{%
+ \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}
+%
+% \begin{macrocode}
}{}
% \end{macrocode}
%
@@ -3149,13 +3168,16 @@
\caption at IfFrenchLe{%
% \end{macrocode}
%
-% If the language `french' is selected, we switch the default label separator to `french'
-% which uses |\caption|\-|separator|, and switch the default font to `it' and the default label font to `up'.
+% The \package{frenchle} package uses |\caption|\-|separator| plus |\space| as label separator.
%
% \begin{macrocode}
- \ifx\caption at french@labelseparator\caption at labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{\captionseparator\space}%
- \fi
+ \providecommand\caption at french@labelseparator{\captionseparator\space}%
+% \end{macrocode}
+%
+% If the language `french' is selected, we switch the default label separator to `french',
+% and switch the default font to `it' and the default label font to `up'.
+%
+% \begin{macrocode}
\g at addto@macro\extrasfrench{%
\caption at switchdefault{labelseparator}{\let\caption at original@labelseparator#1}{french}%
\caption at switchdefault{font}{\let\caption at original@font#1}{it}%
@@ -3578,6 +3600,7 @@
% \subsection{The subfig package}
% \changes{v1.1}{2007/07/07}{Adaptions to the \package{subfig} package added}
% \changes{v1.4a}{2011/11/01}{Test for the \package{subfig} package revised}
+% \changes{v2.0a}{2020/09/07}{Re-definition of \cs{sf at ifpositiontop} added}
%
% Since the \package{subfig} package is not maintained anymore,
% we have to make adaptions to \thispackage~\version{1.1} here.
@@ -3595,6 +3618,7 @@
\let\caption at setfloattype\@gobble
\let\@dottedxxxline\sf at NEW@dottedxxxline
\let\sf at subfloat\sf at NEW@subfloat
+ \let\sf at ifpositiontop\caption at iftop
% \end{macrocode}
% \begin{macrocode}
\fi
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-09-11 20:51:24 UTC (rev 56320)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-09-11 20:51:53 UTC (rev 56321)
@@ -38,7 +38,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/08/30 v2.0 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/09/11 v2.0b caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l at addto@macro[2]{%
@@ -1148,27 +1148,37 @@
}{%
\let\caption at rl\@firstofone
}
-\caption at ifdecl{labelseparator}{french}
- {\let\caption at french@labelseparator\@undefined}%
- {\caption@@set{labelseparator}{labelseparator at french}{default}%
- \let\caption at french@labelseparator\caption at labelseparator@french}
+\DeclareCaptionLabelSeparator{french}{\caption at french@labelseparator}
\newcommand*\caption at IfBabelFrench{%
\caption at IfBabelPackageLoaded{french}{\FB at makecaption}}
\@onlypreamble\caption at IfBabelFrench
\providecommand*\caption at ifbabel@french{true}
\caption at IfBabelFrench{%
- \ifx\caption at french@labelseparator\caption at labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{%
- \ifFBCustomiseFigTabCaptions
- \CaptionSeparator
- \else
- \space : %
- \fi}%
+ \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}}}{}%
+ \caption at ifdefined\extrasacadian{%
+ \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
- \caption at ifdefined\extrasfrench{%
- \addto\extrasfrench{%
- \caption at switchdefault{labelseparator}{\babel at save #1}{french}}}{}%
- \caption at AtBeginDocument{\@nameuse{@FBwarning at capsepfalse}}%
}{}
\newcommand*\caption at IfFrenchLe{%
\caption at IfBabelPackageLoaded{frenchle}{\frenchTeXmods}}
@@ -1175,9 +1185,7 @@
\@onlypreamble\caption at IfBabelFrenchLe
\providecommand*\caption at ifbabel@frenchle{true}
\caption at IfFrenchLe{%
- \ifx\caption at french@labelseparator\caption at labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{\captionseparator\space}%
- \fi
+ \providecommand\caption at french@labelseparator{\captionseparator\space}%
\g at addto@macro\extrasfrench{%
\caption at switchdefault{labelseparator}{\let\caption at original@labelseparator#1}{french}%
\caption at switchdefault{font}{\let\caption at original@font#1}{it}%
@@ -1316,6 +1324,7 @@
\let\caption at setfloattype\@gobble
\let\@dottedxxxline\sf at NEW@dottedxxxline
\let\sf at subfloat\sf at NEW@subfloat
+ \let\sf at ifpositiontop\caption at iftop
\fi
\let\sf at NEW@dottedxxxline\@undefined
\let\sf at NEW@subfloat\@undefined}
More information about the tex-live-commits
mailing list.