summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-11 20:51:53 +0000
committerKarl Berry <karl@freefriends.org>2020-09-11 20:51:53 +0000
commit2a3e27e6734109519d6263363cf77f6d3fbbe7cb (patch)
treeeb502e81683a2cade5aa27a3fcb45cec6e16e5b3 /Master/texmf-dist/tex/latex
parente6792c8d6739cfa4f7018b4fb9bf4ef940e6235d (diff)
caption (10sep20)
git-svn-id: svn://tug.org/texlive/trunk@56321 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty47
1 files changed, 28 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 7cbd1abbc32..625d1165586 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/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@addto@macro[2]{%
@@ -1148,36 +1148,44 @@
}{%
\let\caption@rl\@firstofone
}
-\caption@ifdecl{labelseparator}{french}
- {\let\caption@french@labelseparator\@undefined}%
- {\caption@@set{labelseparator}{labelseparator@french}{default}%
- \let\caption@french@labelseparator\caption@labelseparator@french}
+\DeclareCaptionLabelSeparator{french}{\caption@french@labelseparator}
\newcommand*\caption@IfBabelFrench{%
\caption@IfBabelPackageLoaded{french}{\FB@makecaption}}
\@onlypreamble\caption@IfBabelFrench
\providecommand*\caption@ifbabel@french{true}
\caption@IfBabelFrench{%
- \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{%
- \ifFBCustomiseFigTabCaptions
- \CaptionSeparator
- \else
- \space : %
- \fi}%
+ \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}}}{}%
+ \caption@ifdefined\extrasacadian{%
+ \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
- \caption@ifdefined\extrasfrench{%
- \addto\extrasfrench{%
- \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}%
- \caption@AtBeginDocument{\@nameuse{@FBwarning@capsepfalse}}%
}{}
\newcommand*\caption@IfFrenchLe{%
\caption@IfBabelPackageLoaded{frenchle}{\frenchTeXmods}}
\@onlypreamble\caption@IfBabelFrenchLe
\providecommand*\caption@ifbabel@frenchle{true}
\caption@IfFrenchLe{%
- \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator?
- \DeclareCaptionLabelSeparator{french}{\captionseparator\space}%
- \fi
+ \providecommand\caption@french@labelseparator{\captionseparator\space}%
\g@addto@macro\extrasfrench{%
\caption@switchdefault{labelseparator}{\let\caption@original@labelseparator#1}{french}%
\caption@switchdefault{font}{\let\caption@original@font#1}{it}%
@@ -1316,6 +1324,7 @@
\let\caption@setfloattype\@gobble
\let\@dottedxxxline\sf@NEW@dottedxxxline
\let\sf@subfloat\sf@NEW@subfloat
+ \let\sf@ifpositiontop\caption@iftop
\fi
\let\sf@NEW@dottedxxxline\@undefined
\let\sf@NEW@subfloat\@undefined}