summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/french.ldf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/french.ldf')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf57
1 files changed, 34 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index f67abcd9097..21e5795355c 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2020
@@ -1538,29 +1538,40 @@
\else
\renewcommand*{\FB@lc}[1]{##1}%
\fi
- \ifFBCustomiseFigTabCaptions
- \ifFB@koma
- \renewcommand*{\captionformat}{\CaptionSeparator}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{\CaptionSeparator}}{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcustom}{%
- \CaptionSeparator}%
- \setbeamertemplate{caption label separator}[FBcustom]}{}%
- \else
- \ifFB@koma
- \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{{\autospace@beforeFDP : }}%
- }{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcolon}{%
- {\autospace@beforeFDP : }}%
- \setbeamertemplate{caption label separator}[FBcolon]%
- }{}%
+ \ifFB@koma
+ \edef\FB@capsep{\captionformat}\edef\FB@std@capsep{:\ }%
+ \ifx\FB@capsep\FB@std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \renewcommand*{\captionformat}{\CaptionSeparator}%
+ \else
+ \renewcommand*{\captionformat}{{\autospace@beforeFDP :\ }}%
+ \fi
+ \fi
\fi
+ \@ifclassloaded{memoir}%
+ {\edef\FB@capsep{\@contdelim}\edef\FB@std@capsep{: }%
+ \ifx\FB@capsep\FB@std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \captiondelim{\CaptionSeparator}%
+ \else
+ \captiondelim{{\autospace@beforeFDP : }}%
+ \fi
+ \fi}{}%
+ \@ifclassloaded{beamer}%
+ {\edef\FB@std@capsep{:\ }%
+ \edef\FB@capsep{%
+ \csname beamer@@tmpl@caption label separator\endcsname}%
+ \ifx\FB@capsep\FB@std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \defbeamertemplate{caption label separator}{FBcustom}{%
+ \CaptionSeparator}%
+ \setbeamertemplate{caption label separator}[FBcustom]%
+ \else
+ \defbeamertemplate{caption label separator}{FBcolon}{%
+ {\autospace@beforeFDP : }}%
+ \setbeamertemplate{caption label separator}[FBcolon]%
+ \fi
+ \fi}{}%
\ifFBShowOptions
\GenericWarning{* }{%
*** List of possible options for babel-french ***\MessageBreak