diff options
author | Karl Berry <karl@freefriends.org> | 2015-10-05 20:59:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-10-05 20:59:25 +0000 |
commit | 379f7337fa96e63660bf3bb58cd2565b4dfdbd0f (patch) | |
tree | 64eff8afcdb1629544a2babe8669dfa1a04f542b /Master/texmf-dist/tex/generic | |
parent | 596a3dc5c1274eac48547d1d431f12f5ceaf4d43 (diff) |
babel-french (5oct15)
git-svn-id: svn://tug.org/texlive/trunk@38560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index 5ac20ad0d42..1ae4b888fde 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} - [2015/08/19 v3.1h French support from the babel system] + [2015/10/04 v3.1i French support from the babel system] %% %% File `frenchb.ldf' %% Babel package for LaTeX version 2e @@ -189,6 +189,9 @@ \newskip\FBthinskip \FBthinskip=1.66672pt \relax \ifFB@luatex@punct + \directlua{tex.enableprimitives("", + tex.extraprimitives( + "omega", "aleph", "luatex"))} \ifLaTeXe \AtEndOfPackage{% \RequirePackage{luatexbase}% @@ -554,12 +557,12 @@ #1\fgi \else \ifx\FBeverylineguill\FBguillopen - \luatexlocalleftbox{\guillemotleft\kern.8\fontdimen2\font}% + \localleftbox{\guillemotleft\kern.8\fontdimen2\font}% \let\FBeverypar@quote\relax \FB@og #1\ifFBcloseguill\FB@fg\fi \else \ifx\FBeverylineguill\FBguillclose - \luatexlocalleftbox{\guillemotright\kern.8\fontdimen2\font}% + \localleftbox{\guillemotright\kern.8\fontdimen2\font}% \let\FBeverypar@quote\relax \FB@og #1\ifFBcloseguill\FB@fg\fi \else @@ -773,18 +776,19 @@ \ldf@quit\CurrentOption\endinput} \fi \FBstop@here -\renewcommand*{\nombre}[1]{\Warning@nombre\numprint{#1}} -\newcommand*{\Warning@nombre}{% +\renewcommand*{\nombre}[1]{\Warning@nombre{#1}} +\newcommand*{\Warning@nombre}[1]{% \ifdefined\numprint + \numprint{#1}% \else \PackageWarning{frenchb.ldf}{% \protect\nombre\space now relies on package numprint.sty,% \MessageBreak add \protect - \usepackage[autolanguage]{numprint}\MessageBreak - to your preamble *after* loading babel,\MessageBreak + \usepackage[autolanguage]{numprint},\MessageBreak see file numprint.pdf for more options.\MessageBreak \protect\nombre\space called}% \global\let\Warning@nombre\relax + {#1}% \fi } \ifx\FBfigtabshape\@undefined \let\FBfigtabshape\scshape \fi @@ -966,13 +970,6 @@ BEFORE babel/frenchb; reported}% \fi } -\@ifpackageloaded{numprint} - {\ifnprt@autolanguage - \FBWarning{frenchb.ldf}% - {Please load the "numprint" package\MessageBreak - AFTER babel/frenchb; reported}% - \fi - }{} \newcommand*{\frenchbsetup}[1]{% \setkeys{FB}{#1}% }% |