babel-french (19aug15)

git-svn-id: svn://tug.org/texlive/trunk@38160 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 17 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index bbeab074f65..711d1177f3f 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index f8a289f85f0..4e559ab63a3 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{3222}
+%\CheckSum{3231}
 %
 %\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/06/26 v3.1g French support from the babel system]
+         [2015/08/19 v3.1h French support from the babel system]
 %</!lua>
 %<*internal>
 \iffalse
@@ -958,7 +958,7 @@
 %    If no specific hyphenation patterns are available, Canadian French
 %    will use the French ones.
 %
-%    TODO: Canadien French hyphenation doesn't work with LuaTeX.
+%    TODO: Canadian French hyphenation doesn't work with LuaTeX.
 %    \begin{macrocode}
 \ifx\l@acadian\@undefined
    \ifx\l@canadien\@undefined
@@ -4657,13 +4657,22 @@ return french_punctuation
 % \changes{v3.0a}{2014/02/20}{french.cfg will be loaded (if found)
 %    instead of frenchb.cfg.  NO NEED for .cfg files in French anyway.}
 %
+% \changes{v3.1h}{2015/08/19}{french.cfg from e-french conflicts with
+%    frenchb. Do NOT load it (no need for .cfg files with frenchb
+%    anyway).}
+%
 %    Final cleaning.
 %    The macro |\ldf@finish| takes care for setting the main language
 %    to be switched on at |\begin{document}| and resetting the
-%    category code of \texttt{@} to its original value.
+%    category code of \texttt{@} to its original value. |\loadlocalcfg|
+%    is redefined locally in order not to load any \file{.cfg} file for
+%    French.
 %    \begin{macrocode}
 \FBclean@on@exit
+\let\FB@llc\loadlocalcfg
+\let\loadlocalcfg\@gobble
 \ldf@finish\CurrentOption
+\let\loadlocalcfg\FB@llc
 %    \end{macrocode}
 % \iffalse
 %</ldf>
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index b5e4134f4d8..5ac20ad0d42 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/06/26 v3.1g French support from the babel system]
+         [2015/08/19 v3.1h French support from the babel system]
 %%
 %%  File `frenchb.ldf'
 %%  Babel package for LaTeX version 2e
@@ -1659,7 +1659,10 @@
 \newcommand*{\FrenchFootnotes}{\FBFrenchFootnotestrue}
 \newcommand*{\StandardFootnotes}{\FBFrenchFootnotesfalse}
 \FBclean@on@exit
+\let\FB@llc\loadlocalcfg
+\let\loadlocalcfg\@gobble
 \ldf@finish\CurrentOption
+\let\loadlocalcfg\FB@llc
 \endinput
 %%
 %% End of file `frenchb.ldf'.