diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/caption/caption3.dtx | 80 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 47 |
3 files changed, 81 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index ca3df1b169c..c89bc341d75 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-02 +Release 2020-09-11 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index 5f2823ac0b0..956cc40eb89 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -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@french@label|\-|separator| will be defined later on, +% dependent on the `french' package used later on. +% % \begin{macrocode} -\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} % \end{macrocode} % % \begin{macro}{\caption@IfBabelFrench} @@ -3103,26 +3102,46 @@ \caption@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@french@labelseparator\caption@labelseparator@french % still set to dummy label separator? - \DeclareCaptionLabelSeparator{french}{% - \ifFBCustomiseFigTabCaptions - \CaptionSeparator - \else - \space : % - \fi}% - \fi - \caption@ifdefined\extrasfrench{% - \addto\extrasfrench{% - \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% + \providecommand\caption@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@AtBeginDocument{\@nameuse{@FBwarning@capsepfalse}}% + \DeclareCaptionLabelSeparator{colon}{\autospace@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@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 % \end{macrocode} % % \begin{macrocode} @@ -3149,13 +3168,16 @@ \caption@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} + \providecommand\caption@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} - \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator? - \DeclareCaptionLabelSeparator{french}{\captionseparator\space}% - \fi \g@addto@macro\extrasfrench{% \caption@switchdefault{labelseparator}{\let\caption@original@labelseparator#1}{french}% \caption@switchdefault{font}{\let\caption@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@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@setfloattype\@gobble \let\@dottedxxxline\sf@NEW@dottedxxxline \let\sf@subfloat\sf@NEW@subfloat + \let\sf@ifpositiontop\caption@iftop % \end{macrocode} % \begin{macrocode} \fi 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} |