summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-05 20:59:25 +0000
committerKarl Berry <karl@freefriends.org>2015-10-05 20:59:25 +0000
commit379f7337fa96e63660bf3bb58cd2565b4dfdbd0f (patch)
tree64eff8afcdb1629544a2babe8669dfa1a04f542b
parent596a3dc5c1274eac48547d1d431f12f5ceaf4d43 (diff)
babel-french (5oct15)
git-svn-id: svn://tug.org/texlive/trunk@38560 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb.pdfbin262311 -> 262303 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx68
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf25
3 files changed, 50 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index 711d1177f3f..68aaea00061 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 4e559ab63a3..dd545b215d2 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{3231}
+%\CheckSum{3226}
%
%\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>
- [2015/08/19 v3.1h French support from the babel system]
+ [2015/10/04 v3.1i French support from the babel system]
%</!lua>
%<*internal>
\iffalse
@@ -774,9 +774,8 @@
% |\addto\captionsfrench{\def\figurename{{\scshape Fig.}}}|\\
% |\addto\captionsfrench{\def\tablename{{\scshape Tab.}}}|.
% \item The |\nombre| command is now provided by the \pkg{numprint}
-% package which has to be loaded \emph{after} \babel{} with the
-% option |autolanguage| if number formatting should depend on the
-% current language.
+% package best loaded with the option |autolanguage| if number
+% formatting should depend on the current language.
% \item The |\bsc| command no longer uses an |\hbox| to stop
% hyphenation of names but a |\kern0pt| instead. This change
% enables \file{microtype} to fine tune the length of the
@@ -1200,11 +1199,24 @@
%
% \changes{v3.1a}{2014/05/30}{Misplaced \cs{fi} for plain formats.}
%
+% \changes{v3.1i}{2015/10/04}{Compatibility code added due to changes
+% in the 2015/10/01 LaTeX release, see ltnews23.tex.}
+%
+% The following |\directlua| call ensures compatibility with LaTeX
+% releases prior to 2015/10/01: with this release prefix ``luatex''
+% has been stripped off the LuaTeX primitive names, see
+% \file{ltnews23.tex} for details.
+% \begin{macrocode}
+\ifFB@luatex@punct
+ \directlua{tex.enableprimitives("",
+ tex.extraprimitives(
+ "omega", "aleph", "luatex"))}
+% \end{macrocode}
+%
% We define two LuaTeX attributes to control spacing in French
% for `high punctuation' and quotes, making sure that
% |\newluatexattribute| is defined.
% \begin{macrocode}
-\ifFB@luatex@punct
\ifLaTeXe
\AtEndOfPackage{%
\RequirePackage{luatexbase}%
@@ -2307,17 +2319,21 @@ return french_punctuation
\else
% \end{macrocode}
% This for level 2 (inner) quotations: Omega's command
-% |\localleftbox| (included in LuaTeX, renamed |\luatexlocalleftbox|
-% in LuaLaTeX) is convenient for repeating guillemets at the
-% beginning of every line.
+% |\localleftbox| included in LuaTeX, formerly named
+% |\luatexlocalleftbox|, is convenient for repeating guillemets
+% at the beginning of every line.
+%
+% \changes{v3.1i}{2015/10/04}{\cs{luatexlocalleftbox} changed to
+% \cs{localleftbox} for new LaTeX release 2015/10/01.}
+%
% \begin{macrocode}
\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
@@ -2801,7 +2817,7 @@ return french_punctuation
% it prints them as is and issues a warning about the change.
%
% Fake command |\nombre| for Plain based formats, warning users of
-% \frenchb{} v.~1.x.\ of the change.
+% \frenchb{} v.~1.x.\ about the change:
% \begin{macrocode}
\newcommand*{\nombre}[1]{{#1}\fb@warning{*** \noexpand\nombre
no longer formats numbers\string! ***}}
@@ -2837,19 +2853,23 @@ return french_punctuation
% is \emph{not} loaded automatically by \frenchb{} because of
% possible options conflict.
%
+% \changes{v3.1i}{2015/10/03}{\cs{nombre} command changed when
+% numprint.sty is not loaded: only one warning, no error.}
+%
% \begin{macrocode}
-\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
}
% \end{macrocode}
@@ -3256,6 +3276,9 @@ return french_punctuation
% listings, numprint and natbib are loaded too early or too late
% vs babel.}
%
+% \changes{v3.1i}{2015/10/03}{Remove restriction about loading
+% numprint.sty after babel.}
+%
% Like packages \file{captions} and \file{floatrow} (see
% section~\ref{ssec-captions}), package \file{listings} should be
% loaded after \babel/\frenchb{} due to active characters issues
@@ -3291,19 +3314,6 @@ return french_punctuation
}
% \end{macrocode}
%
-% Package \file{numprint} with option \opt{autolanguage} should be
-% loaded after \babel/\frenchb{} (all engines).
-%
-% \begin{macrocode}
-\@ifpackageloaded{numprint}
- {\ifnprt@autolanguage
- \FBWarning{frenchb.ldf}%
- {Please load the "numprint" package\MessageBreak
- AFTER babel/frenchb; reported}%
- \fi
- }{}
-% \end{macrocode}
-%
% \subsection{Setup options: keyval stuff}
% \label{ssec-keyval}
%
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}%
}%