texlive[42971] Master/texmf-dist: babel-french (15jan17)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 17 00:11:54 CET 2017
Revision: 42971
http://tug.org/svn/texlive?view=revision&revision=42971
Author: karl
Date: 2017-01-17 00:11:54 +0100 (Tue, 17 Jan 2017)
Log Message:
-----------
babel-french (15jan17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2017-01-16 23:11:36 UTC (rev 42970)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2017-01-16 23:11:54 UTC (rev 42971)
@@ -1,4 +1,4 @@
-%\CheckSum{3410}
+%\CheckSum{3424}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<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
@@ -20,7 +20,7 @@
%</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 @@
% \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 at icomma
\newcount\mc at charclass
\newcount\mc at charfam
\newcount\mc at charslot
@@ -2911,6 +2917,16 @@
\newcount\dec at mcc
\ifFBLuaTeX
\mc at charclass=\Umathcharclass`\,
+ \newcommand*{\dec at math@comma}{%
+ \mc at charfam=\Umathcharfam`\,
+ \mc at charslot=\Umathcharslot`\,
+ \Umathcode`\,= 0 \mc at charfam \mc at charslot
+ }
+ \newcommand*{\std at math@comma}{%
+ \mc at charfam=\Umathcharfam`\,
+ \mc at charslot=\Umathcharslot`\,
+ \Umathcode`\,= \mc at charclass \mc at charfam \mc at charslot
+ }
\else
\std at mcc=\mathcode`\,
\dec at mcc=\std at mcc
@@ -2918,34 +2934,25 @@
\divide\@tempcnta by "1000
\multiply\@tempcnta by "1000
\advance\dec at mcc by -\@tempcnta
+ \newcommand*{\dec at math@comma}{\mathcode`\,=\dec at mcc}
+ \newcommand*{\std at math@comma}{\mathcode`\,=\std at mcc}
\fi
-\newcommand*{\dec at math@comma}{%
- \ifFBLuaTeX
- \mc at charfam=\Umathcharfam`\,
- \mc at charslot=\Umathcharslot`\,
- \Umathcode`\,= 0 \mc at charfam \mc at charslot
- \else
- \mathcode`\,=\dec at mcc
- \fi
-}
-\newcommand*{\std at math@comma}{%
- \ifFBLuaTeX
- \mc at charfam=\Umathcharfam`\,
- \mc at charslot=\Umathcharslot`\,
- \Umathcode`\,= \mc at charclass \mc at charfam \mc at charslot
- \else
- \mathcode`\,=\std at mcc
- \fi
-}
\newcommand*{\DecimalMathComma}{%
\iflanguage{french}{\dec at math@comma}{}%
- \FB at addto{extras}{\dec at math@comma}%
+ \ifFB at icomma\else\FB at addto{extras}{\dec at math@comma}\fi
}
\newcommand*{\StandardMathComma}{%
\std at math@comma
- \FB at addto{extras}{\std at math@comma}%
+ \ifFB at icomma\else\FB at addto{extras}{\std at math@comma}\fi
}
-\FB at addto{noextras}{\std at math@comma}
+\ifLaTeXe
+ \AtBeginDocument{\@ifpackageloaded{icomma}%
+ {\FB at icommatrue}%
+ {\FB at addto{noextras}{\std at math@comma}}%
+ }
+\else
+ \FB at addto{noextras}{\std at math@comma}
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2017-01-16 23:11:36 UTC (rev 42970)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2017-01-16 23:11:54 UTC (rev 42971)
@@ -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 at icomma
\newcount\mc at charclass
\newcount\mc at charfam
\newcount\mc at charslot
@@ -756,6 +757,16 @@
\newcount\dec at mcc
\ifFBLuaTeX
\mc at charclass=\Umathcharclass`\,
+ \newcommand*{\dec at math@comma}{%
+ \mc at charfam=\Umathcharfam`\,
+ \mc at charslot=\Umathcharslot`\,
+ \Umathcode`\,= 0 \mc at charfam \mc at charslot
+ }
+ \newcommand*{\std at math@comma}{%
+ \mc at charfam=\Umathcharfam`\,
+ \mc at charslot=\Umathcharslot`\,
+ \Umathcode`\,= \mc at charclass \mc at charfam \mc at charslot
+ }
\else
\std at mcc=\mathcode`\,
\dec at mcc=\std at mcc
@@ -763,34 +774,25 @@
\divide\@tempcnta by "1000
\multiply\@tempcnta by "1000
\advance\dec at mcc by -\@tempcnta
+ \newcommand*{\dec at math@comma}{\mathcode`\,=\dec at mcc}
+ \newcommand*{\std at math@comma}{\mathcode`\,=\std at mcc}
\fi
-\newcommand*{\dec at math@comma}{%
- \ifFBLuaTeX
- \mc at charfam=\Umathcharfam`\,
- \mc at charslot=\Umathcharslot`\,
- \Umathcode`\,= 0 \mc at charfam \mc at charslot
- \else
- \mathcode`\,=\dec at mcc
- \fi
-}
-\newcommand*{\std at math@comma}{%
- \ifFBLuaTeX
- \mc at charfam=\Umathcharfam`\,
- \mc at charslot=\Umathcharslot`\,
- \Umathcode`\,= \mc at charclass \mc at charfam \mc at charslot
- \else
- \mathcode`\,=\std at mcc
- \fi
-}
\newcommand*{\DecimalMathComma}{%
\iflanguage{french}{\dec at math@comma}{}%
- \FB at addto{extras}{\dec at math@comma}%
+ \ifFB at icomma\else\FB at addto{extras}{\dec at math@comma}\fi
}
\newcommand*{\StandardMathComma}{%
\std at math@comma
- \FB at addto{extras}{\std at math@comma}%
+ \ifFB at icomma\else\FB at addto{extras}{\std at math@comma}\fi
}
-\FB at addto{noextras}{\std at math@comma}
+\ifLaTeXe
+ \AtBeginDocument{\@ifpackageloaded{icomma}%
+ {\FB at icommatrue}%
+ {\FB at addto{noextras}{\std at math@comma}}%
+ }
+\else
+ \FB at addto{noextras}{\std at math@comma}
+\fi
\newcommand*{\nombre}[1]{{#1}\fb at warning{*** \noexpand\nombre
no longer formats numbers\string! ***}}
\let\FBstop at here\relax
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2017-01-16 23:11:36 UTC (rev 42970)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2017-01-16 23:11:54 UTC (rev 42971)
@@ -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>
More information about the tex-live-commits
mailing list