diff options
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf | 83 |
1 files changed, 32 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf index 85bc82ddd79..9a03f06af7d 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf @@ -1,70 +1,51 @@ \ProvidesFile{gloss-french.ldf}[polyglossia: module for french] \makeatletter \def\french@font{\normalfontlatin} -\lccode"2019="2019 \ifx\l@french\@undefined% \xpg@nopatterns{French}% - \adddialect\l@french0% + \adddialect\l@french\l@nohyphenation% \fi +\newXeTeXintercharclass\french@punctthin % ! ? ; +\newXeTeXintercharclass\french@punctthick % : +\newXeTeXintercharclass\french@punctguill % « » + +\def\french@punctthinspace{\unskip\thinspace} +\def\french@punctthickspace{\unskip\nobreakspace} + \def\french@punctuation{% - \frenchspacing% - \XeTeXinterchartokenstate=1% - \XeTeXcharclass `\! 7% - \XeTeXcharclass `\? 7% - \XeTeXcharclass `\; 7% - \XeTeXcharclass `\: 7% - \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}% + \frenchspacing + \lccode"2019="2019 + \XeTeXinterchartokenstate=1 + \XeTeXcharclass `\! \french@punctthin + \XeTeXcharclass `\? \french@punctthin + \XeTeXcharclass `\; \french@punctthin + \XeTeXcharclass `\: \french@punctthick + \XeTeXinterchartoks \z@ \french@punctthin = \french@punctthinspace + \XeTeXinterchartoks \z@ \french@punctthick = \french@punctthickspace } \def\nofrench@punctuation{% - \nonfrenchspacing% - \XeTeXinterchartokenstate=0% + \nonfrenchspacing + \lccode"2019=\z@ + \XeTeXinterchartokenstate=0 } \def\french@guillemets{% - \XeTeXinterchartokenstate=1% - \XeTeXcharclass `\« 8% - \XeTeXcharclass `\» 8% - \XeTeXinterchartoks 8 0 = {\kern.1667em}% - \XeTeXinterchartoks 0 8 = {\unskip\kern.1667em}% - \XeTeXinterchartoks 8 7 = {\unskip\kern.1667em}% "»;" -> "» ;" - \XeTeXinterchartoks 7 8 = {\unskip\kern.1667em}% "?»" -> "? »" + \XeTeXinterchartokenstate=1 + \XeTeXcharclass `\« \french@punctguill + \XeTeXcharclass `\» \french@punctguill + \XeTeXinterchartoks \french@punctguill \z@ = \french@punctthickspace + \XeTeXinterchartoks \z@ \french@punctguill = \french@punctthickspace + \XeTeXinterchartoks \french@punctguill \french@punctthin = \french@punctthinspace + % "»;" -> "» ;" + \XeTeXinterchartoks \french@punctguill \french@punctthick = \french@punctthickspace + % "»:" -> "» :" + \XeTeXinterchartoks \french@punctthin \french@punctguill = \french@punctthickspace + % "?»" -> "? »" } -%\newcounter{niveauguillemets}[paragraph] -% -%\def\tmp@normal{normal} -%\def\tmp@paragraphe{paragraphe} -%\def\tmp@ligne{ligne} - -%TODO -%\define@key{french}{guillemets}[normal]{ -% \def\@tmpa{#1} -% \ifx\@tmpa\tmp@ligne% -% \def\french@guill@mets{% FIXME -% \def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em\setcounter{niveauguillemets}{1}% -% \ifthenelse{\value{niveauguillemets} = 1}{\localleftbox{«\kern.1667em}}% -% {\everypar={{«}\kern.1667em}\setcounter{niveauguillemets}{1}}}% -% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»% -% \everypar={}\localleftbox{}}}% -% \else\ifx\@tmpa\tmp@paragraphe% -% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em% -% \everypar={«\kern.1667em}}\def\RightPointingDoubleAngleQuotationMark% -% {\unskip\kern.1667em»\everypar={}}}% -% \else\ifx\@tmpa\tmp@normal% -% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em}% -% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»}}% -%\fi\fi\fi} -% -%\def\tmp@sans{sansaccents} -%\define@key{french}{majuscules}{% -% \def\@tmpa{#1}% -% \ifx\@tmpa\tmp@sans% -% \addfontfeature{Mapping=sansaccents}% <<< TODO! -% \fi} - \def\captionsfrench{% \def\refname{Références}% \def\abstractname{Résumé}% @@ -104,7 +85,7 @@ décembre\fi% \space \number\year}} -\def\french@language{\protect\language=\l@french} +\def\french@language{\language=\l@french} \setlocalhyphenmins{french}{2}{2}% |