summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-04 21:38:49 +0000
committerKarl Berry <karl@freefriends.org>2018-02-04 21:38:49 +0000
commit371ddd4c16bf1b16d9bd81caf9525e53128d3087 (patch)
tree0c2aa2eb11e9f62718231c5c31a5454d34dbf1a0 /Master/texmf-dist/tex/generic/babel-french
parent1c9587af6a3b815a4aac0212e5a2eb328ee9b99c (diff)
babel-french (4feb18)
git-svn-id: svn://tug.org/texlive/trunk@46543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf49
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
6 files changed, 30 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 37370ec4d77..6192d73d9c3 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 7d6094dc33d..24fcd0f6fec 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 0cd6945199c..36bea3b3d98 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 94b40ae1a01..2ab988fbf00 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -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@active@punct \FB@active@puncttrue
\newif\ifFB@luatex@punct
\ifFBLuaTeX
- \ifnum\luatexversion<95
+ \ifnum\luatexversion<100
\ifx\PackageWarning\@undefined
- \fb@warning{Please upgrade LuaTeX to version 0.95 or above!\\%
+ \fb@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@dialect=1 \relax
\fi
\ifdefined\FB@once\else
- \set@glue@table{FBcolonspace}{colon}%
- \set@glue@table{FBthinspace}{thin}%
- \set@glue@table{FBguillspace}{guill}%
+ \set@glue@table{colon}%
+ \set@glue@table{thin}%
+ \set@glue@table{guill}%
\def\FB@once{}%
\fi
\fi
@@ -248,34 +248,34 @@
\fb@info{No need for active punctuation characters\\
with this version of LuaTeX!}
\fi
- \newcommand*{\set@glue@table}[2]{%
+ \newcommand*{\set@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@date}
\SetString\today{\FB@date{\year}{\month}{\day}}
\EndBabelCommands
\newcommand*{\FB@date}[3]{%
@@ -649,6 +648,8 @@
\ifx#1\@empty\else\FBdatespace\number#1\fi}}
\newcommand*{\FBdatebox}{\hbox}
\newcommand*{\FBdatespace}{\space}
+\newcommand*{\frenchdate}{\FBdatebox\FB@date}
+\newcommand*{\acadiandate}{\FBdatebox\FB@date}
\newif\ifFB@poorman
\newdimen\FB@Mht
\ifLaTeXe
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index e36542d717b..ccb6c37498e 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -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@tempa{frenchb}
\ifx\CurrentOption\bbl@tempa
\let\l@frenchb\l@french
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 76c8d5bda35..8b2e9e921cd 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -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.