summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/e-french/french.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/e-french/french.sty')
-rw-r--r--Master/texmf-dist/tex/generic/e-french/french.sty38
1 files changed, 31 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/e-french/french.sty b/Master/texmf-dist/tex/generic/e-french/french.sty
index 9b5d92b8f93..62434faa161 100644
--- a/Master/texmf-dist/tex/generic/e-french/french.sty
+++ b/Master/texmf-dist/tex/generic/e-french/french.sty
@@ -10,12 +10,28 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{10 ao\^ut 2017}% eFrench
- \xdef\FSfv{V6,01}%
+ \xdef\FSfd{7 janvier 2019}% eFrench
+ \xdef\FSfv{V6,02}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
- \edef\FSfd{2017/08/10}%
+ \edef\FSfd{2019/01/07}%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]%
+% > utf8 and NoEncode specialities
+\newif\ifeF@NoEnc %No encoding (XeTex, LuaLaTex)
+\expandafter\expandafter
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\else
+ \eF@NoEnctrue
+\fi
+%
+\newif\ifeF@LuaTeX
+\expandafter\ifx\csname lualatexversion\endcsname\relax
+\else
+ \eF@LuaTeXtrue \eF@NoEnctrue
+\fi
+% In order having no encoding by messages declare this :
+ \let\kbencoding\@gobble
+% < utf8 and NoEncode specialities
\let\auxWARNINGi=\@gobble%
\def\@txt@msg#1{#1}%
\def\@gobbleopt[#1]{}%
@@ -36,10 +52,10 @@
\xdef\@currname{msg}%
\def\intern@lc@llfrom{\frenchpack}%
\let\fp@languagename\languagename%
- \ifx\documentclass\@twoclasseserror%
+ \ifx\documentclass\@twoclasseserror%
\def\languagename{french}%
- \fi%
- \@@input msg.sty%
+ \fi
+ \@@input msg.sty%
\let\languagename\fp@languagename%
\let\fp@languagename\undefined%
\let\intern@lc@llfrom\undefined%
@@ -91,10 +107,12 @@
%
}\expandafter\stop%
\fi%
+\ifeF@LuaTeX\relax\else
\ifx\l@french\undefined\f@issue\typeout{^^J -20-
%
%
}%
+ \fi%
\fi%
\fontencoding{\encodingdefault}\selectfont%
\def\@temp@{OT1}\ifx\@temp@\f@encoding%
@@ -605,7 +623,9 @@
\fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}}%
\DeclareTextCommand{\guillemotright}{OT1}{\hbox{%
\fontencoding{U}\fontfamily{lasy}\selectfont)\kern-0.20em)}}}
+\ifeF@NoEnc\else
\IfFileExists{t1lmr.fd}{\PolishGuillemets}{\LasyGuillemets}
+\fi
\DeclareTextSymbolDefault{\guillemotleft}{OT1}
\DeclareTextSymbolDefault{\guillemotright}{OT1}
\def\guill@spacing{\penalty\@M\hskip.8\fontdimen2\font
@@ -1359,6 +1379,9 @@
Typesetting is aborted!}%
\protect\stop}}%
\fi%
+\ifeF@NoEnc
+\@finput{efrenchu.tex}
+\fi
\@finput{frpatch.sty}%
\ifx\FSfd@patch\FSfd\else
\f@issue%
@@ -2812,6 +2835,7 @@
\expandafter\@ifundefined{mlp##2}{\langmlp@defifalse}%
{\langmlp@defitrue}%
\def\l@n@test{##2}
+% here only the choises french or english, excluding arabic as language
\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%
@@ -2888,7 +2912,7 @@
\loop \endlinechar=-1 \read\@inputcheck to \@lineD \endlinechar`\^^M%
\ifx\@lineD\empty \else \advance\@FrCount by 1%
\edef\@lineD{\@lineD\space\space/{\the\@FrCount}}%
- \expandafter\@langue\@lineD%
+ \expandafter\@langue\@lineD% aller voir \@langue
\fi%
\ifeof\@inputcheck \@morefalse \fi%
\if@more\repeat%