babel-french (8sep19)

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

6 files changed, 45 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 6a3fc718ac3..00e36db7eba 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}
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f 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 dafc522136a..845a6f87e15 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -24,13 +24,16 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{canadien}
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f 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
    use `acadian' instead; reported}%
-\let\l@canadien\l@acadian
 \def\CurrentOption{acadian}
+\def\datecanadien{\dateacadian}
+\def\captionscanadien{\captionsacadian}
+\def\extrascanadien{\extrasacadian}
+\def\noextrascanadien{\noextrasacadian}
 \input french.ldf\relax
 \let\extrasacadian\extrasfrench
 \let\noextrasacadian\noextrasfrench
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 2f078785dc5..92dcd36ca33 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -24,12 +24,12 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{francais}
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f 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
    use `french' instead; reported}%
-\let\l@francais\l@french
+\chardef\l@francais\l@french
 \def\CurrentOption{french}
 \input french.ldf\relax
 %%
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index fcf3dc7d05b..044ba8f8d5e 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}
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f French support from the babel system]
 %%
 %%  Babel package for LaTeX version 2e
 %%  Copyright © 1996-2019
@@ -85,7 +85,12 @@
    \fi
    \@nopatterns{French}}
 \ifdefined\l@french \else \FB@nopatterns \fi
-\ifdefined\l@acadian \else \adddialect\l@acadian\l@french \fi
+\ifdefined\l@acadian
+  \adddialect\l@canadien\l@acadian
+\else
+  \adddialect\l@acadian\l@french
+  \adddialect\l@canadien\l@french
+\fi
 \providehyphenmins{french}{\tw@\thr@@}
 \providehyphenmins{acadian}{\tw@\thr@@}
 \newif\ifLaTeXe
@@ -825,17 +830,37 @@
   \newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc}
 \fi
 \newcommand*{\DecimalMathComma}{%
-  \ifFBfrench\dec@math@comma\fi
-  \ifFB@icomma\else\addto\extrasfrench{\dec@math@comma}\fi
+  \ifFB@icomma
+    \PackageWarning{french.ldf}{%
+      icomma package loaded, \protect\DecimalMathComma\MessageBreak
+      does nothing.  Reported}%
+  \else
+    \ifFBfrench
+      \dec@math@comma
+      \expandafter\addto\csname extras\languagename\endcsname
+        {\dec@math@comma}%
+    \fi
+  \fi
 }
 \newcommand*{\StandardMathComma}{%
-  \std@math@comma
-  \ifFB@icomma\else\addto\extrasfrench{\std@math@comma}\fi
+  \ifFB@icomma
+    \PackageWarning{french.ldf}{%
+      icomma package loaded, \protect\StandardMathComma\MessageBreak
+      does nothing.  Reported}%
+  \else
+    \std@math@comma
+    \expandafter\addto\csname extras\languagename\endcsname
+      {\std@math@comma}%
+  \fi
 }
 \ifLaTeXe
   \AtBeginDocument{\@ifpackageloaded{icomma}%
                       {\FB@icommatrue}%
-                      {\addto\noextrasfrench{\std@math@comma}}%
+                      {\addto\noextrasfrench{\std@math@comma}%
+                       \ifdefined\noextrasacadian
+                         \addto\noextrasacadian{\std@math@comma}%
+                       \fi
+                      }%
   }
 \else
   \addto\noextrasfrench{\std@math@comma}
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 2b5303d49c6..2fefc0d3fcf 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -24,10 +24,10 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{frenchb}
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f French support from the babel system]
 \def\bbl@tempa{frenchb}
 \ifx\CurrentOption\bbl@tempa
-  \let\l@frenchb\l@french
+  \chardef\l@frenchb\l@french
   \def\CurrentOption{french}
   \PackageWarning{babel-french}%
     {Option `frenchb' for Babel is *deprecated*,\MessageBreak
@@ -36,18 +36,17 @@
 \else
   \def\bbl@tempa{francais}
   \ifx\CurrentOption\bbl@tempa
-    \let\l@francais\l@french
+    \chardef\l@francais\l@french
     \def\CurrentOption{french}
     \ifx\magnification\@undefined
       \PackageWarning{babel-french}%
         {Option `francais' for Babel is *deprecated*,\MessageBreak
          it might be removed sooner or later.  Please\MessageBreak
-         use `french' instead; reported}%
+         use `french' instead; reported}
     \fi
   \else
     \def\bbl@tempa{canadien}
     \ifx\CurrentOption\bbl@tempa
-      \let\l@canadien\l@acadian
       \def\CurrentOption{acadian}
       \PackageWarning{babel-french}%
         {Option `canadien' for Babel is *deprecated*,\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index cb54ac92e52..fab51f76e8a 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
-         [2019/03/30 v3.5e French support from the babel system]
+         [2019/09/07 v3.5f French support from the babel system]
    Copyright © 2014-2019 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.