1 files changed, 31 insertions, 24 deletions
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%