summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb.pdfbin268490 -> 268840 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx55
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf46
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
4 files changed, 56 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index 41247dfcf41..3ba610aa61f 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 06768510249..d4c7e7213ed 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{3410}
+%\CheckSum{3424}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,14 +13,14 @@
%<ldf>\ProvidesLanguage{frenchb}
%\ProvidesFile{frenchb.dtx}
%<*!lua>
- [2017/01/10 v3.2e French support from the babel system]
+ [2017/01/15 v3.2f French support from the babel system]
%</!lua>
%<*internal>
\iffalse
%</internal>
%<*lua>
--
--- 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>
@@ -292,6 +292,8 @@
% |$[0,\ 1]$|, |$(x,\ y)$|. |\StandardMathComma| switches
% back to the standard behaviour of the comma in French.
%
+% The \pkg{icomma} package is an alternative workaround.
+%
% \item A command |\nombre| was provided in 1.x versions to easily
% format numbers in slices of three digits separated either
% by a comma in English or with a space in French; |\nombre|
@@ -2902,8 +2904,12 @@ return french_punctuation
% \changes{v3.2e}{2017/01/09}{\cs{DecimalMathComma} didn’t work
% with LuaTeX. Fixed now.}
%
+% \changes{v3.2f}{2017/01/15}{Fixed conflict with the icomma
+% package.}
+%
% Unfortunately, |\newcount| inside |\if| breaks Plain formats.
% \begin{macrocode}
+\newif\ifFB@icomma
\newcount\mc@charclass
\newcount\mc@charfam
\newcount\mc@charslot
@@ -2911,6 +2917,16 @@ return french_punctuation
\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
@@ -2918,34 +2934,25 @@ return french_punctuation
\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
% \end{macrocode}
% \end{macro}
% \end{macro}
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>