texlive[46543] Master/texmf-dist: babel-french (4feb18)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 4 22:38:49 CET 2018
Revision: 46543
http://tug.org/svn/texlive?view=revision&revision=46543
Author: karl
Date: 2018-02-04 22:38:49 +0100 (Sun, 04 Feb 2018)
Log Message:
-----------
babel-french (4feb18)
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/acadian.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
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 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2018-02-04 21:38:49 UTC (rev 46543)
@@ -1,4 +1,4 @@
-%\CheckSum{3593}
+%\CheckSum{3597}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -699,6 +699,8 @@
% spacing before high punctuation and inside quotes independently for
% \Lopt{french} and \Lopt{acadian}, see p.~\pageref{FBsetspaces}.
%
+% Version 3.4 requires eTeX and LuaTeX 1.0.4 or newer.
+%
% \subsubsection*{What’s new in version 3.3?}
%
% In version~3.3d the automatic insertion of non-breaking spaces
@@ -811,7 +813,7 @@
% TL2013 and up): active characters are no longer used in French
% for `high punctuation’%
% \footnote{The current \frenchb{} version requires LuaTeX
-% v.~0.95 as included in TL2016, see above.}.
+% v.~1.0.4 as included in TL2017, see above.}.
% Functionalities and user interface are unchanged.
%
% Many thanks to Paul Isambert who provided the basis for the
@@ -1117,22 +1119,22 @@
% \end{macro}
%
% \begin{macro}{\ifFB at luatex@punct}
-% With LuaTeX, starting with version 0.95, callbacks are used to
+% With LuaTeX, starting with version 1.0.4, callbacks are used to
% get rid of active punctuation. With previous versions, `high
% punctuation’ characters remain active (see below).
% \begin{macrocode}
\newif\ifFB at luatex@punct
\ifFBLuaTeX
- \ifnum\luatexversion<95
+ \ifnum\luatexversion<100
\ifx\PackageWarning\@undefined
- \fb at warning{Please upgrade LuaTeX to version 0.95 or above!\\%
+ \fb at warning{Please upgrade LuaTeX to version 1.0.4 or above!\\%
babel-french will make high punctuation characters (;:!?)\\%
- active with LuaTeX < 0.95.}%
+ active with LuaTeX < 1.0.4.}%
\else
\PackageWarning{french.ldf}{Please upgrade LuaTeX
- to version 0.95 or above!\MessageBreak
+ to version 1.0.4 or above!\MessageBreak
babel-french will make high punctuation characters%
- \MessageBreak (;:!?) active with LuaTeX < 0.95;%
+ \MessageBreak (;:!?) active with LuaTeX < 1.0.4;%
\MessageBreak reported}%
\fi
\else
@@ -1306,9 +1308,9 @@
% language, |\extrasfrench| has been executed before!
% \begin{macrocode}
\ifdefined\FB at once\else
- \set at glue@table{FBcolonspace}{colon}%
- \set at glue@table{FBthinspace}{thin}%
- \set at glue@table{FBguillspace}{guill}%
+ \set at glue@table{colon}%
+ \set at glue@table{thin}%
+ \set at glue@table{guill}%
\def\FB at once{}%
\fi
\fi
@@ -1387,7 +1389,7 @@
% through callbacks with LuaTeX engines.}
%
% The following part holds specific code for punctuation with modern
-% LuaTeX engines, i.e. version 0.95 (included in TL2016) or newer.
+% LuaTeX engines, i.e. version 1.0.4 (included in TL2017) or newer.
%
% \changes{v3.0b}{2014/02/13}{Require luatexbase with LaTeXe in case
% fontspec has not been loaded before babel.}
@@ -1471,35 +1473,39 @@
% The matching space characters for option \fbo{UnicodeNoBreakSpaces}
% are set as word space, thin space or null space according to the
% \textit{width} parameter.
+%
+% \changes{v3.4a}{2018/01/30}{Lua function token.get\_meaning requires
+% LuaTeX 1.0.}
+%
% \begin{macrocode}
- \newcommand*{\set at glue@table}[2]{%
+ \newcommand*{\set at glue@table}[1]{%
\directlua {
- local s = token.get_meaning("#1")
+ local s = token.get_meaning("FB#1space")
local t = FBget_glue(s)
if t then
- FBsp.#2.gl.fr = t
- if not FBsp.#2.gl.ac[1] then
- FBsp.#2.gl.ac = t
+ FBsp.#1.gl.fr = t
+ if not FBsp.#1.gl.ac[1] then
+ FBsp.#1.gl.ac = t
end
- if FBsp.#2.gl.fr[1] > 0.6 then
- FBsp.#2.ch.fr = 0xA0
- elseif FBsp.#2.gl.fr[1] > 0.2 then
- FBsp.#2.ch.fr = 0x202F
+ if FBsp.#1.gl.fr[1] > 0.6 then
+ FBsp.#1.ch.fr = 0xA0
+ elseif FBsp.#1.gl.fr[1] > 0.2 then
+ FBsp.#1.ch.fr = 0x202F
else
- FBsp.#2.ch.fr = 0x200B
+ FBsp.#1.ch.fr = 0x200B
end
- if not FBsp.#2.ch.ac then
- FBsp.#2.ch.ac = FBsp.#2.ch.fr
+ if not FBsp.#1.ch.ac then
+ FBsp.#1.ch.ac = FBsp.#1.ch.fr
end
else
texio.write_nl('term and log', '')
texio.write_nl('term and log',
- '*** french.ldf warning: Unexpected syntax in FB#2space,')
+ '*** french.ldf warning: Unexpected syntax in FB#1space,')
texio.write_nl('term and log',
'*** french.ldf warning: LuaTeX table FBsp unchanged.')
texio.write_nl('term and log',
'*** french.ldf warning: Consider using FBsetspaces to ')
- texio.write('term and log', 'customise FB#2space.')
+ texio.write('term and log', 'customise FB#1space.')
texio.write_nl('term and log', '')
end
}%
@@ -2854,10 +2860,10 @@
% \begin{macro}{\frenchdate}
% \begin{macro}{\datefrench}
% The following code creates a macro |\datefrench| which in turn
-% defines commands |\frenchdate| and |\frenchtoday| to produce French
-% dates (|\today| is defined as |\frenchtoday| in French).
-% The corresponding commands for the French dialect, |\dateacadian|,
-% |\acadiandate| and |\acadiantoday| are also created btw.
+% defines command |\frenchtoday| (|\today| is defined as
+% |\frenchtoday| in French).
+% The corresponding commands for the French dialect, |\dateacadian|
+% and |\acadiantoday| are also created btw.
% This new implementation relies on commands |\SetString| and
% |\SetStringLoop|, therefore requires \babel~3.10 or newer.
%
@@ -2870,11 +2876,12 @@
% \changes{v3.0a}{2014/02/18}{Take advantage of babel’s \cs{SetString}
% commands for \cs{datefrench}. Doesn’t work with Plain (yet?).}
%
-% \changes{v3.4a}{2017/12/14}{Creates new command \cs{frenchdate}.}
-%
% \changes{v3.4a}{2018/01/04}{Specific code for Plain finally removed
% (babel bug reported).}
%
+% \changes{v3.4b}{2018/02/44}{Do not redefine \cs{date} as
+% \cs{frenchdate} in French.}
+%
% Explicitly defining |\BabelLanguages| as the list of all French
% dialects defines \emph{both} |\datefrench| and |\dateacadian|;
% this is required as \file{french.ldf} is read only once even if
@@ -2893,7 +2900,6 @@
\SetStringLoop{month#1name}{%
janvier,f\'evrier,mars,avril,mai,juin,juillet,%
ao\^ut,septembre,octobre,novembre,d\'ecembre}
- \SetString\date{\FBdatebox\FB at date}
\SetString\today{\FB at date{\year}{\month}{\day}}
\EndBabelCommands
% \end{macrocode}
@@ -2907,6 +2913,8 @@
\ifx#1\@empty\else\FBdatespace\number#1\fi}}
\newcommand*{\FBdatebox}{\hbox}
\newcommand*{\FBdatespace}{\space}
+\newcommand*{\frenchdate}{\FBdatebox\FB at date}
+\newcommand*{\acadiandate}{\FBdatebox\FB at date}
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-02-04 21:38:49 UTC (rev 46543)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2018-02-04 21:38:49 UTC (rev 46543)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
\PackageWarning{canadien.ldf}%
{Option `canadien' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2018-02-04 21:38:49 UTC (rev 46543)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
\PackageWarning{francais.ldf}%
{Option `francais' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2018-02-04 21:38:49 UTC (rev 46543)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2018
@@ -129,16 +129,16 @@
\newif\ifFB at active@punct \FB at active@puncttrue
\newif\ifFB at luatex@punct
\ifFBLuaTeX
- \ifnum\luatexversion<95
+ \ifnum\luatexversion<100
\ifx\PackageWarning\@undefined
- \fb at warning{Please upgrade LuaTeX to version 0.95 or above!\\%
+ \fb at warning{Please upgrade LuaTeX to version 1.0.4 or above!\\%
babel-french will make high punctuation characters (;:!?)\\%
- active with LuaTeX < 0.95.}%
+ active with LuaTeX < 1.0.4.}%
\else
\PackageWarning{french.ldf}{Please upgrade LuaTeX
- to version 0.95 or above!\MessageBreak
+ to version 1.0.4 or above!\MessageBreak
babel-french will make high punctuation characters%
- \MessageBreak (;:!?) active with LuaTeX < 0.95;%
+ \MessageBreak (;:!?) active with LuaTeX < 1.0.4;%
\MessageBreak reported}%
\fi
\else
@@ -195,9 +195,9 @@
\else \FB at dialect=1 \relax
\fi
\ifdefined\FB at once\else
- \set at glue@table{FBcolonspace}{colon}%
- \set at glue@table{FBthinspace}{thin}%
- \set at glue@table{FBguillspace}{guill}%
+ \set at glue@table{colon}%
+ \set at glue@table{thin}%
+ \set at glue@table{guill}%
\def\FB at once{}%
\fi
\fi
@@ -248,34 +248,34 @@
\fb at info{No need for active punctuation characters\\
with this version of LuaTeX!}
\fi
- \newcommand*{\set at glue@table}[2]{%
+ \newcommand*{\set at glue@table}[1]{%
\directlua {
- local s = token.get_meaning("#1")
+ local s = token.get_meaning("FB#1space")
local t = FBget_glue(s)
if t then
- FBsp.#2.gl.fr = t
- if not FBsp.#2.gl.ac[1] then
- FBsp.#2.gl.ac = t
+ FBsp.#1.gl.fr = t
+ if not FBsp.#1.gl.ac[1] then
+ FBsp.#1.gl.ac = t
end
- if FBsp.#2.gl.fr[1] > 0.6 then
- FBsp.#2.ch.fr = 0xA0
- elseif FBsp.#2.gl.fr[1] > 0.2 then
- FBsp.#2.ch.fr = 0x202F
+ if FBsp.#1.gl.fr[1] > 0.6 then
+ FBsp.#1.ch.fr = 0xA0
+ elseif FBsp.#1.gl.fr[1] > 0.2 then
+ FBsp.#1.ch.fr = 0x202F
else
- FBsp.#2.ch.fr = 0x200B
+ FBsp.#1.ch.fr = 0x200B
end
- if not FBsp.#2.ch.ac then
- FBsp.#2.ch.ac = FBsp.#2.ch.fr
+ if not FBsp.#1.ch.ac then
+ FBsp.#1.ch.ac = FBsp.#1.ch.fr
end
else
texio.write_nl('term and log', '')
texio.write_nl('term and log',
- '*** french.ldf warning: Unexpected syntax in FB#2space,')
+ '*** french.ldf warning: Unexpected syntax in FB#1space,')
texio.write_nl('term and log',
'*** french.ldf warning: LuaTeX table FBsp unchanged.')
texio.write_nl('term and log',
'*** french.ldf warning: Consider using FBsetspaces to ')
- texio.write('term and log', 'customise FB#2space.')
+ texio.write('term and log', 'customise FB#1space.')
texio.write_nl('term and log', '')
end
}%
@@ -640,7 +640,6 @@
\SetStringLoop{month#1name}{%
janvier,f\'evrier,mars,avril,mai,juin,juillet,%
ao\^ut,septembre,octobre,novembre,d\'ecembre}
- \SetString\date{\FBdatebox\FB at date}
\SetString\today{\FB at date{\year}{\month}{\day}}
\EndBabelCommands
\newcommand*{\FB at date}[3]{%
@@ -649,6 +648,8 @@
\ifx#1\@empty\else\FBdatespace\number#1\fi}}
\newcommand*{\FBdatebox}{\hbox}
\newcommand*{\FBdatespace}{\space}
+\newcommand*{\frenchdate}{\FBdatebox\FB at date}
+\newcommand*{\acadiandate}{\FBdatebox\FB at date}
\newif\ifFB at poorman
\newdimen\FB at Mht
\ifLaTeXe
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-02-04 21:38:49 UTC (rev 46543)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\let\l at frenchb\l at french
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2018-02-04 21:38:32 UTC (rev 46542)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2018-02-04 21:38:49 UTC (rev 46543)
@@ -1,6 +1,6 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2018/01/30 v3.4a French support from the babel system]
+ [2018/02/04 v3.4b French support from the babel system]
Copyright © 2014-2018 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
More information about the tex-live-commits
mailing list