summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/frenchb.ldf')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf55
1 files changed, 36 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 910bab413da..2862ce94b67 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}
- [2014/02/28 v3.0a French support from the babel system]
+ [2014/03/14 v3.0b French support from the babel system]
%%
%% File `frenchb.ldf'
%% Babel package for LaTeX version 2e
@@ -185,20 +185,27 @@
\newskip\FBthinskip
\FBthinskip=1.66672pt \relax
\ifFB@luatex@punct
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname newluatexattribute\endcsname\relax
- \input luaotfload.sty
- \fi
- \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax
- \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax
\ifLaTeXe
+ \AtEndOfPackage{%
+ \RequirePackage{luatexbase}%
+ \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax
+ \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax
+ }
\PackageInfo{frenchb.ldf}{No need for active punctuation characters%
\MessageBreak with this version of LuaTeX!%
\MessageBreak reported}
\else
- \fb@info{No need for active punctuation characters\\
- with this version of LuaTeX!}
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname newluatexattribute\endcsname\relax
+ \input luaotfload.sty
+ \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax
+ \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax
+ \fb@info{No need for active punctuation characters\\
+ with this version of LuaTeX!}
+ \fi
\fi
+\fi
+\ifFB@luatex@punct
\newcommand*{\FB@luatex@punct@french}{%
\ifx\shorthandoffORI\@undefined
\let\shorthandonORI\shorthandon
@@ -226,15 +233,24 @@
\FB@addto{extras}{\FB@luatex@punct@french}
\FB@addto{noextras}{\FB@luatex@punct@nonfrench}
\def\activate@luatexpunct{%
- \directlua{%
- FR = \the\l@french
- local f = dofile("frenchb.lua")
- luatexbase.add_to_callback("pre_linebreak_filter",
- f, "frenchb.french_punctuation",1)
- luatexbase.add_to_callback("hpack_filter",
- f, "frenchb.french_punctuation",1)
- }%
- }
+ \directlua{%
+ FR = \the\l@french
+ local path = kpse.find_file("frenchb.lua", "lua")
+ if path then
+ local f = dofile(path)
+ luatexbase.add_to_callback("pre_linebreak_filter",
+ f, "frenchb.french_punctuation",1)
+ luatexbase.add_to_callback("hpack_filter",
+ f, "frenchb.french_punctuation",1)
+ else
+ texio.write_nl('')
+ texio.write_nl('*****************************')
+ texio.write_nl('Error: frenchb.lua not found.')
+ texio.write_nl('*****************************')
+ texio.write_nl('')
+ end
+ }%
+ }
\fi
\newcount\FB@interchartokenstateORI
\ifFB@xetex@punct
@@ -415,11 +431,12 @@
\FBAutoSpacePunctuationtrue}
\def\NoAutoSpaceBeforeFDP{\noautospace@beforeFDP
\FBAutoSpacePunctuationfalse}
+ \AtEndOfPackage{\AutoSpaceBeforeFDP}
\else
\let\AutoSpaceBeforeFDP\autospace@beforeFDP
\let\NoAutoSpaceBeforeFDP\noautospace@beforeFDP
+ \AutoSpaceBeforeFDP
\fi
-\AutoSpaceBeforeFDP
\ifLaTeXe
%\let\ttfamilyORI\ttfamily
%\let\rmfamilyORI\rmfamily