diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/frenchb.ldf')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index a014251917c..132b4049a6d 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf @@ -33,7 +33,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesLanguage{frenchb} - [2015/04/10 v3.1e French support from the babel system] + [2015/05/31 v3.1f French support from the babel system] %% %% File `frenchb.ldf' %% Babel package for LaTeX version 2e @@ -183,7 +183,7 @@ \FB@xetex@puncttrue\FB@active@punctfalse \fi \newcommand*{\FBcolonspace}{\space} -\newcommand*{\FBthinspace}{\thinspace} +\newcommand*{\FBthinspace}{\hskip .16667em \relax} \newskip\FBcolonskip \FBcolonskip=3.33pt plus 1.665pt minus 1.11pt \relax \newskip\FBthinskip @@ -870,7 +870,7 @@ \@FBwarning@capseptrue \newcommand{\FBWarning}[2]{\PackageWarning{#1}{#2}} \newcommand*{\CaptionSeparator}{\space\textendash\space} -\def\FBCaption@Separator{:\space} +\def\FBCaption@Separator{: } \long\def\FB@makecaption#1#2{% \vskip\abovecaptionskip \sbox\@tempboxa{#1\FBCaption@Separator #2}% @@ -894,6 +894,7 @@ \@ifclassloaded{scrartcl}{\@FBwarning@capsepfalse\FB@komatrue}{} \@ifclassloaded{scrbook}{\@FBwarning@capsepfalse\FB@komatrue}{} \@ifclassloaded{scrreprt}{\@FBwarning@capsepfalse\FB@komatrue}{} +\@ifclassloaded{beamer}{\@FBwarning@capsepfalse}{} \ifdefined\@makecaption\else\@FBwarning@capsepfalse\fi \@ifpackageloaded{caption} {\FBWarning{frenchb.ldf}% @@ -912,7 +913,7 @@ \global\let\@makecaption\FB@makecaption \ifFBOldFigTabCaptions \else - \def\FBCaption@Separator{\iflanguage{french}{ : }{: }}% + \def\FBCaption@Separator{{\autospace@beforeFDP : }}% \fi \ifFBCustomiseFigTabCaptions \ifx\bbl@main@language\FB@french @@ -1353,19 +1354,29 @@ \else \renewcommand*{\FB@lc}[1]{##1}% \fi - \ifFBCustomiseFigTabCaptions + \ifFBCustomiseFigTabCaptions \ifFB@koma - \let\captionformat\CaptionSeparator + \renewcommand*{\captionformat}{\CaptionSeparator}% \fi \@ifclassloaded{memoir}% {\captiondelim{\CaptionSeparator}}{}% - \else + \@ifclassloaded{beamer}% + {\defbeamertemplate{caption label separator}{FBcustom}{% + \CaptionSeparator}% + \setbeamertemplate{caption label separator}[FBcustom]}{}% + \else \ifFB@koma - \def\captionformat{\iflanguage{french}{ : }{: }}% + \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}% \fi \@ifclassloaded{memoir}% - {\captiondelim{\iflanguage{french}{ : }{: }}}{}% - \fi + {\captiondelim{{\autospace@beforeFDP : }}% + }{}% + \@ifclassloaded{beamer}% + {\defbeamertemplate{caption label separator}{FBcolon}{% + {\autospace@beforeFDP : }}% + \setbeamertemplate{caption label separator}[FBcolon]% + }{}% + \fi \ifFBShowOptions \GenericWarning{* }{% * **** List of possible options for frenchb ****\MessageBreak @@ -1444,9 +1455,9 @@ }% \fi \FBprocess@options - \ifFB@luatex@punct - \activate@luatexpunct - \fi + \ifFB@luatex@punct + \activate@luatexpunct + \fi \ifFBunicode \ifdefined\DeclareUTFcharacter \else |