summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fmtcount/fc-english.def')
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-english.def436
1 files changed, 221 insertions, 215 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
index c75318435e1..026ad0e46f7 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-english.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2012 Nicola Talbot and Vincent Belaïche
+%% Copyright 2013 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
@@ -48,8 +48,8 @@
%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
%%\end{definition}
-\ProvidesFCLanguage{english}[2012/06/18]
-\newcommand*{\@ordinalMenglish}[2]{%
+\ProvidesFCLanguage{english}[2013/08/17]%
+\gdef\@ordinalMenglish#1#2{%
\def\@fc@ord{}%
\@orgargctr=#1\relax
\@ordinalctr=#1%
@@ -76,92 +76,92 @@
\fi
\fi
\edef#2{\number#1\relax\noexpand\fmtord{\@fc@ord}}%
-}
-\let\@ordinalFenglish=\@ordinalMenglish
-\let\@ordinalNenglish=\@ordinalMenglish
-\newcommand*{\@@unitstringenglish}[1]{%
-\ifcase#1\relax
-zero%
-\or one%
-\or two%
-\or three%
-\or four%
-\or five%
-\or six%
-\or seven%
-\or eight%
-\or nine%
+}%
+\global\let\@ordinalFenglish=\@ordinalMenglish
+\global\let\@ordinalNenglish=\@ordinalMenglish
+\gdef\@@unitstringenglish#1{%
+ \ifcase#1\relax
+ zero%
+ \or one%
+ \or two%
+ \or three%
+ \or four%
+ \or five%
+ \or six%
+ \or seven%
+ \or eight%
+ \or nine%
\fi
-}
-\newcommand*{\@@tenstringenglish}[1]{%
-\ifcase#1\relax
-\or ten%
-\or twenty%
-\or thirty%
-\or forty%
-\or fifty%
-\or sixty%
-\or seventy%
-\or eighty%
-\or ninety%
-\fi
-}
-\newcommand*{\@@teenstringenglish}[1]{%
-\ifcase#1\relax
-ten%
-\or eleven%
-\or twelve%
-\or thirteen%
-\or fourteen%
-\or fifteen%
-\or sixteen%
-\or seventeen%
-\or eighteen%
-\or nineteen%
-\fi
-}
-\newcommand*{\@@Unitstringenglish}[1]{%
-\ifcase#1\relax
-Zero%
-\or One%
-\or Two%
-\or Three%
-\or Four%
-\or Five%
-\or Six%
-\or Seven%
-\or Eight%
-\or Nine%
-\fi
-}
-\newcommand*{\@@Tenstringenglish}[1]{%
-\ifcase#1\relax
-\or Ten%
-\or Twenty%
-\or Thirty%
-\or Forty%
-\or Fifty%
-\or Sixty%
-\or Seventy%
-\or Eighty%
-\or Ninety%
-\fi
-}
-\newcommand*{\@@Teenstringenglish}[1]{%
-\ifcase#1\relax
-Ten%
-\or Eleven%
-\or Twelve%
-\or Thirteen%
-\or Fourteen%
-\or Fifteen%
-\or Sixteen%
-\or Seventeen%
-\or Eighteen%
-\or Nineteen%
-\fi
-}
-\newcommand*{\@@numberstringenglish}[2]{%
+}%
+\gdef\@@tenstringenglish#1{%
+ \ifcase#1\relax
+ \or ten%
+ \or twenty%
+ \or thirty%
+ \or forty%
+ \or fifty%
+ \or sixty%
+ \or seventy%
+ \or eighty%
+ \or ninety%
+ \fi
+}%
+\gdef\@@teenstringenglish#1{%
+ \ifcase#1\relax
+ ten%
+ \or eleven%
+ \or twelve%
+ \or thirteen%
+ \or fourteen%
+ \or fifteen%
+ \or sixteen%
+ \or seventeen%
+ \or eighteen%
+ \or nineteen%
+ \fi
+}%
+\gdef\@@Unitstringenglish#1{%
+ \ifcase#1\relax
+ Zero%
+ \or One%
+ \or Two%
+ \or Three%
+ \or Four%
+ \or Five%
+ \or Six%
+ \or Seven%
+ \or Eight%
+ \or Nine%
+ \fi
+}%
+\gdef\@@Tenstringenglish#1{%
+ \ifcase#1\relax
+ \or Ten%
+ \or Twenty%
+ \or Thirty%
+ \or Forty%
+ \or Fifty%
+ \or Sixty%
+ \or Seventy%
+ \or Eighty%
+ \or Ninety%
+ \fi
+}%
+\gdef\@@Teenstringenglish#1{%
+ \ifcase#1\relax
+ Ten%
+ \or Eleven%
+ \or Twelve%
+ \or Thirteen%
+ \or Fourteen%
+ \or Fifteen%
+ \or Sixteen%
+ \or Seventeen%
+ \or Eighteen%
+ \or Nineteen%
+ \fi
+}%
+\gdef\@@numberstringenglish#1#2{%
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
@@ -244,109 +244,111 @@ this number}%
\edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
\fi
-}
+}%
\DeclareRobustCommand{\@numberstringMenglish}[2]{%
-\let\@unitstring=\@@unitstringenglish
-\let\@teenstring=\@@teenstringenglish
-\let\@tenstring=\@@tenstringenglish
-\def\@hundred{hundred}\def\@thousand{thousand}%
-\def\@andname{and}%
-\@@numberstringenglish{#1}{#2}%
-}
-\let\@numberstringFenglish=\@numberstringMenglish
-\let\@numberstringNenglish=\@numberstringMenglish
-\newcommand*{\@NumberstringMenglish}[2]{%
-\let\@unitstring=\@@Unitstringenglish
-\let\@teenstring=\@@Teenstringenglish
-\let\@tenstring=\@@Tenstringenglish
-\def\@hundred{Hundred}\def\@thousand{Thousand}%
-\def\@andname{and}%
-\@@numberstringenglish{#1}{#2}}
-\let\@NumberstringFenglish=\@NumberstringMenglish
-\let\@NumberstringNenglish=\@NumberstringMenglish
-\newcommand*{\@@unitthstringenglish}[1]{%
-\ifcase#1\relax
-zeroth%
-\or first%
-\or second%
-\or third%
-\or fourth%
-\or fifth%
-\or sixth%
-\or seventh%
-\or eighth%
-\or ninth%
-\fi
-}
-\newcommand*{\@@tenthstringenglish}[1]{%
-\ifcase#1\relax
-\or tenth%
-\or twentieth%
-\or thirtieth%
-\or fortieth%
-\or fiftieth%
-\or sixtieth%
-\or seventieth%
-\or eightieth%
-\or ninetieth%
-\fi
-}
-\newcommand*{\@@teenthstringenglish}[1]{%
-\ifcase#1\relax
-tenth%
-\or eleventh%
-\or twelfth%
-\or thirteenth%
-\or fourteenth%
-\or fifteenth%
-\or sixteenth%
-\or seventeenth%
-\or eighteenth%
-\or nineteenth%
-\fi
-}
-\newcommand*{\@@Unitthstringenglish}[1]{%
-\ifcase#1\relax
-Zeroth%
-\or First%
-\or Second%
-\or Third%
-\or Fourth%
-\or Fifth%
-\or Sixth%
-\or Seventh%
-\or Eighth%
-\or Ninth%
-\fi
-}
-\newcommand*{\@@Tenthstringenglish}[1]{%
-\ifcase#1\relax
-\or Tenth%
-\or Twentieth%
-\or Thirtieth%
-\or Fortieth%
-\or Fiftieth%
-\or Sixtieth%
-\or Seventieth%
-\or Eightieth%
-\or Ninetieth%
-\fi
-}
-\newcommand*{\@@Teenthstringenglish}[1]{%
-\ifcase#1\relax
-Tenth%
-\or Eleventh%
-\or Twelfth%
-\or Thirteenth%
-\or Fourteenth%
-\or Fifteenth%
-\or Sixteenth%
-\or Seventeenth%
-\or Eighteenth%
-\or Nineteenth%
-\fi
-}
-\newcommand*{\@@ordinalstringenglish}[2]{%
+ \let\@unitstring=\@@unitstringenglish
+ \let\@teenstring=\@@teenstringenglish
+ \let\@tenstring=\@@tenstringenglish
+ \def\@hundred{hundred}\def\@thousand{thousand}%
+ \def\@andname{and}%
+ \@@numberstringenglish{#1}{#2}%
+}%
+\global\let\@numberstringMenglish\@numberstringMenglish
+\global\let\@numberstringFenglish=\@numberstringMenglish
+\global\let\@numberstringNenglish=\@numberstringMenglish
+\gdef\@NumberstringMenglish#1#2{%
+ \let\@unitstring=\@@Unitstringenglish
+ \let\@teenstring=\@@Teenstringenglish
+ \let\@tenstring=\@@Tenstringenglish
+ \def\@hundred{Hundred}\def\@thousand{Thousand}%
+ \def\@andname{and}%
+ \@@numberstringenglish{#1}{#2}%
+}%
+\global\let\@NumberstringFenglish=\@NumberstringMenglish
+\global\let\@NumberstringNenglish=\@NumberstringMenglish
+\gdef\@@unitthstringenglish#1{%
+ \ifcase#1\relax
+ zeroth%
+ \or first%
+ \or second%
+ \or third%
+ \or fourth%
+ \or fifth%
+ \or sixth%
+ \or seventh%
+ \or eighth%
+ \or ninth%
+ \fi
+}%
+\gdef\@@tenthstringenglish#1{%
+ \ifcase#1\relax
+ \or tenth%
+ \or twentieth%
+ \or thirtieth%
+ \or fortieth%
+ \or fiftieth%
+ \or sixtieth%
+ \or seventieth%
+ \or eightieth%
+ \or ninetieth%
+ \fi
+}%
+\gdef\@@teenthstringenglish#1{%
+ \ifcase#1\relax
+ tenth%
+ \or eleventh%
+ \or twelfth%
+ \or thirteenth%
+ \or fourteenth%
+ \or fifteenth%
+ \or sixteenth%
+ \or seventeenth%
+ \or eighteenth%
+ \or nineteenth%
+ \fi
+}%
+\gdef\@@Unitthstringenglish#1{%
+ \ifcase#1\relax
+ Zeroth%
+ \or First%
+ \or Second%
+ \or Third%
+ \or Fourth%
+ \or Fifth%
+ \or Sixth%
+ \or Seventh%
+ \or Eighth%
+ \or Ninth%
+ \fi
+}%
+\gdef\@@Tenthstringenglish#1{%
+ \ifcase#1\relax
+ \or Tenth%
+ \or Twentieth%
+ \or Thirtieth%
+ \or Fortieth%
+ \or Fiftieth%
+ \or Sixtieth%
+ \or Seventieth%
+ \or Eightieth%
+ \or Ninetieth%
+ \fi
+}%
+\gdef\@@Teenthstringenglish#1{%
+ \ifcase#1\relax
+ Tenth%
+ \or Eleventh%
+ \or Twelfth%
+ \or Thirteenth%
+ \or Fourteenth%
+ \or Fifteenth%
+ \or Sixteenth%
+ \or Seventeenth%
+ \or Eighteenth%
+ \or Nineteenth%
+ \fi
+}%
+\gdef\@@ordinalstringenglish#1#2{%
\@strctr=#1\relax
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
@@ -456,33 +458,37 @@ this number}%
\edef#2{\@@fc@ordstr\@teenthstring{\@strctr}}%
\fi
\fi
-}
+}%
\DeclareRobustCommand{\@ordinalstringMenglish}[2]{%
-\let\@unitthstring=\@@unitthstringenglish
-\let\@teenthstring=\@@teenthstringenglish
-\let\@tenthstring=\@@tenthstringenglish
-\let\@unitstring=\@@unitstringenglish
-\let\@teenstring=\@@teenstringenglish
-\let\@tenstring=\@@tenstringenglish
-\def\@andname{and}%
-\def\@hundred{hundred}\def\@thousand{thousand}%
-\def\@hundredth{hundredth}\def\@thousandth{thousandth}%
-\@@ordinalstringenglish{#1}{#2}}
-\let\@ordinalstringFenglish=\@ordinalstringMenglish
-\let\@ordinalstringNenglish=\@ordinalstringMenglish
+ \let\@unitthstring=\@@unitthstringenglish
+ \let\@teenthstring=\@@teenthstringenglish
+ \let\@tenthstring=\@@tenthstringenglish
+ \let\@unitstring=\@@unitstringenglish
+ \let\@teenstring=\@@teenstringenglish
+ \let\@tenstring=\@@tenstringenglish
+ \def\@andname{and}%
+ \def\@hundred{hundred}\def\@thousand{thousand}%
+ \def\@hundredth{hundredth}\def\@thousandth{thousandth}%
+ \@@ordinalstringenglish{#1}{#2}%
+}%
+\global\let\@ordinalstringMenglish\@ordinalstringMenglish
+\global\let\@ordinalstringFenglish=\@ordinalstringMenglish
+\global\let\@ordinalstringNenglish=\@ordinalstringMenglish
\DeclareRobustCommand{\@OrdinalstringMenglish}[2]{%
-\let\@unitthstring=\@@Unitthstringenglish
-\let\@teenthstring=\@@Teenthstringenglish
-\let\@tenthstring=\@@Tenthstringenglish
-\let\@unitstring=\@@Unitstringenglish
-\let\@teenstring=\@@Teenstringenglish
-\let\@tenstring=\@@Tenstringenglish
-\def\@andname{and}%
-\def\@hundred{Hundred}\def\@thousand{Thousand}%
-\def\@hundredth{Hundredth}\def\@thousandth{Thousandth}%
-\@@ordinalstringenglish{#1}{#2}}
-\let\@OrdinalstringFenglish=\@OrdinalstringMenglish
-\let\@OrdinalstringNenglish=\@OrdinalstringMenglish
+ \let\@unitthstring=\@@Unitthstringenglish
+ \let\@teenthstring=\@@Teenthstringenglish
+ \let\@tenthstring=\@@Tenthstringenglish
+ \let\@unitstring=\@@Unitstringenglish
+ \let\@teenstring=\@@Teenstringenglish
+ \let\@tenstring=\@@Tenstringenglish
+ \def\@andname{and}%
+ \def\@hundred{Hundred}\def\@thousand{Thousand}%
+ \def\@hundredth{Hundredth}\def\@thousandth{Thousandth}%
+ \@@ordinalstringenglish{#1}{#2}%
+}%
+\global\let\@OrdinalstringMenglish\@OrdinalstringMenglish
+\global\let\@OrdinalstringFenglish=\@OrdinalstringMenglish
+\global\let\@OrdinalstringNenglish=\@OrdinalstringMenglish
\endinput
%%
%% End of file `fc-english.def'.