From fe33d3e4cbb440d57dead4cd3a0eeeee5e10188f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Jan 2017 22:28:04 +0000 Subject: babel-french (10jan17) git-svn-id: svn://tug.org/texlive/trunk@42919 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/babel-french/frenchb.ldf | 80 ++++++++++++++++------ .../tex/generic/babel-french/frenchb.lua | 6 +- 2 files changed, 62 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index 0e068808aad..6d8591ebd07 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf @@ -33,11 +33,11 @@ %% extension .ins) which are part of the distribution. %% \ProvidesLanguage{frenchb} - [2016/05/14 v3.2c French support from the babel system] + [2017/01/10 v3.2e French support from the babel system] %% %% File `frenchb.ldf' %% Babel package for LaTeX version 2e -%% Copyright © 1996 - 2016 +%% Copyright © 1996 - 2017 %% by Daniel Flipo %% \chardef\atcatcode=\catcode`\@ @@ -203,7 +203,7 @@ \newskip\FBcolonskip \FBcolonskip=3.33pt plus 1.665pt minus 1.11pt \relax \newskip\FBthinskip -\FBthinskip=1.66672pt \relax +\FBthinskip=1.6667pt \relax \newif\ifFB@spacing \FB@spacingtrue \newcommand*{\FB@spacing@on}{% \ifFB@luatex@punct @@ -749,22 +749,48 @@ \newcommand*{\degres}{% \leavevmode\hbox to 0.3em{\hss\degre\hss}} \fi +\newcount\mc@charclass +\newcount\mc@charfam +\newcount\mc@charslot \newcount\std@mcc \newcount\dec@mcc -\std@mcc=\mathcode`\, -\dec@mcc=\std@mcc -\@tempcnta=\std@mcc -\divide\@tempcnta by "1000 -\multiply\@tempcnta by "1000 -\advance\dec@mcc by -\@tempcnta -\newcommand*{\DecimalMathComma}{\iflanguage{french}% - {\mathcode`\,=\dec@mcc}{}% - \FB@addto{extras}{\mathcode`\,=\dec@mcc}% +\ifFBLuaTeX + \mc@charclass=\Umathcharclass`\, +\else + \std@mcc=\mathcode`\, + \dec@mcc=\std@mcc + \@tempcnta=\std@mcc + \divide\@tempcnta by "1000 + \multiply\@tempcnta by "1000 + \advance\dec@mcc by -\@tempcnta +\fi +\newcommand*{\dec@math@comma}{% + \ifFBLuaTeX + \mc@charfam=\Umathcharfam`\, + \mc@charslot=\Umathcharslot`\, + \Umathcode`\,= 0 \mc@charfam \mc@charslot + \else + \mathcode`\,=\dec@mcc + \fi } -\newcommand*{\StandardMathComma}{\mathcode`\,=\std@mcc - \FB@addto{extras}{\mathcode`\,=\std@mcc}% +\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}% +} +\newcommand*{\StandardMathComma}{% + \std@math@comma + \FB@addto{extras}{\std@math@comma}% } -\FB@addto{noextras}{\mathcode`\,=\std@mcc} +\FB@addto{noextras}{\std@math@comma} \newcommand*{\nombre}[1]{{#1}\fb@warning{*** \noexpand\nombre no longer formats numbers\string! ***}} \let\FBstop@here\relax @@ -1508,18 +1534,19 @@ \newcommand*{\Frlabelitemiv}{\FrenchLabelItem} \newlength\listindentFB \setlength{\listindentFB}{-1pt} +\newlength\descindentFB +\setlength{\descindentFB}{-1pt} \newlength\labelwidthFB \setlength{\labelwidthFB}{-1pt} \newlength\leftmarginFB \def\FB@listHsettings{% \leftmarginFB\labelwidthFB \advance\leftmarginFB \labelsep - \leftmargini\leftmarginFB + \bbl@for\FB@dp {1, 2, 3, 4, 5, 6}% + {\csname leftmargin\romannumeral\FB@dp\endcsname \leftmarginFB}% \advance\leftmargini \listindentFB - \leftmarginii\leftmarginFB - \leftmarginiii\leftmarginFB - \leftmarginiv\leftmarginFB - \leftmargin\csname leftmargin\romannumeral\the\@listdepth\endcsname + \leftmargin\csname leftmargin\ifnum\@listdepth=\@ne i\else + ii\fi\endcsname } \def\FB@itemizesettings{% \ifFBReduceListSpacing @@ -1566,6 +1593,9 @@ \setlength{\listindentFB}{\parindent}% \fi \fi + \ifdim\descindentFB<\z@ + \setlength{\descindentFB}{\listindentFB}% + \fi } \def\enumerateFB{% \ifnum \@enumdepth >\thr@@\@toodeep\else @@ -1584,7 +1614,15 @@ \labelwidth\z@ \itemindent-\leftmargin \ifnum\@listdepth=1 - \advance\itemindent by \listindentFB + \ifdim\descindentFB=\z@ + \ifdim\listindentFB>\z@ + \leftmargini\listindentFB + \leftmargin\leftmargini + \itemindent-\leftmargin + \fi + \else + \advance\itemindent by \descindentFB + \fi \fi \let\makelabel\descriptionlabel}% } diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index f759ef2e499..e2b3a3c151a 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua @@ -1,7 +1,7 @@ -- --- File `frenchb.lua' generated from frenchb.dtx [2016/05/14 v3.2c] +-- File `frenchb.lua' generated from frenchb.dtx [2017/01/10 v3.2e] -- --- Copyright © 2014-2016 Daniel Flipo +-- Copyright © 2014-2017 Daniel Flipo -- -- License LPPL: see frenchb.ldf. -- @@ -48,7 +48,7 @@ local remove_node = node.remove local thin10 = tex.skip['FBthinskip'] local thinwd = thin10.width/65536/3.33 local thinst = thin10.stretch/65536/1.665 -local thinsh = thin10.shrink/655.36/1.11 +local thinsh = thin10.shrink/65536/1.11 local coln10 = tex.skip['FBcolonskip'] local colnwd = coln10.width/65536/3.33 local colnst = coln10.stretch/65536/1.665 -- cgit v1.2.3