babel-french (15jan17)

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

2 files changed, 25 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 6d8591ebd07..0171d82eebf 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}
-         [2017/01/10 v3.2e French support from the babel system]
+         [2017/01/15 v3.2f French support from the babel system]
 %%
 %%  File `frenchb.ldf'
 %%  Babel package for LaTeX version 2e
@@ -749,6 +749,7 @@
   \newcommand*{\degres}{%
     \leavevmode\hbox to 0.3em{\hss\degre\hss}}
 \fi
+\newif\ifFB@icomma
 \newcount\mc@charclass
 \newcount\mc@charfam
 \newcount\mc@charslot
@@ -756,6 +757,16 @@
 \newcount\dec@mcc
 \ifFBLuaTeX
   \mc@charclass=\Umathcharclass`\,
+  \newcommand*{\dec@math@comma}{%
+    \mc@charfam=\Umathcharfam`\,
+    \mc@charslot=\Umathcharslot`\,
+    \Umathcode`\,= 0 \mc@charfam \mc@charslot
+  }
+  \newcommand*{\std@math@comma}{%
+    \mc@charfam=\Umathcharfam`\,
+    \mc@charslot=\Umathcharslot`\,
+    \Umathcode`\,= \mc@charclass \mc@charfam \mc@charslot
+  }
 \else
   \std@mcc=\mathcode`\,
   \dec@mcc=\std@mcc
@@ -763,34 +774,25 @@
   \divide\@tempcnta by "1000
   \multiply\@tempcnta by "1000
   \advance\dec@mcc by -\@tempcnta
+  \newcommand*{\dec@math@comma}{\mathcode`\,=\dec@mcc}
+  \newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc}
 \fi
-\newcommand*{\dec@math@comma}{%
-  \ifFBLuaTeX
-    \mc@charfam=\Umathcharfam`\,
-    \mc@charslot=\Umathcharslot`\,
-    \Umathcode`\,= 0 \mc@charfam \mc@charslot
-  \else
-    \mathcode`\,=\dec@mcc
-  \fi
-}
-\newcommand*{\std@math@comma}{%
-  \ifFBLuaTeX
-    \mc@charfam=\Umathcharfam`\,
-    \mc@charslot=\Umathcharslot`\,
-    \Umathcode`\,= \mc@charclass \mc@charfam \mc@charslot
-  \else
-    \mathcode`\,=\std@mcc
-  \fi
-}
 \newcommand*{\DecimalMathComma}{%
   \iflanguage{french}{\dec@math@comma}{}%
-  \FB@addto{extras}{\dec@math@comma}%
+  \ifFB@icomma\else\FB@addto{extras}{\dec@math@comma}\fi
 }
 \newcommand*{\StandardMathComma}{%
   \std@math@comma
-  \FB@addto{extras}{\std@math@comma}%
+  \ifFB@icomma\else\FB@addto{extras}{\std@math@comma}\fi
 }
-\FB@addto{noextras}{\std@math@comma}
+\ifLaTeXe
+  \AtBeginDocument{\@ifpackageloaded{icomma}%
+                      {\FB@icommatrue}%
+                      {\FB@addto{noextras}{\std@math@comma}}%
+  }
+\else
+  \FB@addto{noextras}{\std@math@comma}
+\fi
 \newcommand*{\nombre}[1]{{#1}\fb@warning{*** \noexpand\nombre
                                 no longer formats numbers\string! ***}}
 \let\FBstop@here\relax
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index e2b3a3c151a..873ec7061c4 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,5 +1,5 @@
 --
---  File `frenchb.lua' generated from frenchb.dtx [2017/01/10 v3.2e]
+--  File `frenchb.lua' generated from frenchb.dtx [2017/01/15 v3.2f]
 --
 --  Copyright © 2014-2017 Daniel Flipo
 --  <daniel (dot) flipo (at) free (dot) fr>