diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic')
| -rw-r--r-- | Master/texmf-dist/tex/generic/e-french/efrenchu.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/e-french/french.sty | 61 |
2 files changed, 56 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/e-french/efrenchu.tex b/Master/texmf-dist/tex/generic/e-french/efrenchu.tex index b33ff9cd41f..fadd26ffff1 100644 --- a/Master/texmf-dist/tex/generic/e-french/efrenchu.tex +++ b/Master/texmf-dist/tex/generic/e-french/efrenchu.tex @@ -1,4 +1,4 @@ -%% This is file `french_msg-msg.tex', +%% This is file `efrenchu.tex', %% File is part of the "efrench" package \ifdefined\XeTeXrevision% XeTeXinterchartoks \XeTeXinputencoding{utf8} diff --git a/Master/texmf-dist/tex/generic/e-french/french.sty b/Master/texmf-dist/tex/generic/e-french/french.sty index 62434faa161..e02faef7eb7 100644 --- a/Master/texmf-dist/tex/generic/e-french/french.sty +++ b/Master/texmf-dist/tex/generic/e-french/french.sty @@ -10,11 +10,11 @@ \ifx\@unexpandable@protect\undefined\let\protect\empty% \else\let\protect\@unexpandable@protect% \fi% - \xdef\FSfd{7 janvier 2019}% eFrench - \xdef\FSfv{V6,02}% + \xdef\FSfd{8 mars 2019}% eFrench + \xdef\FSfv{V6,1}% \xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}% }}% - \edef\FSfd{2019/01/07}% + \edef\FSfd{2019/03/08}% \NeedsTeXFormat{LaTeX2e}[1996/12/01]% % > utf8 and NoEncode specialities \newif\ifeF@NoEnc %No encoding (XeTex, LuaLaTex) @@ -29,6 +29,7 @@ \else \eF@LuaTeXtrue \eF@NoEnctrue \fi +\newif\ifeFr@Typo\eFr@Typotrue % In order having no encoding by messages declare this : \let\kbencoding\@gobble % < utf8 and NoEncode specialities @@ -737,6 +738,7 @@ \sloppy% \nonfrenchspacing% \regularmathcomma% + \eFr@Typofalse }% \def\frenchtypography{% \let\ifFTY\iftrue\let\if@Back\ifFTY% @@ -756,6 +758,7 @@ \vfuzz=\@tempa% \frenchspacing% \frenchmathcomma% + \eFr@Typotrue }% \def\nofrenchtranslation{% \let\ifFTR\iffalse\@cORI}% @@ -1379,9 +1382,6 @@ Typesetting is aborted!}% \protect\stop}}% \fi% -\ifeF@NoEnc -\@finput{efrenchu.tex} -\fi \@finput{frpatch.sty}% \ifx\FSfd@patch\FSfd\else \f@issue% @@ -2328,6 +2328,55 @@ \def\@WTS{\relax\ifmmode\else\ifhmode% \ifdim\lastskip>\z@\unskip\fi% \fi\fi}% +% > for XeLaTex ****** +% de gloss-french +\def\intercharpunct{% + \lccode\lccode8217=8217 + \XeTeXinterchartokenstate=1 + \XeTeXcharclass `\! \french@punctthin + \XeTeXcharclass `\? \french@punctthin + \XeTeXcharclass `\; \french@punctthin + \XeTeXcharclass `\: \french@punctthick + \XeTeXinterchartoks \z@ \french@punctthin = {\nobreak\thinspace}% + \XeTeXinterchartoks \z@ \french@punctthick = {\nobreakspace}% + \XeTeXinterchartoks 4095 \french@punctthin = {\efr@unskip\nobreak\thinspace}% + \XeTeXinterchartoks 4095 \french@punctthick = {\efr@unskip\nobreakspace}% + } +\def\nointercharpunct{% + \lccode8217=\z@ + \XeTeXcharclass `\! \z@ + \XeTeXcharclass `\? \z@ + \XeTeXcharclass `\; \z@ + \XeTeXcharclass `\: \z@ + \XeTeXinterchartokenstate=0 + } +\newcount\eF@nonchar +\newif\ifeF@active@punct +\newif\ifeF@xetex@punct +\ifdefined\XeTeXinterchartokenstate + \eF@xetex@puncttrue\eF@active@punctfalse + \ifdim\the\XeTeXversion\XeTeXrevision pt<0.99994pt + \eF@nonchar=255 \relax + \else + \eF@nonchar=4095 \relax + \fi +\fi +\ifeF@xetex@punct + \newXeTeXintercharclass\french@punctthin % ! ? ; et autres + \newXeTeXintercharclass\french@punctthick % : +% + \def\efr@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi} + \def\xpg@nospace#1{#1} +% + \ifeFr@Typo\protect\intercharpunct\else\nointercharpunct\fi +\fi% +% < for XeLaTex ****** + +\ifeF@NoEnc + \@finput{efrenchu.tex} % pour guillemets utf8 + \AtBeginDocument{\nointercharpunct} +\fi + \def\@tempc{% \def;{\ifFTY\protect\@PV% \else\ifWTS\@WTS\fi\string;\fi}% |