diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-03 20:55:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-03 20:55:10 +0000 |
commit | 62959e7b001ff4af0605b0055c637c5219b46c82 (patch) | |
tree | d6bf062b40b8dcc41227c501fda976602b20396e /Master/texmf-dist/tex | |
parent | 959e2db1ac1afe62f2c48c71add5ae1fe68af7c0 (diff) |
babel-french (3jul20)
git-svn-id: svn://tug.org/texlive/trunk@55742 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
6 files changed, 16 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index fb28f0c9eeb..fccad56c353 100644 --- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf @@ -24,7 +24,7 @@ %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %% \ProvidesLanguage{acadian} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] \PackageInfo{acadian.ldf}% {`acadian' dialect is currently\MessageBreak *absolutely identical* to the\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf index ba83e1e1a6f..c622fb32613 100644 --- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf @@ -24,7 +24,7 @@ %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %% \ProvidesLanguage{canadien} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] \PackageWarning{canadien.ldf}% {Option `canadien' for Babel is *deprecated*,\MessageBreak it might be removed sooner or later. Please\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf index b0d97a2219f..d6f942282f8 100644 --- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf @@ -24,7 +24,7 @@ %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %% \ProvidesLanguage{francais} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] \PackageWarning{francais.ldf}% {Option `francais' for Babel is *deprecated*,\MessageBreak it might be removed sooner or later. Please\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf index 21e5795355c..ec6d98cf97e 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/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] %% %% Babel package for LaTeX version 2e %% Copyright © 1996-2020 @@ -417,6 +417,13 @@ } \addto\extrasfrench{\FB@xetex@punct@french} \fi +\newif\ifFB@koma +\@ifclassloaded{scrartcl}{\FB@komatrue}{} +\@ifclassloaded{scrbook}{\FB@komatrue}{} +\@ifclassloaded{scrreprt}{\FB@komatrue}{} +\ifFB@koma\def\FB@std@capsep{:\ }\fi +\@ifclassloaded{beamer}{\def\FB@std@capsep{:\ }}{} +\@ifclassloaded{memoir}{\def\FB@std@capsep{: }}{} \ifFB@active@punct \initiate@active@char{:}% \initiate@active@char{;}% @@ -1539,8 +1546,7 @@ \renewcommand*{\FB@lc}[1]{##1}% \fi \ifFB@koma - \edef\FB@capsep{\captionformat}\edef\FB@std@capsep{:\ }% - \ifx\FB@capsep\FB@std@capsep + \ifx\captionformat\FB@std@capsep \ifFBCustomiseFigTabCaptions \renewcommand*{\captionformat}{\CaptionSeparator}% \else @@ -1549,8 +1555,7 @@ \fi \fi \@ifclassloaded{memoir}% - {\edef\FB@capsep{\@contdelim}\edef\FB@std@capsep{: }% - \ifx\FB@capsep\FB@std@capsep + {\ifx\@contdelim\FB@std@capsep \ifFBCustomiseFigTabCaptions \captiondelim{\CaptionSeparator}% \else @@ -1558,8 +1563,7 @@ \fi \fi}{}% \@ifclassloaded{beamer}% - {\edef\FB@std@capsep{:\ }% - \edef\FB@capsep{% + {\protected@edef\FB@capsep{% \csname beamer@@tmpl@caption label separator\endcsname}% \ifx\FB@capsep\FB@std@capsep \ifFBCustomiseFigTabCaptions diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index f17d3420026..e883c208206 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf @@ -24,7 +24,7 @@ %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %% \ProvidesLanguage{frenchb} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] \def\bbl@tempa{frenchb} \ifx\CurrentOption\bbl@tempa \chardef\l@frenchb\l@french diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index b9530d454f6..bfbc48c2486 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua @@ -1,6 +1,6 @@ --[[ File `frenchb.lua’ generated from frenchb.dtx - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] Copyright © 2014-2020 Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> License LPPL: see french.ldf. |