update of frenchle

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

4 files changed, 69 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/frenchle/babelfr.sty b/Master/texmf-dist/tex/latex/frenchle/babelfr.sty
new file mode 100644
index 00000000000..9e48ff936ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/frenchle/babelfr.sty
@@ -0,0 +1,49 @@
+%% File 'babelfr.sty'
+%% Babelfr package for LaTeX2e and frenchle.
+%% Copyright (C) 2006 Bernard GAULLE,
+%%                            all rights reserved.
+%%
+%% Package babelfr: since the 2003 release of Babel, the options "french" no 
+%% more loads french.ldf and so disallows the global option "french"; so 
+%%% nobody can now provide, thru Babel, any other French option than the 
+%% "frenchb" option, thanks!
+%% The goal of this litte package "babelfr" is to come back on that decision
+%% and reestablish this historical facility coming from the begining of Babel.
+%% =========================
+%% A noter : si "french" est fourni en option dans \documentclass
+%% et que d'aures langues sont indiquees dans \usepackage{babel},
+%% il est alors necessaire de passer en francais (par \french) juste 
+%% apres le \begin{document}.
+%% 
+%% Bogues : m'envoyer les rapports de bogue a  <frenchle at free.fr>
+%%
+\NeedsTeXFormat{LaTeX2e}[1998/06/01]
+\ProvidesPackage{babelfr}[2006/09/27 v1.0 The Bfr package]
+\ifx\LdfInit\@undefined\input babel.def\relax\fi
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{babel} }%
+\ProcessOptions*
+\let\bfr@DO\DeclareOption%
+\def\DeclareOption#1#2{\edef\@tempa{french}\edef\@tempb{#1}%
+                       \def\@tempc{\bfr@DO{#1}{#2}}%
+                       \def\@tempd{\bfr@DO{french}%
+                                          {\let\DeclareOption\bfr@DO%
+                                           \input french.ldf}%
+                                   \bfr@DO{frenchle}%
+                                          {\let\DeclareOption\bfr@DO%
+                                           \input frenchle.ldf}%
+                                   \bfr@DO{frenchpro}%
+                                          {\let\DeclareOption\bfr@DO%
+                                           \input frenchpro.ldf}%   
+                                  }%
+                       \ifx\@tempa\@tempb\expandafter\@tempd%
+                       \else\expandafter\@tempc%
+                       \fi}%
+% Same as \RequirePackageWithOptions{babel} but it runs. %
+\let\@currname@bfr\@currname%
+\def\@currname{babel}%
+\input babel.sty %%
+\let\@currname\@currname@bfr%
+\let\DeclareOption\bfr@DO\let\bfr@DO\undefined%
+\endinput
+%%
+%% End of file `babelfr.sty'.
diff --git a/Master/texmf-dist/tex/latex/frenchle/french.ldf b/Master/texmf-dist/tex/latex/frenchle/french.ldf
index ff0451e736a..9d51a0040ce 100644
--- a/Master/texmf-dist/tex/latex/frenchle/french.ldf
+++ b/Master/texmf-dist/tex/latex/frenchle/french.ldf
@@ -1,6 +1,6 @@
-%% This is french.ldf (french option for Babel) under LaTeX     --bg 2005/03/21
+%% This is french.ldf (french option for Babel) under LaTeX     --bg 2006/09/27
 %%
-%                  Copyright 1995-2005 Bernard GAULLE, Copyright notice: LPPL
+%                  Copyright 1995-2006 Bernard GAULLE, Copyright notice: LPPL
 %%
 %%      checksum        = "46368 87 373 4073"
 %
@@ -18,7 +18,8 @@
 %       [2003/11/19 v1.10 % french loaded before babel frenchle/frenchpro,
 %       [2004/06/25 v1.11 % mlp loaded before babel. \atcatcode removed. 
 %       [2004/09/13 v1.12 % messages numbers changed.
-        [2005/03/21 v1.13 % pb francais/frenchb loaded before babel FrenchPro.
+%       [2005/03/21 v1.13 % pb francais/frenchb loaded before babel FrenchPro.
+        [2006/09/28 v1.14 % \main@language added before \selectlanguage.
                  french option of babel loading the frenchle/FrenchPro package]
 \ifx\undefined\captionsfrench% In case french is allready loaded,
 \else% major switchs should be set now:
@@ -40,7 +41,7 @@
  \let\nofrenchmacros\relax
  \let\nofrenchhyphenation\relax
  \ifx\LdfInit\undefined\else\expandafter\LdfInit\fi
- \selectlanguage{french}% Select again French
+ \main@language{french}\selectlanguage{french}% Select again French
 \expandafter\ifx\csname endfrench\endcsname\relax
 \PackageError{frenchle}{-93- You are using two French options for Babel, %
                         please choose only one.}
@@ -57,14 +58,14 @@
 
 \protected@write\@auxout{}{\protect% insure files integrity
 \csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34a- this file and other auxiliary files require to
+            {-34- this file and other auxiliary files require to
                   use the following}}}
 \protected@write\@auxout{}{\protect%
 \csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34b- LaTeX packages: french and babel!}}}
+            {-34- LaTeX packages: french and babel!}}}
 \protected@write\@auxout{}{\protect%
 \csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34c- check \protect\protect\protect\usepackage
+            {-34- check \protect\protect\protect\usepackage
                   \protect\space or remove these files.
                   Typesetting is aborted!}
             \protect\stop}}%
@@ -74,8 +75,8 @@
 \InputIfFileExists{french.sty}{}% load our french pro package
  {\InputIfFileExists{frenchle.sty}{}% or the light version if any,
   {\PackageError{french/frenchle}%
-   {-63a- french or frenchle style files not found}%
-   {-63b- Check if files exist somewhere in your system.}%
+   {-63- french or frenchle style files not found}%
+   {-63- Check if files exist somewhere in your system.}%
    \let\endfrench\stop%
   }%
  }%
diff --git a/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf b/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf
index d3b505a3dcf..86cf664c072 100644
--- a/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf
+++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf
@@ -1,8 +1,8 @@
-%% This is frenchle.ldf (frenchle option for Babel) under LaTeX --bg 2005/03/23
+%% This is frenchle.ldf (frenchle option for Babel) under LaTeX --bg 2006/09/27
 %%      to be used like this: \usepackage[frenchle]{babel}
 %%
 %%
-%       Copyright 2001-2005 Bernard GAULLE, Copyright notice: LPPL
+%       Copyright 2001-2006 Bernard GAULLE, Copyright notice: LPPL
 %%
 %%      checksum        = "31013 61 238 2743"
 %
@@ -12,10 +12,12 @@
 %       [2001/06/07 v1.1 % Doc. & msg changes.
 %       [2003/11/19 v1.2 % french loaded before babel frenchle.
 %       [2005/03/21 v1.3 % pb francais/frenchb loaded before babel frenchle.
-        [2005/03/23 v1.4 % global French option taken in account.
+%       [2005/03/23 v1.4 % global French option taken in account.
+        [2006/09/27 v1.5 % \main@language added before \selectlanguage.
+                         % \main@language moved at end after \ProcessOptions.
                     Frenchle option of babel loading the French Light package]
 \ifx\undefined\captionsfrench
-\else\selectlanguage{french}% Select again French
+\else\main@language{french}\selectlanguage{french}% Select again French
 \expandafter\ifx\csname endfrench\endcsname\relax
 \PackageError{frenchle}{-93- You are using two French options for Babel, %
                         please choose only one.}
@@ -55,7 +57,7 @@
 \let\noextrasfrancais\endfrench% bug in babel.sty version 3.5e
 \let\extrasfrancais\frenchTeXmods% ditto
 \let\captionsfrancais\captionsfrench%
-\main@language{french}%
 \catcode`\@=\atcatcode \let\atcatcode\relax
 \DeclareOption{french}{}\ProcessOptions% Now global option french is used.
+\main@language{french}%
 \endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/frenchle/frenchle.sty b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty
index 82eef30daa1..549c952cf1b 100644
--- a/Master/texmf-dist/tex/latex/frenchle/frenchle.sty
+++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty
@@ -47,11 +47,11 @@
  \ifx\@unexpandable@protect\undefined\let\protect\empty%
  \else\let\protect\@unexpandable@protect%
  \fi%
-                           \xdef\FSfd{25 ao\^ut 2006}%
-                           \xdef\FSfv{V5,999}%
+                           \xdef\FSfd{3 octobre 2006}%
+                           \xdef\FSfv{V5,9991}%
                            \xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
 }}%
-                           \edef\FSfd{2006/08/25 }%
+                           \edef\FSfd{2006/10/03 }%
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]%
 \let\auxWARNINGi=\@gobble%
 \def\@txt@msg#1{#1}%