diff options
Diffstat (limited to 'Master/texmf-dist/doc/generic/e-french/src/french_doc.txt')
-rw-r--r-- | Master/texmf-dist/doc/generic/e-french/src/french_doc.txt | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/e-french/src/french_doc.txt b/Master/texmf-dist/doc/generic/e-french/src/french_doc.txt index f7b76cceeb9..3ebcdc8e154 100644 --- a/Master/texmf-dist/doc/generic/e-french/src/french_doc.txt +++ b/Master/texmf-dist/doc/generic/e-french/src/french_doc.txt @@ -30,11 +30,11 @@ \ifx\@unexpandable@protect\undefined\let\protect\empty% \else\let\protect\@unexpandable@protect% \fi% - \xdef\FSfd{10 ao\^ut 2017}% eFrench - \xdef\FSfv{V6,01}% r j + + \xdef\FSfd{7 janvier 2019}% eFrench + \xdef\FSfv{V6,02}% rj \xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}% }}% - \edef\FSfd{2017/08/10}% + \edef\FSfd{2019/01/07}% % % History as given by Bernard Gaulle: % I started this job years ago (in 1989) firstly @@ -60,6 +60,23 @@ % % Running only with LaTeX2e, oldest format required: \NeedsTeXFormat{LaTeX2e}[1996/12/01]% -the latest one acceptable +% > utf8 specialities +% These specifications are here to facilitate the use of +% french guillemets with a XeLaTex motor under utf8 +\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 + \let\kbencoding\@gobble +% < utf8 specialities \let\auxWARNINGi=\@gobble% -accept aux files produced by french % This style is using, at most: %%< @@ -158,6 +175,13 @@ % Changes made by Raymond Juillerat 2017/02/24 % \newcount, \newdimen, \newbox only not redefind if from eTeX % Changes made by Raymond Juillerat 2017/08/10 +% V6,02 +% some preparations for XeLaTeX and LuaLaTeX +% New file efrenchu.tex in order having utf8 french guillemets +% active. +% This file corrects also the hyphenation problem with apostroph +% Problems with LuaLaTex remain but by using msg.sty! +% Changes made by Raymond Juillerat 2019/01/07 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -202,19 +226,7 @@ % then cumulated. % \english for going back to "normal" English conventions % And if you have a language.dat config file defining -% german and dutch languages OR you use -% \NouveauLangage[n]{german} and -% \NouveauLangage[p]{dutch} where n and p are internal -% unused language number, then you can type: -% \german to switch to German conventions -% \dutch or to switch to Dutch conventions or to -% \any_name (any language created by \NouveauLangage[n]{any_name}) -% \NouveauLangage[n]{language_name} (as previously explained) -% define \language_name which will call \language_nameTeX -% assuming that \language_nameTeX is/will be defined -% (normally in a style file). -% \beginlanguage switch to the language that started first after -% \begin{document} (depending of the last lang.style opt) +% german languages, as it is normally the case. % \beginFWdirection switch to the first direction of writing when TeX--XeT. %-------------------- % Commands for compatibility: @@ -637,10 +649,11 @@ \xdef\@currname{msg}% -Set package req. \def\intern@lc@llfrom{\frenchpack}% -Say him it's an internal/kernel call. \let\fp@languagename\languagename% -Save current language name. - \ifx\documentclass\@twoclasseserror% -When not a kernel case - \def\languagename{french}% -force French for the msg package. - \fi% - \@@input msg.sty% -and input it now. +% -now we force French for the msg package. + \ifx\documentclass\@twoclasseserror% -When not a kernel case + \def\languagename{french}% - force French for the msg package. + \fi + \@@input msg.sty% -and input it now \let\languagename\fp@languagename% -Reset current language name. \let\fp@languagename\undefined% \let\intern@lc@llfrom\undefined% @@ -703,12 +716,14 @@ }\expandafter\stop% \fi% % +\ifeF@LuaTeX\relax\else \ifx\l@french\undefined\f@issue\typeout{^^J -20- %\@txt@msg{WARNING:}% %\@txt@msg{the French language is undefined in your format.}% }% \fi% % +\fi% \fontencoding{\encodingdefault}\selectfont% \def\@temp@{OT1}\ifx\@temp@\f@encoding% \def\@temp@{\global\ECMfalse}% @@ -1282,7 +1297,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 @@ -2150,6 +2167,10 @@ \protect\stop}}% %\let\auxWARNINGi=\@gobble% set in the preambule \fi% +% for french guillemets with a XeLaTex motor under utf8 +\ifeF@NoEnc +\@finput{efrenchu.tex} +\fi % patch inclusion: \@finput{frpatch.sty}% \ifx\FSfd@patch\FSfd\else @@ -3799,6 +3820,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 V6,0 \ifx \l@n@fre\l@n@test\langok@defitrue\fi % french is accepted:\def\l@n@fre{french}% \ifx \l@n@eng\l@n@test\langok@defitrue\fi % english accepted: \def\l@n@eng{english}% % \iflangok@defi \typeout{ ##1 : ##2}\fi% |