diff options
author | Karl Berry <karl@freefriends.org> | 2014-06-19 20:23:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-06-19 20:23:47 +0000 |
commit | 645977d2a193cba365984822764a2d97c2951249 (patch) | |
tree | f2f6d6c5c64e8beef2bca4f81ed57fe8b52f6223 /Master/texmf-dist/tex/latex/fmtcount/fc-german.def | |
parent | a6a9c8cb6c125f8674dc6c2480c60229f3d9e64d (diff) |
fmtcount (19jun14)
git-svn-id: svn://tug.org/texlive/trunk@34318 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fmtcount/fc-german.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-german.def | 74 |
1 files changed, 45 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def index 63fc7923336..6f951e27153 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-german.def,package') %% %% fmtcount.dtx -%% Copyright 2013 Nicola Talbot and Vincent Belaïche +%% Copyright 2014 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-spanish.def, fc-UKenglish.def, fc-USenglish.def. +%% 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. %% %% \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,7 +48,7 @@ %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} %%\end{definition} -\ProvidesFCLanguage{german}[2013/08/17]% +\ProvidesFCLanguage{german}[2014/06/09]% \newcommand{\@ordinalMgerman}[2]{% \edef#2{\number#1\relax.}% }% @@ -61,10 +61,10 @@ \edef#2{\number#1\relax.}% }% \global\let\@ordinalNgerman\@ordinalNgerman -\gdef\@@unitstringgerman#1{% +\newcommand*\@@unitstringgerman[1]{% \ifcase#1% null% - \or eins% + \or ein% \or zwei% \or drei% \or vier% @@ -75,7 +75,8 @@ \or neun% \fi }% -\gdef\@@tenstringgerman#1{% +\global\let\@@unitstringgerman\@@unitstringgerman +\newcommand*\@@tenstringgerman[1]{% \ifcase#1% \or zehn% \or zwanzig% @@ -89,11 +90,12 @@ \or einhundert% \fi }% +\global\let\@@tenstringgerman\@@tenstringgerman \providecommand*{\einhundert}{einhundert}% \providecommand*{\eintausend}{eintausend}% \global\let\einhundert\einhundert \global\let\eintausend\eintausend -\gdef\@@teenstringgerman#1{% +\newcommand*\@@teenstringgerman[1]{% \ifcase#1% zehn% \or elf% @@ -107,6 +109,7 @@ \or neunzehn% \fi }% +\global\let\@@teenstringgerman\@@teenstringgerman \DeclareRobustCommand{\@numberstringMgerman}[2]{% \let\@unitstring=\@@unitstringgerman \let\@teenstring=\@@teenstringgerman @@ -174,7 +177,7 @@ \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}% }% \global\let\@OrdinalstringNgerman\@OrdinalstringNgerman -\gdef\@@unitthstringMgerman#1{% +\newcommand*\@@unitthstringMgerman[1]{% \ifcase#1% nullter% \or erster% @@ -188,7 +191,8 @@ \or neunter% \fi }% -\gdef\@@tenthstringMgerman#1{% +\global\let\@@unitthstringMgerman\@@unitthstringMgerman +\newcommand*\@@tenthstringMgerman[1]{% \ifcase#1% \or zehnter% \or zwanzigster% @@ -201,7 +205,8 @@ \or neunzigster% \fi }% -\gdef\@@teenthstringMgerman#1{% +\global\let\@@tenthstringMgerman\@@tenthstringMgerman +\newcommand*\@@teenthstringMgerman[1]{% \ifcase#1% zehnter% \or elfter% @@ -215,7 +220,8 @@ \or neunzehnter% \fi }% -\gdef\@@unitthstringFgerman#1{% +\global\let\@@teenthstringMgerman\@@teenthstringMgerman +\newcommand*\@@unitthstringFgerman[1]{% \ifcase#1% nullte% \or erste% @@ -229,7 +235,8 @@ \or neunte% \fi }% -\gdef\@@tenthstringFgerman#1{% +\global\let\@@unitthstringFgerman\@@unitthstringFgerman +\newcommand*\@@tenthstringFgerman[1]{% \ifcase#1% \or zehnte% \or zwanzigste% @@ -242,7 +249,8 @@ \or neunzigste% \fi }% -\gdef\@@teenthstringFgerman#1{% +\global\let\@@tenthstringFgerman\@@tenthstringFgerman +\newcommand*\@@teenthstringFgerman[1]{% \ifcase#1% zehnte% \or elfte% @@ -256,7 +264,8 @@ \or neunzehnte% \fi }% -\gdef\@@unitthstringNgerman#1{% +\global\let\@@teenthstringFgerman\@@teenthstringFgerman +\newcommand*\@@unitthstringNgerman[1]{% \ifcase#1% nulltes% \or erstes% @@ -270,7 +279,8 @@ \or neuntes% \fi }% -\gdef\@@tenthstringNgerman#1{% +\global\let\@@unitthstringNgerman\@@unitthstringNgerman +\newcommand*\@@tenthstringNgerman[1]{% \ifcase#1% \or zehntes% \or zwanzigstes% @@ -283,7 +293,8 @@ \or neunzigstes% \fi }% -\gdef\@@teenthstringNgerman#1{% +\global\let\@@tenthstringNgerman\@@tenthstringNgerman +\newcommand*\@@teenthstringNgerman[1]{% \ifcase#1% zehntes% \or elftes% @@ -297,14 +308,15 @@ \or neunzehntes% \fi }% -\gdef\@@numberunderhundredgerman#1#2{% +\global\let\@@teenthstringNgerman\@@teenthstringNgerman +\newcommand*\@@numberunderhundredgerman[2]{% \ifnum#1<10\relax \ifnum#1>0\relax \eappto#2{\@unitstring{#1}}% \fi \else \@tmpstrctr=#1\relax - \@modulo{\@tmpstrctr}{10}% + \@FCmodulo{\@tmpstrctr}{10}% \ifnum#1<20\relax \eappto#2{\@teenstring{\@tmpstrctr}}% \else @@ -318,7 +330,8 @@ \fi \fi }% -\gdef\@@numberstringgerman#1#2{% +\global\let\@@numberunderhundredgerman\@@numberunderhundredgerman +\newcommand*\@@numberstringgerman[2]{% \ifnum#1>99999\relax \PackageError{fmtcount}{Out of range}% {This macro only works for values less than 100000}% @@ -341,7 +354,7 @@ \fi \fi \@strctr=#1\relax -\@modulo{\@strctr}{1000}% +\@FCmodulo{\@strctr}{1000}% \divide\@strctr by 100\relax \ifnum\@strctr>1\relax \eappto#2{\@unitstring{\@strctr}hundert}% @@ -355,7 +368,7 @@ \fi \fi \@strctr=#1\relax -\@modulo{\@strctr}{100}% +\@FCmodulo{\@strctr}{100}% \ifnum#1=0\relax \def#2{null}% \else @@ -366,12 +379,13 @@ \fi \fi }% -\gdef\@@numberunderhundredthgerman#1#2{% +\global\let\@@numberstringgerman\@@numberstringgerman +\newcommand*\@@numberunderhundredthgerman[2]{% \ifnum#1<10\relax \eappto#2{\@unitthstring{#1}}% \else \@tmpstrctr=#1\relax - \@modulo{\@tmpstrctr}{10}% + \@FCmodulo{\@tmpstrctr}{10}% \ifnum#1<20\relax \eappto#2{\@teenthstring{\@tmpstrctr}}% \else @@ -385,7 +399,8 @@ \fi \fi }% -\gdef\@@ordinalstringgerman#1#2{% +\global\let\@@numberunderhundredthgerman\@@numberunderhundredthgerman +\newcommand*\@@ordinalstringgerman[2]{% \ifnum#1>99999\relax \PackageError{fmtcount}{Out of range}% {This macro only works for values less than 100000}% @@ -401,7 +416,7 @@ \@strctr=#1\relax \divide\@strctr by 1000\relax \ifnum\@strctr>1\relax \@@numberunderhundredgerman{\@strctr}{#2}% - \@tmpstrctr=#1\relax \@modulo{\@tmpstrctr}{1000}% + \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{1000}% \ifnum\@tmpstrctr=0\relax \eappto#2{\@thousandth}% \else @@ -417,10 +432,10 @@ \fi \fi \@strctr=#1\relax -\@modulo{\@strctr}{1000}% +\@FCmodulo{\@strctr}{1000}% \divide\@strctr by 100\relax \ifnum\@strctr>1\relax - \@tmpstrctr=#1\relax \@modulo{\@tmpstrctr}{100}% + \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}% \ifnum\@tmpstrctr=0\relax \ifnum\@strctr=1\relax \eappto#2{\@hundredth}% @@ -432,7 +447,7 @@ \fi \else \ifnum\@strctr=1\relax - \@tmpstrctr=#1\relax \@modulo{\@tmpstrctr}{100}% + \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}% \ifnum\@tmpstrctr=0\relax \eappto#2{\@hundredth}% \else @@ -445,11 +460,12 @@ \fi \fi \@strctr=#1\relax -\@modulo{\@strctr}{100}% +\@FCmodulo{\@strctr}{100}% \ifthenelse{\@strctr=0 \and #1>0}{}{% \@@numberunderhundredthgerman{\@strctr}{#2}% }% }% +\global\let\@@ordinalstringgerman\@@ordinalstringgerman \FCloadlang{germanb}% \endinput |