summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-29 22:37:04 +0000
committerKarl Berry <karl@freefriends.org>2020-01-29 22:37:04 +0000
commite9549ffe43d42fda4e5d3778e1d26fbd95e4ae9f (patch)
tree9ac3da59a9d95276f81fdb959ae013bc35dd83f1 /Master/texmf-dist/tex/latex/fmtcount/fc-german.def
parent925e195e807448ed88f3ea0f5289df7ed65e85ae (diff)
fmtcount (29jan20)
git-svn-id: svn://tug.org/texlive/trunk@53591 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.def28
1 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
index 0f025d2ab04..3a44772de68 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 2017 Nicola Talbot and Vincent Belaïche
+%% Copyright 2020 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
@@ -50,8 +50,9 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
-\ProvidesFCLanguage{german}[2016/01/12]%
+\ProvidesFCLanguage{german}[2018/06/17]%
\newcommand{\@ordinalMgerman}[2]{%
\edef#2{\number#1\relax.}%
}%
@@ -404,11 +405,12 @@
}%
\global\let\@@numberunderhundredthgerman\@@numberunderhundredthgerman
\newcommand*\@@ordinalstringgerman[2]{%
-\ifnum#1>99999\relax
+\@orgargctr=#1\relax
+\ifnum\@orgargctr>99999\relax
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
\else
- \ifnum#1<0\relax
+ \ifnum\@orgargctr<0\relax
\PackageError{fmtcount}{Negative numbers not permitted}%
{This macro does not work for negative numbers, however
you can try typing "minus" first, and then pass the modulus of
@@ -416,10 +418,10 @@
\fi
\fi
\def#2{}%
-\@strctr=#1\relax \divide\@strctr by 1000\relax
+\@strctr=\@orgargctr\divide\@strctr by 1000\relax
\ifnum\@strctr>1\relax
\@@numberunderhundredgerman{\@strctr}{#2}%
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{1000}%
+ \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@thousandth}%
\else
@@ -427,18 +429,18 @@
\fi
\else
\ifnum\@strctr=1\relax
- \ifnum#1=1000\relax
+ \ifnum\@orgargctr=1000\relax
\eappto#2{\@thousandth}%
\else
\eappto#2{\eintausend}%
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100\relax
\ifnum\@strctr>1\relax
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\ifnum\@strctr=1\relax
\eappto#2{\@hundredth}%
@@ -450,11 +452,11 @@
\fi
\else
\ifnum\@strctr=1\relax
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@hundredth}%
\else
- \ifnum#1>1000\relax
+ \ifnum\@orgargctr>1000\relax
\appto#2{einhundert}%
\else
\eappto#2{\einhundert}%
@@ -462,9 +464,9 @@
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{100}%
-\ifthenelse{\@strctr=0 \and #1>0}{}{%
+\ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{%
\@@numberunderhundredthgerman{\@strctr}{#2}%
}%
}%