babel-french (30jun20)

git-svn-id: svn://tug.org/texlive/trunk@55708 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 39 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 7ba570647ab..fb28f0c9eeb 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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i 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 0090e7c9c7f..ba83e1e1a6f 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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i 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 b16b7bda52f..b0d97a2219f 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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i 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 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
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 1baacedf171..f17d3420026 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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i 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 25178e932f8..b9530d454f6 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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i French support from the babel system]
    Copyright © 2014-2020 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.