summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-07 20:58:18 +0000
committerKarl Berry <karl@freefriends.org>2018-04-07 20:58:18 +0000
commit9e5940c56dfe63fab26f34250ac55e37ece2c560 (patch)
tree7d958a87f96e76f7e99de545fa4c13828224127b /Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
parent861b4de389db24dd94535880edb8de1ea4386cf6 (diff)
polyglossia (7apr18)
git-svn-id: svn://tug.org/texlive/trunk@47358 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf')
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf54
1 files changed, 44 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
index 3dbdd18414c..fdffd36cf9d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
@@ -13,6 +13,8 @@
\newluatexattribute\xpg@frpt %
\directlua{polyglossia.load_frpt()}%
\else
+ \newXeTeXintercharclass\french@openbrackets % ( ] {
+ \newXeTeXintercharclass\french@closebrackets % ( ] {
\newXeTeXintercharclass\french@punctthin % ! ? ; et autres
\newXeTeXintercharclass\french@punctthick % :
\newXeTeXintercharclass\french@punctguillstart % « ‹
@@ -22,6 +24,30 @@
\def\xpg@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi}
\def\xpg@nospace#1{#1}
+\ifx\@makefntext\undefined\else
+ \let\nofrench@makefntext\@makefntext
+ \long\def\french@makefntext#1{\parindent1em \noindent\quad\ifx\@thefnmark\empty\else\@thefnmark.\space\fi #1}
+ \let\@makefntext\french@makefntext
+ \define@boolkey{french}[french@]{frenchfootnote}[true]{%
+ \def\@tmpa{#1}
+ \def\@tmptrue{true}
+ \ifx\@tmpa\@tmptrue
+ \let\@makefntext\french@makefntext
+ \else
+ \let\@makefntext\nofrench@makefntext
+ \fi
+ }
+\fi
+
+
+\newif\iffrench@automaticspacesaroundguillemets
+\define@boolkey{french}[french@]{automaticspacesaroundguillemets}[true]{%
+ %\def\tmp@true{true}%
+ %\def\@tmpa{#1}%
+ %\ifx\@tmpa\tmp@true
+}
+\french@automaticspacesaroundguillemetstrue
+
\def\french@punctuation{%
\lccode"2019="2019
\ifluatex
@@ -41,19 +67,31 @@
\XeTeXcharclass `\» \french@punctguillend
\XeTeXcharclass `\‹ \french@punctguillstart
\XeTeXcharclass `\› \french@punctguillend
+ \XeTeXcharclass `\( \french@openbrackets
+ \XeTeXcharclass `\) \french@closebrackets
+ \XeTeXcharclass `\] \french@openbrackets
+ \XeTeXcharclass `\[ \french@closebrackets
+ \XeTeXcharclass `\{ \french@openbrackets
+ \XeTeXcharclass `\} \french@closebrackets
\XeTeXinterchartoks \z@ \french@punctthin = {\nobreak\thinspace}%
\XeTeXinterchartoks \z@ \french@punctthick = {\nobreakspace}%
- \XeTeXinterchartoks 255 \french@punctthin = {\xpg@unskip\nobreak\thinspace}%
- \XeTeXinterchartoks 255 \french@punctthick = {\xpg@unskip\nobreakspace}%
+ \XeTeXinterchartoks \xpg@boundaryclass \french@punctthin = {\xpg@unskip\nobreak\thinspace}%
+ \XeTeXinterchartoks \xpg@boundaryclass \french@punctthick = {\xpg@unskip\nobreakspace}%
\XeTeXinterchartoks \french@punctguillstart \z@ = {\nobreakspace}% "«a" -> "« a"
% \XeTeXinterchartoks \z@ \french@punctguillstart = {\nobreakspace}% "a«" unchanged?
% \XeTeXinterchartoks \french@punctguillend \z@ = {\nobreakspace}% "»a" unchanged?
\XeTeXinterchartoks \z@ \french@punctguillend = {\nobreakspace}% "a»" -> "a »"
- % \XeTeXinterchartoks \french@punctguillstart 255 = {\nobreakspace\xpg@nospace}% "« " -> "«~"
- % \XeTeXinterchartoks 255 \french@punctguillend = {\xpg@unskip\nobreakspace}% " »" -> "~»"
+ \iffrench@automaticspacesaroundguillemets
+ \XeTeXinterchartoks \french@punctguillstart \xpg@boundaryclass = {\nobreakspace\xpg@nospace\relax}% "« " -> "«~"
+ \XeTeXinterchartoks \xpg@boundaryclass \french@punctguillend = {\xpg@unskip\nobreakspace}% " »" -> "~»"
+ \fi
\XeTeXinterchartoks \french@punctguillend \french@punctthin = {\nobreak\thinspace}% "»;" -> "» ;"
\XeTeXinterchartoks \french@punctguillend \french@punctthick = {\nobreakspace}% "»:" -> "» :"
\XeTeXinterchartoks \french@punctthin \french@punctguillend = {\nobreakspace}% "?»" -> "? »"
+ \XeTeXinterchartoks \french@openbrackets \french@punctthin = {\xpg@unskip}% "(?" -> "(?" and not "( ?"
+ \XeTeXinterchartoks \french@punctthin \french@closebrackets = {\xpg@unskip}% "?)" -> "?)" (code not need, just for symetry with previous one)
+ \XeTeXinterchartoks \french@closebrackets \french@punctthin = {\nobreak\thinspace}% ")?" -> ") ?"
+ \XeTeXinterchartoks \french@closebrackets \french@punctthick = {\nobreakspace}% "):" -> ") :"
\fi
}
@@ -104,8 +142,8 @@
Douzième\or Treizième\or Quatorzième\or Quinzième\or
Seizième\or Dix-septième\or Dix-huitième\or Dix-neuvième\or
Vingtième\fi\space}%
- \def\thepart{}%
- \def\partname{\protect\@Fpt partie}%
+ \def\thepart{\@Fpt partie}%
+ \def\partname{}%
\def\pagename{page}%
\def\seename{\emph{voir}}%
\def\alsoname{\emph{voir aussi}}%
@@ -154,8 +192,4 @@
\def\mr{M.\space}
\def\mrs{MM.\space}
-\ifx\@makefntext\undefined\else
-\renewcommand\@makefntext[1]{\quad\ifx\@thefnmark\empty\else\@thefnmark.\space\fi #1}
-\fi
-
\endinput