diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf')
-rw-r--r-- | Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf index 43040b0c70b..40b1a3a2442 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf @@ -22,8 +22,8 @@ \setlanguagealias[variant=canadian]{french}{canadien} \def\french@variant{french} -\define@choicekey*+{french}{variant}[\val\nr]{french,canadian,acadian,swiss}[french]{% - \ifcase\nr\relax +\define@choicekey*+{french}{variant}[\xpg@val\xpg@nr]{french,canadian,acadian,swiss}[french]{% + \ifcase\xpg@nr\relax % french: \def\french@variant{french}% \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR}% @@ -53,7 +53,7 @@ \adddialect\l@swissfrench\l@french\relax% \french@thincolonspacetrue \fi - \xpg@info{Option: French, variant=\val}% + \xpg@info{Option: French, variant=\xpg@val}% }{\xpg@warning{Unknown French variant `#1'}} @@ -76,7 +76,11 @@ \def\xpg@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi} % Save original footnote definition -\let\xpg@orig@makefntext\@makefntext +% Do this at the end of the preamble to catch other +% packages' footnote changes (#391) +\AtEndPreamble{% + \let\xpg@orig@makefntext\@makefntext +} \define@boolkey{french}[french@]{frenchfootnote}[true]{% \AfterPreamble{% |