e-french (30oct15)

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

13 files changed, 52 insertions, 581 deletions

diff --git a/Master/texmf-dist/tex/generic/e-french/efrench.ldf b/Master/texmf-dist/tex/generic/e-french/efrench.ldf
deleted file mode 100644
index ae84c8da1b8..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/efrench.ldf
+++ /dev/null
@@ -1,59 +0,0 @@
-%% This is french.ldf (e-french option for Babel) under LaTeX  --bg 2006/09/28
-%%      to be used like this: \usepackage[e-french]{babel}
-%%
-% After Bernard Gaulle's decease this work is now maintained as
-% the e-French project by a group of enthusiast users 
-% under LPPL copyright as declared in http://www.efrench.org/
-%
-%
-\ProvidesFile{e-french.ldf}% originally:
-%       [2003/11/17 v3.0 % 
-%       [2003/11/19 v3.1 % french loaded before babel e-french.
-%       [2005/03/21 v3.2 % pb francais/frenchb loaded before babel e-french.
-        [2006/09/28 v3.3 % \main@language added before \selectlanguage.
-                    e-french option of babel loading the e-french package]
-\ifx\undefined\captionsfrench
-\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.}
-\let\endfrench\stop\fi
- \endfrench% but stop it until \begin{document}.
-\expandafter\endinput
-\fi
-\chardef\atcatcode=\catcode`\@\catcode`\@=11\relax
-\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
-           \let\babel@core@loaded\main@language\fi%
-\ifx\undefined\originalTeX \let\originalTeX\empty \fi
-\originalTeX
-\ifx\undefined\l@french\@nopatterns{French}\adddialect\l@french0\fi
-
-\protected@write\@auxout{}{\protect% insure files integrity
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- this file and other auxiliary files require to
-                  use the following}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- LaTeX packages: e-french and babel!}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- check \protect\protect\protect\usepackage
-                  \protect\space or remove these files.
-                  Typesetting is aborted!}
-            \protect\stop}}%
-\let\auxWARNINGi=\@gobble% accept aux files produces by french
-\let\auxWARNINGii=\@gobble% and those produces by babel+french
-
-\InputIfFileExists{french.sty}{}% load our e-french package
-  {\PackageError{e-french}% but not via e-french.sty.
-   {-63- e-french style file not found}%
-   {-63- Check if file exist somewhere in your system.}%
-   \let\endfrench\stop%
-  }%
-\endfrench% and stop it immediately until \begin{document}
-\let\noextrasfrancais\endfrench% bug in babel.sty version 3.5e
-\let\extrasfrancais\frenchTeXmods% ditto
-\let\captionsfrancais\captionsfrench%
-\main@language{french}% the \begin{document}.
-\catcode`\@=\atcatcode \let\atcatcode\relax
-\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/e-french/enbib.ldf b/Master/texmf-dist/tex/generic/e-french/enbib.ldf
deleted file mode 100644
index cd81166d4d1..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/enbib.ldf
+++ /dev/null
@@ -1,44 +0,0 @@
-% file enbib.tex
-%
-%   Translation of names defined in frplain.bst, fralpha.bst and frapalike.bst
-%   by Ronan Keryell.
-%                            File initiated by B. Gaulle from R.K.'s frbib.sty
-%   This file is defaultly loaded by french(le).sty
-%   Can be used with the ACM style (then long translation is in force
-%       if you don't type \usepackage{fracm}.
-%                                                         last mods 2000/12/11
-% Voir aussi frbib.tex
-%
-\def\bibsenglish{%
-  \def\andname{and}%
-  \def\editorname{editor}%
-  \def\editornames{editors}%
-  \def\volumename{volume}%
-  \def\Volumename{volumes}%
-  \def\ofname{of}%
-  \def\numbername{number}%
-  \def\Numbername{Number}%
-  \def\inname{in}%
-  \def\Inname{In}%
-  \def\editionname{edition}%
-%  \def\pagename{page}% already defined in french.sty.
-  \def\pagesname{pages}%
-%  \def\chaptername{chapitre\ }% already defined in french.sty.
-  \def\technicalreportname{Technical Report}%
-  \def\revisionname{Revision}%
-  \def\masterthesisname{Master thesis}% for fracm.bst without fracm.sty
-  \def\phdthesisname{PhD thesis}% for fracm.bst without fracm.sty
-  \def\janname{January}%
-  \def\febname{February}%
-  \def\marname{March }%
-  \def\aprname{April}%
-  \def\mayname{May}%
-  \def\junname{June}%
-  \def\julname{July}%
-  \def\augname{August}%
-  \def\sepname{September}%
-  \def\octname{October}%
-  \def\novname{November}%
-  \def\decname{December}%
-}%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/e-french/frbabel.sty b/Master/texmf-dist/tex/generic/e-french/frbabel.sty
deleted file mode 100644
index 4d0524b518b..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/frbabel.sty
+++ /dev/null
@@ -1,170 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}[1998/06/01]
-\ifx\LdfInit\@undefined\input babel.def\relax\fi
-\DeclareOption{acadian}{\input{frenchb.ldf}}
-\DeclareOption{acadien}{\input{french.ldf}}% cf FrenchPro language.dat
-\DeclareOption{afrikaans}{\input{dutch.ldf}}
-\DeclareOption{american}{\input{english.ldf}}
-\DeclareOption{australian}{\input{english.ldf}}
-\DeclareOption{austrian}{\input{germanb.ldf}}
-\DeclareOption{bahasa}{\input{bahasa.ldf}}
-\DeclareOption{basque}{\input{basque.ldf}}
-\DeclareOption{brazil}{\input{portuges.ldf}}
-\DeclareOption{brazilian}{\input{portuges.ldf}}
-\DeclareOption{breton}{\input{breton.ldf}}
-\DeclareOption{british}{\input{english.ldf}}
-\DeclareOption{bulgarian}{\input{bulgarian.ldf}}
-\DeclareOption{canadian}{\input{english.ldf}}
-%\DeclareOption{canadien}{\input{frenchb.ldf}}
-\DeclareOption{canadien}{\input{french.ldf}}% cf FrenchPro language.dat
-\DeclareOption{catalan}{\input{catalan.ldf}}
-\DeclareOption{croatian}{\input{croatian.ldf}}
-\DeclareOption{czech}{\input{czech.ldf}}
-\DeclareOption{danish}{\input{danish.ldf}}
-\DeclareOption{dutch}{\input{dutch.ldf}}
-\DeclareOption{english}{\input{english.ldf}}
-\DeclareOption{esperanto}{\input{esperanto.ldf}}
-\DeclareOption{estonian}{\input{estonian.ldf}}
-\DeclareOption{finnish}{\input{finnish.ldf}}
-\DeclareOption{francais}{\input{frenchb.ldf}}
-\DeclareOption{frenchb}{\input{frenchb.ldf}}
-%%%\DeclareOption{french}{\input{frenchb.ldf}}%
-\DeclareOption{galician}{\input{galician.ldf}}
-\DeclareOption{german}{\input{germanb.ldf}}
-\DeclareOption{germanb}{\input{germanb.ldf}}
-\DeclareOption{greek}{\input{greek.ldf}}
-\DeclareOption{polutonikogreek}{%
-  \input{greek.ldf}%
-  \languageattribute{greek}{polutoniko}}
-\DeclareOption{hebrew}{%
-  \input{rlbabel.def}%
-  \input{hebrew.ldf}}
-\DeclareOption{hungarian}{\input{magyar.ldf}}
-\DeclareOption{icelandic}{\input{icelandic.ldf}}
-\DeclareOption{interlingua}{\input{interlingua.ldf}}
-\DeclareOption{irish}{\input{irish.ldf}}
-\DeclareOption{italian}{\input{italian.ldf}}
-\DeclareOption{latin}{\input{latin.ldf}}
-\DeclareOption{lowersorbian}{\input{lsorbian.ldf}}
-\DeclareOption{magyar}{\input{magyar.ldf}}
-\DeclareOption{naustrian}{\input{ngermanb.ldf}}
-\DeclareOption{newzealand}{\input{english.ldf}}
-\DeclareOption{ngerman}{\input{ngermanb.ldf}}
-\DeclareOption{norsk}{\input{norsk.ldf}}
-\DeclareOption{samin}{\input{samin.ldf}}
-\DeclareOption{nynorsk}{\input{norsk.ldf}}
-\DeclareOption{polish}{\input{polish.ldf}}
-\DeclareOption{portuges}{\input{portuges.ldf}}
-\DeclareOption{portuguese}{\input{portuges.ldf}}
-\DeclareOption{romanian}{\input{romanian.ldf}}
-\DeclareOption{russian}{\input{russianb.ldf}}
-\DeclareOption{scottish}{\input{scottish.ldf}}
-\DeclareOption{serbian}{\input{serbian.ldf}}
-\DeclareOption{slovak}{\input{slovak.ldf}}
-\DeclareOption{slovene}{\input{slovene.ldf}}
-\DeclareOption{spanish}{\input{spanish.ldf}}
-\DeclareOption{swedish}{\input{swedish.ldf}}
-\DeclareOption{turkish}{\input{turkish.ldf}}
-\DeclareOption{ukrainian}{\input{ukraineb.ldf}}
-\DeclareOption{uppersorbian}{\input{usorbian.ldf}}
-\DeclareOption{welsh}{\input{welsh.ldf}}
-\DeclareOption{UKenglish}{\input{english.ldf}}
-\DeclareOption{USenglish}{\input{english.ldf}}
-\DeclareOption*{%
-  \InputIfFileExists{\CurrentOption.ldf}{}{%
-    \PackageError{babel}{%
-      Language definition file \CurrentOption.ldf not found}{%
-      Maybe you misspelled the language option?}}%
-  }
-\InputIfFileExists{bblopts.cfg}{%
-  \typeout{*************************************^^J%
-           * Local config file bblopts.cfg used^^J%
-           *}%
-  }{}
-\DeclareOption{activeacute}{}
-\DeclareOption{activegrave}{}
-\DeclareOption{KeepShorthandsActive}{}
-\ProcessOptions*
-\ifx\bbl@main@language\@undefined
-  \PackageError{babel}{%
-    You haven't specified a language option}{%
-    You need to specify a language, either as a global
-    option\MessageBreak
-    or as an optional argument to the \string\usepackage\space
-    command; \MessageBreak
-    You shouldn't try to proceed from here, type x to quit.}
-  \input{babel.def}
-\fi
-\def\substitutefontfamily#1#2#3{%
-  \lowercase{\immediate\openout15=#1#2.fd\relax}%
-  \immediate\write15{%
-    \string\ProvidesFile{#1#2.fd}%
-    [\the\year/\two@digits{\the\month}/\two@digits{\the\day}
-     \space generated font description file]^^J
-    \string\DeclareFontFamily{#1}{#2}{}^^J
-    \string\DeclareFontShape{#1}{#2}{m}{n}{<->ssub * #3/m/n}{}^^J
-    \string\DeclareFontShape{#1}{#2}{m}{it}{<->ssub * #3/m/it}{}^^J
-    \string\DeclareFontShape{#1}{#2}{m}{sl}{<->ssub * #3/m/sl}{}^^J
-    \string\DeclareFontShape{#1}{#2}{m}{sc}{<->ssub * #3/m/sc}{}^^J
-    \string\DeclareFontShape{#1}{#2}{b}{n}{<->ssub * #3/bx/n}{}^^J
-    \string\DeclareFontShape{#1}{#2}{b}{it}{<->ssub * #3/bx/it}{}^^J
-    \string\DeclareFontShape{#1}{#2}{b}{sl}{<->ssub * #3/bx/sl}{}^^J
-    \string\DeclareFontShape{#1}{#2}{b}{sc}{<->ssub * #3/bx/sc}{}^^J
-    }%
-  \closeout15
-  }
-\@onlypreamble\substitutefontfamily
-\AtBeginDocument{%
-  \@ifpackageloaded{ifthen}{%
-    \bbl@redefine@long\ifthenelse#1#2#3{%
-      \let\bbl@tempa\pageref
-      \let\pageref\org@pageref
-      \@safe@activestrue
-      \org@ifthenelse{#1}{%
-        \let\pageref\bbl@tempa
-        \@safe@activesfalse
-        #2}{%
-        \let\pageref\bbl@tempa
-        \@safe@activesfalse
-        #3}%
-      }%
-    }{}%
-  }
-\AtBeginDocument{%
-  \@ifpackageloaded{varioref}{%
-    \bbl@redefine\@@vpageref#1[#2]#3{%
-      \@safe@activestrue
-      \org@@@vpageref{#1}[#2]{#3}%
-      \@safe@activesfalse}%
-    \bbl@redefine\vrefpagenum#1#2{%
-      \@safe@activestrue
-      \org@vrefpagenum{#1}{#2}%
-      \@safe@activesfalse}%
-    }{}%
-  }
-\AtBeginDocument{%
-  \@ifpackageloaded{hhline}%
-    {\expandafter\ifx\csname normal@char\string:\endcsname\relax
-     \else
-       \makeatletter
-       \def\@currname{hhline}\input{hhline.sty}\makeatother
-     \fi}%
-    {}}
-\DeclareRobustCommand{\FOREIGNLANGUAGE}[1]{%
-  \lowercase{\foreignlanguage{#1}}}
-%%
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-\endinput
diff --git a/Master/texmf-dist/tex/generic/e-french/frbib.ldf b/Master/texmf-dist/tex/generic/e-french/frbib.ldf
deleted file mode 100644
index 609f60f721f..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/frbib.ldf
+++ /dev/null
@@ -1,44 +0,0 @@
-% file frbib.tex
-%
-%   Traduction des noms definis dans frplain.bst, fralpha.bst et frapalike.bst
-%   par Ronan Keryell.
-%               Fichier initialise par B. Gaulle a partir du frbib.sty de R.K.
-%   Ce fichier est charge par defaut dans french(le).sty
-%   Peut etre utilise avec le style de l'ACM (version longue des libelles
-%     si on ne met pas \usepackage{fracm}).
-%                                             derniere modification 2000/12/11
-% Check also enbib.tex
-%  
-\def\bibsfrench{%
-  \def\andname{et}%
-  \def\editorname{\'editeur}%
-  \def\editornames{\'editeurs}%
-  \def\volumename{volume}%
-  \def\Volumename{Volume}%
-  \def\ofname{de}%
-  \def\numbername{num\'ero}%
-  \def\Numbername{Num\'ero}%
-  \def\inname{dans}%
-  \def\Inname{Dans}%
-  \def\editionname{\'edition}%
-%  \def\pagename{page}% de'ja` dans french.sty.
-  \def\pagesname{pages}%
-%  \def\chaptername{chapitre}% de'ja` dans french.sty.
-  \def\technicalreportname{Rapport Technique}%
-  \def\revisionname{R\'evision}%
-  \def\masterthesisname{DEA}% pour fracm.bst sans fracm.sty
-  \def\phdthesisname{Th\`ese de doctorat}% pour fracm.bst sans fracm.sty
-  \def\janname{janvier}%
-  \def\febname{f\'evrier}%
-  \def\marname{mars}%
-  \def\aprname{avril}%
-  \def\mayname{mai}%
-  \def\junname{juin}%
-  \def\julname{juillet}%
-  \def\augname{ao\^ut}%
-  \def\sepname{septembre}%
-  \def\octname{octobre}%
-  \def\novname{novembre}%
-  \def\decname{d\'ecembre}%
-}%
-\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/e-french/french.cfg b/Master/texmf-dist/tex/generic/e-french/french.cfg
index dac7b0f1a4f..fe848358216 100644
--- a/Master/texmf-dist/tex/generic/e-french/french.cfg
+++ b/Master/texmf-dist/tex/generic/e-french/french.cfg
@@ -2,10 +2,11 @@
 \abbreviations
 \disallowuchyph
 \overfullhboxmark
-\tthyphenation
+% on peut réactiver \tthyphenation si nécessaire
+%\tthyphenation    % doit être désactivé pour XeLaTeX  
 \tabbingaccents
 \automaticlettrine
 % désactivez les options de frenchle pour '«' et '»' !
-% test eFrench = {\befr}
-\newcommand{\fbefr}{{\footnotesize E}F{\footnotesize RENCH}}
-\DeclareRobustCommand{\befr}{\fbefr}
\ No newline at end of file
+% test eFrench = {\befr} ce n'était qu'un essai
+%\newcommand{\fbefr}{{\footnotesize E}F{\footnotesize RENCH}}
+%\DeclareRobustCommand{\befr}{\fbefr}
diff --git a/Master/texmf-dist/tex/generic/e-french/french.ldf b/Master/texmf-dist/tex/generic/e-french/french.ldf
deleted file mode 100644
index befe87736f4..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/french.ldf
+++ /dev/null
@@ -1,87 +0,0 @@
-%% This is french.ldf (french option for Babel) under LaTeX     --bg 2006/09/27
-%
-% After Bernard Gaulle's decease this work is now maintained as
-% the e-French project by a group of enthusiast users 
-% under LPPL copyright as declared in http://www.efrench.org/
-%
-\ProvidesFile{french.ldf}% originally:
-%       [1995/06/19 v1.0 the first try with Babel 3.4
-%       [1997/01/02 v1.2 well a just in time for 3.5 alpha
-%       [1997/02/21 v1.3 mods for 3.6, pb is loading babel.def at good time.
-%       [1997/03/28 v1.4 
-%       [1997/08/26 v1.5 
-%       [1999/09/21 v1.6 
-%       [2000/07/04 v1.7 % french light support (frenchle) added. 
-%       [2000/08/29 v1.8 % french light correction (frenchle speaks french)
-%       [2001/11/28 v1.9 % french loaded before babel, special case.
-%       [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.
-        [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:
-  \ifx\@mlp@loaded\undefined% but only if the mlp package wasn't 
-  \else% already loaded.
-       \PackageError{\CurrentOption}%
-               {-80- Babel is willing to load the \CurrentOption\space option%
-               \MessageBreak but the mlp package is already loaded, %
-               please choose %
-               \MessageBreak either mlp with \CurrentOption\space option, %
-               \CurrentOption\space alone %
-               \MessageBreak or babel with \CurrentOption\space option}%
-               {just remove the superfluous package or option.}%
-  \expandafter\endinput\fi%
- \expandafter\let\expandafter\ifLPA\csname iffalse\endcsname
- \let\nofrenchtypography\relax
- \let\nofrenchtranslation\relax
- \let\nofrenchlayout\relax
- \let\nofrenchmacros\relax
- \let\nofrenchhyphenation\relax
- \ifx\LdfInit\undefined\else\expandafter\LdfInit\fi
- \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.}
-\let\endfrench\stop\fi
- \endfrench% but stop it until \begin{document}.
- \expandafter\endinput%
-\fi
-\ifnum\catcode`\@=11\else\expandafter\catcode`\@=11\fi%
-\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
-           \let\babel@core@loaded\main@language\fi%
-\ifx\undefined\originalTeX \let\originalTeX\empty \fi
-\originalTeX
-\ifx\undefined\l@french\@nopatterns{French}\adddialect\l@french0\fi
-
-\protected@write\@auxout{}{\protect% insure files integrity
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- this file and other auxiliary files require to
-                  use the following}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- LaTeX packages: french and babel!}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- check \protect\protect\protect\usepackage
-                  \protect\space or remove these files.
-                  Typesetting is aborted!}
-            \protect\stop}}%
-\let\auxWARNINGi=\@gobble% accept aux files produces by french
-\let\auxWARNINGii=\@gobble% and those produces by babel+french
-
-\InputIfFileExists{french.sty}{}% load our french pro package
- {\InputIfFileExists{frenchle.sty}{}% or the light version if any,
-  {\PackageError{french/frenchle}%
-   {-63- french or frenchle style files not found}%
-   {-63- Check if files exist somewhere in your system.}%
-   \let\endfrench\stop%
-  }%
- }%
-\endfrench% and stop it immediately until \begin{document}
-\let\noextrasfrancais\endfrench% bug in babel.sty version 3.5e
-\let\extrasfrancais\frenchTeXmods% ditto
-\let\captionsfrancais\captionsfrench%
-\main@language{french}%
-\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/e-french/french.sty b/Master/texmf-dist/tex/generic/e-french/french.sty
index dfece88af88..5494a021dcd 100644
--- a/Master/texmf-dist/tex/generic/e-french/french.sty
+++ b/Master/texmf-dist/tex/generic/e-french/french.sty
@@ -1,17 +1,17 @@
 % This file is a part of the e-French package.
 % For more details please read efrenchp.pdf
-\expandafter\ifx\csname frenchTeXmods\endcsname\relax%
-\else \endinput \fi%
+%\expandafter\ifx\csname frenchTeXmods\endcsname\relax%   ---??
+%\else \endinput \fi%                                     ---??
 \def\frenchname{french}%
-\def\frenchpack{eFrench}%          eFrench
+\def\frenchpack{e-french}%          eFrench
 \def\ds@french{}%
 \def\ds@pmfrench{\pmfrench}%
 {\catcode`\@=11{%
  \ifx\@unexpandable@protect\undefined\let\protect\empty%
  \else\let\protect\@unexpandable@protect%
  \fi%
-                           \xdef\FSfd{20 octobre 2011}%          eFrench
-                           \xdef\FSfv{V5,9995}% 
+                           \xdef\FSfd{30 octobre 2015}%          eFrench
+                           \xdef\FSfv{V6,0}% 
                            \xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
 }}%
                            \edef\FSfd{2007/06/28 }%
@@ -325,10 +325,12 @@
                           %
 \def\originalinput#1{\ifFrench\english\@finput{#1}\french%
                                 \else\@finput{#1}\fi\relax}%
-\def\originaloutput[#1]{%
-     \bgroup\ifFrench\english\fi%
-     \def\@riginalout##1##2{\immediate\write##1{##2}\egroup}%
-     \@riginalout{#1}}%
+\def\originaloutput[#1]{%       <BG
+     \ifFrench\english\fi%
+     \def\@riginalout##1##2{\immediate\write##1{##2}}%
+     \@riginalout{#1}}%      >BG
+% ou moins souple d'emploi : RJ
+%\def\originaloutput#1#2{\ifFrench\english\fi\immediate\write#1{#2}}% RJ
 \let\ifFLA\iffalse%
 \@ifundefined{printindex}{%
     \def\see#1#2{\seename%
@@ -2802,22 +2804,21 @@
                             }%
 \def\Nouveau@Langage[##1]##2{%                              > def nouveau langage 1
 %arabic as a language should not change the definition of \arabic  
-% the same is valid for future similar cases 
+% the same is valid for future similar cases         > -- arabic prepare 
     \expandafter\@ifundefined{##2}{\lang@defifalse}% 
-                {\lang@defitrue}%  
+                {\lang@defitrue}%                           
+    \expandafter\@ifundefined{mlp##2}{\langmlp@defifalse}% 
+                {\langmlp@defitrue}%                           
+    \def\l@n@test{##2}
+   \ifx \l@n@fre\l@n@test\langok@defitrue\fi %               \def\l@n@fre{french}%
+   \ifx \l@n@eng\l@n@test\langok@defitrue\fi %               \def\l@n@eng{english}%
+%    \iflangok@defi \typeout{ ##1 : ##2}\fi% 
+%                                                    < -- arabic prepare
     \expandafter\@ifundefined{l@##2}{}%
-    {%
-     \chardef\l@no##1\expandafter\if\csname l@##2\endcsname\l@no\else%
-     \edef\l@no{##1}\expandafter%
-     %
-    \ifx\csname l@##2\endcsname\l@no%
-    \else\f@issue\typeout{^^J \frenchname.sty \string: -27- %
-        %
-        %
-                         }[##2]\f@ERRdat%
-    \fi\fi}%
+         \iflangok@defi 
+         {%            
           \expandafter\tl@ng\csname##2TeXmods\endcsname%
-        \iflang@defi% 
+        \iflang@defi%                                                      ++ test langue existe ?
           \expandafter\gdef\csname##2Lang \endcsname%
           {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
            \@Hif\language=##1\@Hfi\relax}%
@@ -2829,13 +2830,15 @@
                 et \\##2TeXmods pour ses extensions }%
             \typeout{eFrench Info : % 
                 avec \\ = une seule barre oblique inverse ===}%
-        \else% 
+           \else%                                                             ** langue n'existe pas  encore
           \expandafter\gdef\csname##2 \endcsname%
           {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
            \@Hif\language=##1\@Hfi\relax}%
           \expandafter\gdef\csname##2\endcsname%
                            {\protect\csname##2 \endcsname}%
         \fi% 
+           }                                              % -- test langue existe
+        \fi%                                              % -- test langok@defi 
                             }%                             < def nouveau langage 1 
 \edef\@temp@{=}%
 \def\@langue##1##2 ##3 ##4/##5{\def\@tempa{=}\def\@tempb{##1}%
@@ -2844,7 +2847,7 @@
             \relax%
             \expandafter\Nouveau@Langage\expandafter[\the\@FrCount]{##2}%
                       \ifnum\@FrCount \@temp@ 0 \@FrCount= -1\fi%
-    \else\edef\@temp@{<}\@l@ngue##1##2 ##3 ##4/{##5}%
+    \else\langok@defifalse\edef\@temp@{<}\@l@ngue##1##2 ##3 ##4/{##5}%
     \fi}%
 \def\@l@ngue##1 ##2 ##3/##4{\Nouveau@Langage[##4]{##1}%
          %
@@ -2874,6 +2877,10 @@
        \fi
 \else\@FrCount=-1%
 \newif\iflang@defi% 
+\newif\iflangmlp@defi%
+\newif\iflangok@defi%
+\def\l@n@fre{french}%
+\def\l@n@eng{english}%
 \let\englishORI\english%  
 \let\english\undefined%  
 \loop  \endlinechar=-1  \read\@inputcheck to \@lineD  \endlinechar`\^^M%
diff --git a/Master/texmf-dist/tex/generic/e-french/frenchle.ldf b/Master/texmf-dist/tex/generic/e-french/frenchle.ldf
deleted file mode 100644
index c5509f6c056..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/frenchle.ldf
+++ /dev/null
@@ -1,63 +0,0 @@
-%% This is frenchle.ldf (frenchle option for Babel) under LaTeX --bg 2006/09/27
-%%      to be used like this: \usepackage[frenchle]{babel}
-%%
-%%
-% After Bernard Gaulle's decease this work is now maintained as a part of
-% the e-French project by a group of enthusiast users 
-% under LPPL copyright as declared in http://www.efrench.org/
-%
-%
-\ProvidesFile{frenchle.ldf}% 
-%       [2001/04/12 v1.0 % Original file.
-%       [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.
-        [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\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.}
-\let\endfrench\stop\fi
- \endfrench% but stop it until \begin{document}.
-\expandafter\endinput
-\fi
-\chardef\atcatcode=\catcode`\@\catcode`\@=11\relax
-\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
-           \let\babel@core@loaded\main@language\fi%
-\ifx\undefined\originalTeX \let\originalTeX\empty \fi
-\originalTeX
-\ifx\undefined\l@french\@nopatterns{French}\adddialect\l@french0\fi
-
-\protected@write\@auxout{}{\protect% insure files integrity
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- this file and other auxiliary files require to
-                  use the following}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- LaTeX packages: frenchle and babel!}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- check \protect\protect\protect\usepackage
-                  \protect\space or remove these files.
-                  Typesetting is aborted!}
-            \protect\stop}}%
-\let\auxWARNINGi=\@gobble% accept aux files produces by french
-\let\auxWARNINGii=\@gobble% and those produces by babel+french
-\InputIfFileExists{frenchle.sty}{}% load the light version package.
-  {\PackageError{frenchle}%
-   {-63- frenchle style file not found}%
-   {-63- Check if file exist somewhere in your system.}%
-   \let\endfrench\stop%
-  }%
-\endfrench% and stop it immediately until \begin{document}
-\let\noextrasfrancais\endfrench% bug in babel.sty version 3.5e
-\let\extrasfrancais\frenchTeXmods% ditto
-\let\captionsfrancais\captionsfrench%
-\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/generic/e-french/frenchle.sty b/Master/texmf-dist/tex/generic/e-french/frenchle.sty
index be262777682..977bbecbd7f 100644
--- a/Master/texmf-dist/tex/generic/e-french/frenchle.sty
+++ b/Master/texmf-dist/tex/generic/e-french/frenchle.sty
@@ -1937,9 +1937,12 @@
                             }%
 \def\Nouveau@Langage[##1]##2{%                              > def nouveau langage 1
 %arabic as a language should not change the definition of \arabic 
-% the same is valid for future similar cases
+% the same is valid for future similar cases         > -- arabic prepare 
     \expandafter\@ifundefined{##2}{\lang@defifalse}%
                 {\lang@defitrue}% 
+    \expandafter\@ifundefined{mlp##2}{\langmlp@defifalse}% 
+                {\langmlp@defitrue}%                           
+%                                                    < -- arabic prepare
     \expandafter\@ifundefined{l@##2}{}%
     {%
      \chardef\l@no##1\expandafter\if\csname l@##2\endcsname\l@no\else%
@@ -1951,8 +1954,10 @@
         \@txt@msg{(at initex) numbered \csname l@##2\endcsname\space(ERROR!)}%
                          }[##2]\f@ERRdat%
     \fi\fi}%
+       \iflangmlp@defi \typeout {eFrench Info : langue ##2 choisie par mlp}\else% 
+         {%            
           \expandafter\tl@ng\csname##2TeXmods\endcsname%
-        \iflang@defi%
+        \iflang@defi%                                                      ++ test langue existe ?
           \expandafter\gdef\csname##2Lang \endcsname%
           {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
            \@Hif\language=##1\@Hfi\relax}%
@@ -1964,13 +1969,15 @@
                 et \\##2TeXmods pour ses extensions }%
             \typeout{eFrench Info : % 
                 avec \\ = une seule barre oblique inverse ===}%
-        \else%
+        \else%                                                             ** langue n'existe pas  
           \expandafter\gdef\csname##2 \endcsname%
           {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
            \@Hif\language=##1\@Hfi\relax}%
           \expandafter\gdef\csname##2\endcsname%
                            {\protect\csname##2 \endcsname}%
-        \fi%
+        \fi% 
+           }                                              % -- test langue existe
+        \fi%                                              % -- test mlp<lang> existe
                             }%                             < def nouveau langage 1 
 \edef\@temp@{=}%
 \def\@langue##1##2 ##3 ##4/##5{\def\@tempa{=}\def\@tempb{##1}%
@@ -2009,6 +2016,7 @@
        \fi
 \else\@FrCount=-1%
 \newif\iflang@defi%
+\newif\iflangmlp@defi%
 \let\englishORI\english% 
 \let\english\undefined% 
 \loop  \endlinechar=-1  \read\@inputcheck to \@lineD  \endlinechar`\^^M%
diff --git a/Master/texmf-dist/tex/generic/e-french/frenchpro.ldf b/Master/texmf-dist/tex/generic/e-french/frenchpro.ldf
deleted file mode 100644
index 20aaeeceb7f..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/frenchpro.ldf
+++ /dev/null
@@ -1,59 +0,0 @@
-%% This is french.ldf (frenchpro option for Babel) under LaTeX  --bg 2006/09/28
-%%      to be used like this: \usepackage[frenchpro]{babel}
-%%
-% After Bernard Gaulle's decease this work is now maintained as
-% the e-French project by a group of enthusiast users 
-% under LPPL copyright as declared in http://www.efrench.org/
-%
-%
-\ProvidesFile{frenchpro.ldf}% originally:
-%       [2003/11/17 v3.0 % 
-%       [2003/11/19 v3.1 % french loaded before babel frenchpro.
-%       [2005/03/21 v3.2 % pb francais/frenchb loaded before babel FrenchPro.
-        [2006/09/28 v3.3 % \main@language added before \selectlanguage.
-                    frenchpro option of babel loading the FrenchPro package]
-\ifx\undefined\captionsfrench
-\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.}
-\let\endfrench\stop\fi
- \endfrench% but stop it until \begin{document}.
-\expandafter\endinput
-\fi
-\chardef\atcatcode=\catcode`\@\catcode`\@=11\relax
-\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
-           \let\babel@core@loaded\main@language\fi%
-\ifx\undefined\originalTeX \let\originalTeX\empty \fi
-\originalTeX
-\ifx\undefined\l@french\@nopatterns{French}\adddialect\l@french0\fi
-
-\protected@write\@auxout{}{\protect% insure files integrity
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- this file and other auxiliary files require to
-                  use the following}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- LaTeX packages: FrenchPro and babel!}}}
-\protected@write\@auxout{}{\protect%
-\csname auxWARNINGii\protect\endcsname{\protect\typeout
-            {-34- check \protect\protect\protect\usepackage
-                  \protect\space or remove these files.
-                  Typesetting is aborted!}
-            \protect\stop}}%
-\let\auxWARNINGi=\@gobble% accept aux files produces by french
-\let\auxWARNINGii=\@gobble% and those produces by babel+french
-
-\InputIfFileExists{french.sty}{}% load our FrenchPro package
-  {\PackageError{frenchpro}% but not via frenchpro.sty.
-   {-63- FrenchPro style file not found}%
-   {-63- Check if file exist somewhere in your system.}%
-   \let\endfrench\stop%
-  }%
-\endfrench% and stop it immediately until \begin{document}
-\let\noextrasfrancais\endfrench% bug in babel.sty version 3.5e
-\let\extrasfrancais\frenchTeXmods% ditto
-\let\captionsfrancais\captionsfrench%
-\main@language{french}% the \begin{document}.
-\catcode`\@=\atcatcode \let\atcatcode\relax
-\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/e-french/internat.mlp b/Master/texmf-dist/tex/generic/e-french/internat.mlp
index 0e96eead8ac..f00e2259881 100644
--- a/Master/texmf-dist/tex/generic/e-french/internat.mlp
+++ b/Master/texmf-dist/tex/generic/e-french/internat.mlp
@@ -38,12 +38,9 @@
 \DeclareOption{frenchle}{\@requirepackage{mlp-33}% 
                        \PassOptionsToPackage{frenchle}{mlp-33}%
                       }%
-\DeclareOption{frenchpro}{\@requirepackage{mlp-33}% 
-                       \PassOptionsToPackage{frenchpro}{mlp-33}%
+\DeclareOption{efrench}{\@requirepackage{mlp-33}% 
+                       \PassOptionsToPackage{efrench}{mlp-33}%
                       }%
-\DeclareOption{dutch}{\@requirepackage{mlp-31}% 
-                      \PassOptionsToPackage{dutch}{mlp-31}%
-                     }%
 \DeclareOption{naustrian}{\@requirepackage{mlp-49n}%
                           \PassOptionsToPackage{ngerman}{mlp-49}%
                          }%
diff --git a/Master/texmf-dist/tex/generic/e-french/mlp-31.sty b/Master/texmf-dist/tex/generic/e-french/mlp-31.sty
deleted file mode 100644
index b72fd25dbd4..00000000000
--- a/Master/texmf-dist/tex/generic/e-french/mlp-31.sty
+++ /dev/null
@@ -1,16 +0,0 @@
-% mlp-31.sty (the dutch interface for the mlp package)  last mods 2000/09/06
-%
-%%
-%%      checksum        = "63302 137 659 7109"
-%%
-% TO DO...
-\DeclareOption{dutch}{%\PassOptionsToPackage{dutch}{dutch}
-\typeout{^^J*** Dutch Option is still Unprocessed ***}
-   \typeout{*** MLP don't know which package use! ***}
-                     }
-\ProvidesFile{mlp-31.sty}% 
-        [2000/09/06 dutch interface for the mlp package]
-\ProcessOptions% Process that option definitely for mlp-31
-%\RequirePackage{dutch}% Load the dutch package.
-\def\@lastoption{dutch}% The language to start typesetting with.
-\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
diff --git a/Master/texmf-dist/tex/generic/e-french/mlp-33.sty b/Master/texmf-dist/tex/generic/e-french/mlp-33.sty
index a7b4860e10c..892cc968b4b 100644
--- a/Master/texmf-dist/tex/generic/e-french/mlp-33.sty
+++ b/Master/texmf-dist/tex/generic/e-french/mlp-33.sty
@@ -11,8 +11,8 @@
                       }
 \DeclareOption{frenchle}{\PassOptionsToPackage{french}{frenchle}
                          \def\PackageName{frenchle}}
-\DeclareOption{frenchpro}{\PassOptionsToPackage{french}{french}
-                         \def\PackageName{frenchpro}}
+\DeclareOption{efrench}{\PassOptionsToPackage{french}{french}
+                         \def\PackageName{french}}
 \ProcessOptions% Process that option definitely for mlp-33.
 \RequirePackage{\PackageName}% Load french package.
 \def\@lastoption{french}% The language to start typesetting with.