diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/fmtcount/fc-french.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-french.def | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def index 43180885d80..af6c49a242f 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-french.def,package') %% %% fmtcount.dtx -%% Copyright 2014 Nicola Talbot and Vincent Belaïche +%% Copyright 2015 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fcnumparser.sty, fcprefix.sty, fmtcount.sty, fc-american.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -48,6 +48,9 @@ %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} %%\end{definition} +%% Local Variables: +%% coding: utf-8 +%% End: \ProvidesFCLanguage{french}[2012/10/24]% \def\fc@french@set@plural#1#2#3#4#5#6{% \ifthenelse{\equal{#2}{reformed}}{% @@ -165,6 +168,7 @@ \def\fmtcount@french{#1}}% }% \@tempa{france}\@tempa{swiss}\@tempa{belgian}% +\def\fmtcount@french{france}% \define@key{fcfrench}{dialect}[france]{% \ifthenelse{\equal{#1}{france} \or\equal{#1}{swiss} @@ -189,22 +193,34 @@ \newcommand*{\@ordinalMfrench}[2]{% \iffmtord@abbrv - \edef#2{\number#1\relax\noexpand\fmtord{e}}% + \ifnum#1=1 % + \edef#2{\number#1\relax\noexpand\fmtord{er}}% + \else + \edef#2{\number#1\relax\noexpand\fmtord{e}}% + \fi \else - \ifnum#1=1\relax + \PackageWarning{fmtcount}{Non abbreviated ordinal finals (`eme) are + considered incorrect in French.}% + \ifnum#1=1 % \edef#2{\number#1\relax\noexpand\fmtord{er}}% \else - \edef#2{\number#1\relax\noexpand\fmtord{eme}}% + \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}% \fi \fi} \newcommand*{\@ordinalFfrench}[2]{% \iffmtord@abbrv - \edef#2{\number#1\relax\noexpand\fmtord{e}}% + \ifnum#1=1 % + \edef#2{\number#1\relax\noexpand\fmtord{re}}% + \else + \edef#2{\number#1\relax\noexpand\fmtord{e}}% + \fi \else + \PackageWarning{fmtcount}{Non abbreviated ordinal finals (`eme) are + considered incorrect in French.}% \ifnum#1=1 % - \edef#2{\number#1\relax\noexpand\fmtord{i\`ere}}% + \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`ere}}% \else - \edef#2{\number#1\relax\noexpand\fmtord{i\`eme}}% + \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}% \fi \fi} \let\@ordinalNfrench\@ordinalMfrench @@ -463,7 +479,7 @@ z\'ero% \@@ordinalstringfrench{#1}{#2}% } \newcommand*\fc@@firstfrench{premier} -\newcommand*\fc@@firstFfrench{premi\`ere} +\newcommand*\fc@@firstFfrench{premi\protect\`ere} \DeclareRobustCommand{\@ordinalstringMfrenchfrance}[2]{% \let\fc@case\fc@CaseIden \let\fc@first=\fc@@firstfrench @@ -1080,7 +1096,7 @@ z\'ero% \count0=0 % \fi \ifnum\count0=1 % - \edef\@tempa{\expandafter\fc@case\fc@first\@nil}% + \protected@edef\@tempa{\expandafter\fc@case\fc@first\@nil}% \else \def\@tempa##1{% \expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{% @@ -1116,17 +1132,17 @@ z\'ero% \expandafter\fc@get@last@letter\expandafter{\@tempc}\@tempd\@tempe \def\@tempf{e}% \ifx\@tempe\@tempf - \edef\@tempa{\@tempb\expandafter\fc@case\@tempd i\`eme\@nil}% + \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd i\protect\`eme\@nil}% \else \def\@tempf{q}% \ifx\@tempe\@tempf - \edef\@tempa{\@tempb\expandafter\fc@case\@tempd qui\`eme\@nil}% + \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd qui\protect\`eme\@nil}% \else \def\@tempf{f}% \ifx\@tempe\@tempf - \edef\@tempa{\@tempb\expandafter\fc@case\@tempd vi\`eme\@nil}% + \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd vi\protect\`eme\@nil}% \else - \edef\@tempa{\@tempb\expandafter\fc@case\@tempc i\`eme\@nil}% + \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempc i\protect\`eme\@nil}% \fi \fi \fi @@ -1147,6 +1163,14 @@ z\'ero% \def\fc@frenchoptions@mil@plural@mark{le}% } \fc@frenchoptions@setdefaults +\def\@ordinalstringMfrench{\csuse{@ordinalstringMfrench\fmtcount@french}}% +\def\@ordinalstringFfrench{\csuse{@ordinalstringFfrench\fmtcount@french}}% +\def\@OrdinalstringMfrench{\csuse{@OrdinalstringMfrench\fmtcount@french}}% +\def\@OrdinalstringFfrench{\csuse{@OrdinalstringFfrench\fmtcount@french}}% +\def\@numberstringMfrench{\csuse{@numberstringMfrench\fmtcount@french}}% +\def\@numberstringFfrench{\csuse{@numberstringFfrench\fmtcount@french}}% +\def\@NumberstringMfrench{\csuse{@NumberstringMfrench\fmtcount@french}}% +\def\@NumberstringFfrench{\csuse{@NumberstringFfrench\fmtcount@french}}% \iffalse Local variables: \fi \iffalse mode: docTeX \fi \iffalse End: \fi |