summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fmtcount
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-19 20:23:47 +0000
committerKarl Berry <karl@freefriends.org>2014-06-19 20:23:47 +0000
commit645977d2a193cba365984822764a2d97c2951249 (patch)
treef2f6d6c5c64e8beef2bca4f81ed57fe8b52f6223 /Master/texmf-dist/tex/latex/fmtcount
parenta6a9c8cb6c125f8674dc6c2480c60229f3d9e64d (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')
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-american.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-british.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-english.def88
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-francais.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-french.def25
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-german.def74
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-italian.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def201
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def71
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def140
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty22
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty8
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty24
19 files changed, 431 insertions, 262 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
index b082acd4ab0..b514c4a21c5 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-UKenglish.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
index 5eb38553a3f..19c7bd4efcc 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-USenglish.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
index cc95f3d4eb7..da645326fd2 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-american.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
index b6433aed280..ab6e3fae49a 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-british.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
index 026ad0e46f7..0b5f820ff30 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 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
@@ -49,11 +49,11 @@
%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
%%\end{definition}
\ProvidesFCLanguage{english}[2013/08/17]%
-\gdef\@ordinalMenglish#1#2{%
+\newcommand*\@ordinalMenglish[2]{%
\def\@fc@ord{}%
\@orgargctr=#1\relax
\@ordinalctr=#1%
-\@modulo{\@ordinalctr}{100}%
+\@FCmodulo{\@ordinalctr}{100}%
\ifnum\@ordinalctr=11\relax
\def\@fc@ord{th}%
\else
@@ -63,7 +63,7 @@
\ifnum\@ordinalctr=13\relax
\def\@fc@ord{th}%
\else
- \@modulo{\@ordinalctr}{10}%
+ \@FCmodulo{\@ordinalctr}{10}%
\ifcase\@ordinalctr
\def\@fc@ord{th}% case 0
\or \def\@fc@ord{st}% case 1
@@ -77,9 +77,10 @@
\fi
\edef#2{\number#1\relax\noexpand\fmtord{\@fc@ord}}%
}%
+\global\let\@ordinalMenglish\@ordinalMenglish
\global\let\@ordinalFenglish=\@ordinalMenglish
\global\let\@ordinalNenglish=\@ordinalMenglish
-\gdef\@@unitstringenglish#1{%
+\newcommand*\@@unitstringenglish[1]{%
\ifcase#1\relax
zero%
\or one%
@@ -93,7 +94,8 @@
\or nine%
\fi
}%
-\gdef\@@tenstringenglish#1{%
+\global\let\@@unitstringenglish\@@unitstringenglish
+\newcommand*\@@tenstringenglish[1]{%
\ifcase#1\relax
\or ten%
\or twenty%
@@ -106,7 +108,8 @@
\or ninety%
\fi
}%
-\gdef\@@teenstringenglish#1{%
+\global\let\@@tenstringenglish\@@tenstringenglish
+\newcommand*\@@teenstringenglish[1]{%
\ifcase#1\relax
ten%
\or eleven%
@@ -120,7 +123,8 @@
\or nineteen%
\fi
}%
-\gdef\@@Unitstringenglish#1{%
+\global\let\@@teenstringenglish\@@teenstringenglish
+\newcommand*\@@Unitstringenglish[1]{%
\ifcase#1\relax
Zero%
\or One%
@@ -134,7 +138,8 @@
\or Nine%
\fi
}%
-\gdef\@@Tenstringenglish#1{%
+\global\let\@@Unitstringenglish\@@Unitstringenglish
+\newcommand*\@@Tenstringenglish[1]{%
\ifcase#1\relax
\or Ten%
\or Twenty%
@@ -147,7 +152,8 @@
\or Ninety%
\fi
}%
-\gdef\@@Teenstringenglish#1{%
+\global\let\@@Tenstringenglish\@@Tenstringenglish
+\newcommand*\@@Teenstringenglish[1]{%
\ifcase#1\relax
Ten%
\or Eleven%
@@ -161,7 +167,8 @@
\or Nineteen%
\fi
}%
-\gdef\@@numberstringenglish#1#2{%
+\global\let\@@Teenstringenglish\@@Teenstringenglish
+\newcommand*\@@numberstringenglish[2]{%
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
@@ -181,7 +188,7 @@ this number}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
\@strctr=#1 \divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr-\@unitstring{\@strctr}}%
@@ -189,7 +196,7 @@ this number}%
\else
\@strctr=#1\relax
\divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
@@ -201,7 +208,7 @@ this number}%
\edef#2{\@@fc@numstr\@unitstring{\@strctr}\ \@thousand}%
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{1000}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100
\ifnum\@strctr>0\relax
\ifnum#1>1000\relax
@@ -211,7 +218,7 @@ this number}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@unitstring{\@strctr}\ \@hundred}%
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{100}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{100}%
\ifnum#1>100\relax
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
@@ -222,7 +229,7 @@ this number}%
\divide\@strctr by 10\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
- \@strctr=#1\relax \@modulo{\@strctr}{10}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr-\@unitstring{\@strctr}}%
@@ -239,12 +246,13 @@ this number}%
\edef#2{\@@fc@numstr\@unitstring{\@strctr}}%
\fi
\else
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
\fi
}%
+\global\let\@@numberstringenglish\@@numberstringenglish
\DeclareRobustCommand{\@numberstringMenglish}[2]{%
\let\@unitstring=\@@unitstringenglish
\let\@teenstring=\@@teenstringenglish
@@ -256,7 +264,7 @@ this number}%
\global\let\@numberstringMenglish\@numberstringMenglish
\global\let\@numberstringFenglish=\@numberstringMenglish
\global\let\@numberstringNenglish=\@numberstringMenglish
-\gdef\@NumberstringMenglish#1#2{%
+\newcommand*\@NumberstringMenglish[2]{%
\let\@unitstring=\@@Unitstringenglish
\let\@teenstring=\@@Teenstringenglish
\let\@tenstring=\@@Tenstringenglish
@@ -264,9 +272,10 @@ this number}%
\def\@andname{and}%
\@@numberstringenglish{#1}{#2}%
}%
+\global\let\@NumberstringMenglish\@NumberstringMenglish
\global\let\@NumberstringFenglish=\@NumberstringMenglish
\global\let\@NumberstringNenglish=\@NumberstringMenglish
-\gdef\@@unitthstringenglish#1{%
+\newcommand*\@@unitthstringenglish[1]{%
\ifcase#1\relax
zeroth%
\or first%
@@ -280,7 +289,8 @@ this number}%
\or ninth%
\fi
}%
-\gdef\@@tenthstringenglish#1{%
+\global\let\@@unitthstringenglish\@@unitthstringenglish
+\newcommand*\@@tenthstringenglish[1]{%
\ifcase#1\relax
\or tenth%
\or twentieth%
@@ -293,7 +303,8 @@ this number}%
\or ninetieth%
\fi
}%
-\gdef\@@teenthstringenglish#1{%
+\global\let\@@tenthstringenglish\@@tenthstringenglish
+\newcommand*\@@teenthstringenglish[1]{%
\ifcase#1\relax
tenth%
\or eleventh%
@@ -307,7 +318,8 @@ this number}%
\or nineteenth%
\fi
}%
-\gdef\@@Unitthstringenglish#1{%
+\global\let\@@teenthstringenglish\@@teenthstringenglish
+\newcommand*\@@Unitthstringenglish[1]{%
\ifcase#1\relax
Zeroth%
\or First%
@@ -321,7 +333,8 @@ this number}%
\or Ninth%
\fi
}%
-\gdef\@@Tenthstringenglish#1{%
+\global\let\@@Unitthstringenglish\@@Unitthstringenglish
+\newcommand*\@@Tenthstringenglish[1]{%
\ifcase#1\relax
\or Tenth%
\or Twentieth%
@@ -334,7 +347,8 @@ this number}%
\or Ninetieth%
\fi
}%
-\gdef\@@Teenthstringenglish#1{%
+\global\let\@@Tenthstringenglish\@@Tenthstringenglish
+\newcommand*\@@Teenthstringenglish[1]{%
\ifcase#1\relax
Tenth%
\or Eleventh%
@@ -348,7 +362,8 @@ this number}%
\or Nineteenth%
\fi
}%
-\gdef\@@ordinalstringenglish#1#2{%
+\global\let\@@Teenthstringenglish\@@Teenthstringenglish
+\newcommand*\@@ordinalstringenglish[2]{%
\@strctr=#1\relax
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
@@ -370,18 +385,18 @@ this number}%
\edef#2{\@@fc@ordstr\@tenstring{\@strctr}}%
\@strctr=#1\relax
\divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr-\@unitstring{\@strctr}}%
\fi
\else
\@strctr=#1\relax \divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@teenstring{\@strctr}}%
\fi
- \@strctr=#1\relax \@modulo{\@strctr}{1000}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\ifnum\@strctr=0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\ \@thousandth}%
@@ -393,7 +408,7 @@ this number}%
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@unitstring{\@strctr}}%
- \@strctr=#1\relax \@modulo{\@strctr}{1000}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\let\@@fc@ordstr#2\relax
\ifnum\@strctr=0\relax
\edef#2{\@@fc@ordstr\ \@thousandth}%
@@ -402,7 +417,7 @@ this number}%
\fi
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{1000}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100
\ifnum\@strctr>0\relax
\ifnum#1>1000\relax
@@ -411,7 +426,7 @@ this number}%
\fi
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@unitstring{\@strctr}}%
- \@strctr=#1\relax \@modulo{\@strctr}{100}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{100}%
\let\@@fc@ordstr#2\relax
\ifnum\@strctr=0\relax
\edef#2{\@@fc@ordstr\ \@hundredth}%
@@ -419,7 +434,7 @@ this number}%
\edef#2{\@@fc@ordstr\ \@hundred}%
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{100}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{100}%
\ifnum#1>100\relax
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
@@ -429,14 +444,14 @@ this number}%
\ifnum\@strctr>19\relax
\@tmpstrctr=\@strctr
\divide\@strctr by 10\relax
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\let\@@fc@ordstr#2\relax
\ifnum\@tmpstrctr=0\relax
\edef#2{\@@fc@ordstr\@tenthstring{\@strctr}}%
\else
\edef#2{\@@fc@ordstr\@tenstring{\@strctr}}%
\fi
- \@strctr=#1\relax \@modulo{\@strctr}{10}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr-\@unitthstring{\@strctr}}%
@@ -453,12 +468,13 @@ this number}%
\edef#2{\@@fc@ordstr\@unitthstring{\@strctr}}%
\fi
\else
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@teenthstring{\@strctr}}%
\fi
\fi
}%
+\global\let\@@ordinalstringenglish\@@ordinalstringenglish
\DeclareRobustCommand{\@ordinalstringMenglish}[2]{%
\let\@unitthstring=\@@unitthstringenglish
\let\@teenthstring=\@@teenthstringenglish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
index 43e96a54ffa..356a5064561 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-francais.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
index 2170673f54e..43180885d80 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 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
@@ -568,7 +568,8 @@ z\'ero%
}
\let\@OrdinalstringFfrench=\@OrdinalstringFfrenchfrance
\let\@OrdinalstringNfrench\@OrdinalstringMfrench
-\@ifundefined{fc@@do@plural@mark}{}{\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
+\ifcsundef{fc@@do@plural@mark}{}%
+{\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@do@plural@mark'}}
\def\fc@@do@plural@mark#1{%
\ifcase\count10 %
@@ -608,7 +609,7 @@ z\'ero%
\fi
\fi
}
-\@ifundefined{fc@@nbrstr@Fpreamble}{}{%
+\ifcsundef{fc@@nbrstr@Fpreamble}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@nbrstr@Fpreamble'}}
\def\fc@@nbrstr@Fpreamble{%
@@ -629,7 +630,7 @@ z\'ero%
\edef\@tempa{\@tempb\fc@case une\@nil}%
\fi
}
-\@ifundefined{fc@@pot@longscalefrench}{}{%
+\ifcsundef{fc@@pot@longscalefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@longscalefrench'}}
\def\fc@@pot@longscalefrench#1#2#3{%
@@ -704,7 +705,7 @@ z\'ero%
\expandafter
}\@tempa
}
-\@ifundefined{fc@@pot@shortscalefrench}{}{%
+\ifcsundef{fc@@pot@shortscalefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@shortscalefrench'}}
\def\fc@@pot@shortscalefrench#1#2#3{%
@@ -750,7 +751,7 @@ z\'ero%
\expandafter
}\@tempa
}
-\@ifundefined{fc@@pot@recursivefrench}{}{%
+\ifcsundef{fc@@pot@recursivefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@recursivefrench'}}
\def\fc@@pot@recursivefrench#1#2#3{%
@@ -844,7 +845,7 @@ z\'ero%
\expandafter
}\@tempa
}
-\@ifundefined{fc@muladdfrench}{}{%
+\ifcsundef{fc@muladdfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@muladdfrench'}}
\def\fc@muladdfrench#1#2#3{%
@@ -892,7 +893,7 @@ z\'ero%
\expandafter
}\@tempa
}%
-\@ifundefined{fc@lthundredstringfrench}{}{%
+\ifcsundef{fc@lthundredstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@lthundredstringfrench'}}
\def\fc@lthundredstringfrench#1{%
@@ -962,7 +963,7 @@ z\'ero%
\expandafter
}\@tempa
}
-\@ifundefined{fc@ltthousandstringfrench}{}{%
+\ifcsundef{fc@ltthousandstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@ltthousandstringfrench'}}
\def\fc@ltthousandstringfrench#1{%
@@ -1014,7 +1015,7 @@ z\'ero%
\expandafter
}\@tempa
}
-\@ifundefined{@@numberstringfrench}{}{%
+\ifcsundef{@@numberstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro `@@numberstringfrench'}}
\def\@@numberstringfrench#1#2{%
{%
@@ -1054,7 +1055,7 @@ z\'ero%
\ifnum\count6>\count0 \else
\repeat
}
-\@ifundefined{@@ordinalstringfrench}{}{%
+\ifcsundef{@@ordinalstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`@@ordinalstringfrench'}}
\def\@@ordinalstringfrench#1#2{%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
index fccdafd5e4b..65ee11c0e15 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-frenchb.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
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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
index a2832feba9a..7dd3ce7e4b4 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-germanb.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
index ca815bbac4d..f9b728231d8 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-italian.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
index 47e84c6bdd6..a0e81dd3541 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngerman.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
index 4c01ee36232..c3bfe07f7f2 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngermanb.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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
index 015629fb1ff..52262fa5745 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuges.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,23 +48,25 @@
%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
%%\end{definition}
-\ProvidesFCLanguage{portuges}[2013/08/17]%
-\gdef\@ordinalMportuges#1#2{%
+\ProvidesFCLanguage{portuges}[2014/06/09]%
+\newcommand*\@ordinalMportuges[2]{%
\ifnum#1=0\relax
\edef#2{\number#1}%
\else
\edef#2{\number#1\relax\noexpand\fmtord{o}}%
\fi
}%
-\gdef\@ordinalFportuges#1#2{%
+\global\let\@ordinalMportuges\@ordinalMportuges
+\newcommand*\@ordinalFportuges[2]{%
\ifnum#1=0\relax
\edef#2{\number#1}%
\else
\edef#2{\number#1\relax\noexpand\fmtord{a}}%
\fi
}%
+\global\let\@ordinalFportuges\@ordinalFportuges
\global\let\@ordinalNportuges\@ordinalMportuges
-\gdef\@@unitstringportuges#1#2{%
+\newcommand*\@@unitstringportuges[1]{%
\ifcase#1\relax
zero%
\or um%
@@ -78,7 +80,8 @@
\or nove%
\fi
}%
-\gdef\@@unitstringFportuges#1{%
+\global\let\@@unitstringportuges\@@unitstringportuges
+\newcommand*\@@unitstringFportuges[1]{%
\ifcase#1\relax
zero%
\or uma%
@@ -92,7 +95,8 @@
\or nove%
\fi
}%
-\gdef\@@tenstringportuges#1{%
+\global\let\@@unitstringFportuges\@@unitstringFportuges
+\newcommand*\@@tenstringportuges[1]{%
\ifcase#1\relax
\or dez%
\or vinte%
@@ -106,7 +110,8 @@
\or cem%
\fi
}%
-\gdef\@@teenstringportuges#1{%
+\global\let\@@tenstringportuges\@@tenstringportuges
+\newcommand*\@@teenstringportuges[1]{%
\ifcase#1\relax
dez%
\or onze%
@@ -120,7 +125,8 @@
\or dezenove%
\fi
}%
-\gdef\@@hundredstringportuges#1{%
+\global\let\@@teenstringportuges\@@teenstringportuges
+\newcommand*\@@hundredstringportuges[1]{%
\ifcase#1\relax
\or cento%
\or duzentos%
@@ -133,7 +139,8 @@
\or novecentos%
\fi
}%
-\gdef\@@hundredstringFportuges#1{%
+\global\let\@@hundredstringportuges\@@hundredstringportuges
+\newcommand*\@@hundredstringFportuges[1]{%
\ifcase#1\relax
\or cento%
\or duzentas%
@@ -146,7 +153,8 @@
\or novecentas%
\fi
}%
-\gdef\@@Unitstringportuges#1{%
+\global\let\@@hundredstringFportuges\@@hundredstringFportuges
+\newcommand*\@@Unitstringportuges[1]{%
\ifcase#1\relax
Zero%
\or Um%
@@ -160,7 +168,8 @@
\or Nove%
\fi
}%
-\gdef\@@UnitstringFportuges#1{%
+\global\let\@@Unitstringportuges\@@Unitstringportuges
+\newcommand*\@@UnitstringFportuges[1]{%
\ifcase#1\relax
Zera%
\or Uma%
@@ -174,7 +183,8 @@
\or Nove%
\fi
}%
-\gdef\@@Tenstringportuges#1{%
+\global\let\@@UnitstringFportuges\@@UnitstringFportuges
+\newcommand*\@@Tenstringportuges[1]{%
\ifcase#1\relax
\or Dez%
\or Vinte%
@@ -188,7 +198,8 @@
\or Cem%
\fi
}%
-\gdef\@@Teenstringportuges#1{%
+\global\let\@@Tenstringportuges\@@Tenstringportuges
+\newcommand*\@@Teenstringportuges[1]{%
\ifcase#1\relax
Dez%
\or Onze%
@@ -202,7 +213,8 @@
\or Dezenove%
\fi
}%
-\gdef\@@Hundredstringportuges#1{%
+\global\let\@@Teenstringportuges\@@Teenstringportuges
+\newcommand*\@@Hundredstringportuges[1]{%
\ifcase#1\relax
\or Cento%
\or Duzentos%
@@ -215,7 +227,8 @@
\or Novecentos%
\fi
}%
-\gdef\@@HundredstringFportuges#1{%
+\global\let\@@Hundredstringportuges\@@Hundredstringportuges
+\newcommand*\@@HundredstringFportuges[1]{%
\ifcase#1\relax
\or Cento%
\or Duzentas%
@@ -228,6 +241,7 @@
\or Novecentas%
\fi
}%
+\global\let\@@HundredstringFportuges\@@HundredstringFportuges
\DeclareRobustCommand{\@numberstringMportuges}[2]{%
\let\@unitstring=\@@unitstringportuges
\let\@teenstring=\@@teenstringportuges
@@ -312,7 +326,7 @@
}%
\global\let\@OrdinalstringFportuges\@OrdinalstringFportuges
\global\let\@OrdinalstringNportuges\@OrdinalstringMportuges
-\gdef\@@unitthstringportuges#1{%
+\newcommand*\@@unitthstringportuges[1]{%
\ifcase#1\relax
zero%
\or primeiro%
@@ -326,7 +340,8 @@
\or nono%
\fi
}%
-\gdef\@@tenthstringportuges#1{%
+\global\let\@@unitthstringportuges\@@unitthstringportuges
+\newcommand*\@@tenthstringportuges[1]{%
\ifcase#1\relax
\or d\'ecimo%
\or vig\'esimo%
@@ -339,13 +354,15 @@
\or nonag\'esimo%
\fi
}%
-\gdef\@@teenthstringportuges#1{%
+\global\let\@@tenthstringportuges\@@tenthstringportuges
+\newcommand*\@@teenthstringportuges[1]{%
\@tenthstring{1}%
\ifnum#1>0\relax
-\@unitthstring{#1}%
\fi
}%
-\gdef\@@hundredthstringportuges#1{%
+\global\let\@@teenthstringportuges\@@teenthstringportuges
+\newcommand*\@@hundredthstringportuges[1]{%
\ifcase#1\relax
\or cent\'esimo%
\or ducent\'esimo%
@@ -358,7 +375,8 @@
\or nongent\'esimo%
\fi
}%
-\gdef\@@unitthstringFportuges#1{%
+\global\let\@@hundredthstringportuges\@@hundredthstringportuges
+\newcommand*\@@unitthstringFportuges[1]{%
\ifcase#1\relax
zero%
\or primeira%
@@ -372,7 +390,8 @@
\or nona%
\fi
}%
-\gdef\@@tenthstringFportuges#1{%
+\global\let\@@unitthstringFportuges\@@unitthstringFportuges
+\newcommand*\@@tenthstringFportuges[1]{%
\ifcase#1\relax
\or d\'ecima%
\or vig\'esima%
@@ -385,7 +404,8 @@
\or nonag\'esima%
\fi
}%
-\gdef\@@hundredthstringFportuges#1{%
+\global\let\@@tenthstringFportuges\@@tenthstringFportuges
+\newcommand*\@@hundredthstringFportuges[1]{%
\ifcase#1\relax
\or cent\'esima%
\or ducent\'esima%
@@ -398,7 +418,8 @@
\or nongent\'esima%
\fi
}%
-\gdef\@@Unitthstringportuges#1{%
+\global\let\@@hundredthstringFportuges\@@hundredthstringFportuges
+\newcommand*\@@Unitthstringportuges[1]{%
\ifcase#1\relax
Zero%
\or Primeiro%
@@ -412,7 +433,8 @@
\or Nono%
\fi
}%
-\gdef\@@Tenthstringportuges#1{%
+\global\let\@@Unitthstringportuges\@@Unitthstringportuges
+\newcommand*\@@Tenthstringportuges[1]{%
\ifcase#1\relax
\or D\'ecimo%
\or Vig\'esimo%
@@ -425,7 +447,8 @@
\or Nonag\'esimo%
\fi
}%
-\gdef\@@Hundredthstringportuges#1{%
+\global\let\@@Tenthstringportuges\@@Tenthstringportuges
+\newcommand*\@@Hundredthstringportuges[1]{%
\ifcase#1\relax
\or Cent\'esimo%
\or Ducent\'esimo%
@@ -438,7 +461,8 @@
\or Nongent\'esimo%
\fi
}%
-\gdef\@@UnitthstringFportuges#1{%
+\global\let\@@Hundredthstringportuges\@@Hundredthstringportuges
+\newcommand*\@@UnitthstringFportuges[1]{%
\ifcase#1\relax
Zera%
\or Primeira%
@@ -452,7 +476,8 @@
\or Nona%
\fi
}%
-\gdef\@@TenthstringFportuges#1{%
+\global\let\@@UnitthstringFportuges\@@UnitthstringFportuges
+\newcommand*\@@TenthstringFportuges[1]{%
\ifcase#1\relax
\or D\'ecima%
\or Vig\'esima%
@@ -465,7 +490,8 @@
\or Nonag\'esima%
\fi
}%
-\gdef\@@HundredthstringFportuges#1{%
+\global\let\@@TenthstringFportuges\@@TenthstringFportuges
+\newcommand*\@@HundredthstringFportuges[1]{%
\ifcase#1\relax
\or Cent\'esima%
\or Ducent\'esima%
@@ -478,114 +504,116 @@
\or Nongent\'esima%
\fi
}%
-\gdef\@@numberstringportuges#1#2{%
-\ifnum#1>99999
-\PackageError{fmtcount}{Out of range}%
-{This macro only works for values less than 100000}%
+\global\let\@@HundredthstringFportuges\@@HundredthstringFportuges
+\newcommand*\@@numberstringportuges[2]{%
+\ifnum#1>99999\relax
+ \PackageError{fmtcount}{Out of range}%
+ {This macro only works for values less than 100000}%
\else
-\ifnum#1<0
-\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
-this number}%
-\fi
+ \ifnum#1<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
+ this number}%
+ \fi
\fi
\def#2{}%
\@strctr=#1\relax \divide\@strctr by 1000\relax
-\ifnum\@strctr>9
- \divide\@strctr by 10
+\ifnum\@strctr>9\relax
+ \divide\@strctr by 10\relax
\ifnum\@strctr>1\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
\@strctr=#1 \divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0
\ifnum\@strctr=1\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@andname}%
+ \protected@edef#2{\@@fc@numstr\ \@andname}%
\fi
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}%
\fi
\else
\@strctr=#1\relax
\divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@thousand}%
+ \protected@edef#2{\@@fc@numstr\ \@thousand}%
\else
\ifnum\@strctr>0\relax
\ifnum\@strctr>1\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@unitstring{\@strctr}\ }%
+ \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}\ }%
\fi
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@thousand}%
+ \protected@edef#2{\@@fc@numstr\@thousand}%
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{1000}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100\relax
\ifnum\@strctr>0\relax
\ifnum#1>1000 \relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ }%
+ \protected@edef#2{\@@fc@numstr\ }%
\fi
\@tmpstrctr=#1\relax
- \@modulo{\@tmpstrctr}{1000}%
+ \@FCmodulo{\@tmpstrctr}{1000}%
\let\@@fc@numstr#2\relax
\ifnum\@tmpstrctr=100\relax
- \edef#2{\@@fc@numstr\@tenstring{10}}%
+ \protected@edef#2{\@@fc@numstr\@tenstring{10}}%
\else
- \edef#2{\@@fc@numstr\@hundredstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@hundredstring{\@strctr}}%
\fi%
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{100}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{100}%
\ifnum#1>100\relax
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@andname\ }%
+ \protected@edef#2{\@@fc@numstr\ \@andname\ }%
\fi
\fi
\ifnum\@strctr>19\relax
\divide\@strctr by 10\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
- \@strctr=#1\relax \@modulo{\@strctr}{10}%
+ \protected@edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0
\ifnum\@strctr=1\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@andname}%
+ \protected@edef#2{\@@fc@numstr\ \@andname}%
\else
\ifnum#1>100\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@andname}%
+ \protected@edef#2{\@@fc@numstr\ \@andname}%
\fi
\fi
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\ \@unitstring{\@strctr}}%
\fi
\else
\ifnum\@strctr<10\relax
\ifnum\@strctr=0\relax
\ifnum#1<100\relax
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@unitstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}}%
\fi
- \else%(>0,<10)
+ \else %(>0,<10)
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@unitstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@unitstring{\@strctr}}%
\fi
\else%>10
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
- \edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
+ \protected@edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
\fi
}%
-\gdef\@@ordinalstringportuges#1#2{%
+\global\let\@@numberstringportuges\@@numberstringportuges
+\newcommand*\@@ordinalstringportuges[2]{%
\@strctr=#1\relax
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
@@ -604,72 +632,73 @@ this number}%
\ifnum\@strctr>9\relax
\@tmpstrctr=\@strctr
\ifnum\@strctr<20
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@teenthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr\@teenthstring{\@tmpstrctr}}%
\else
\divide\@tmpstrctr by 10\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
\@tmpstrctr=\@strctr
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\ifnum\@tmpstrctr>0\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@unitthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr\@unitthstring{\@tmpstrctr}}%
\fi
\fi
\else
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@unitstring{\@strctr}}%
+ \protected@edef#2{\@@fc@ordstr\@unitstring{\@strctr}}%
\fi
\fi
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@thousandth}%
+ \protected@edef#2{\@@fc@ordstr\@thousandth}%
\fi
\@strctr=#1\relax
-\@modulo{\@strctr}{1000}%
+\@FCmodulo{\@strctr}{1000}%
\ifnum\@strctr>99\relax
\@tmpstrctr=\@strctr
\divide\@tmpstrctr by 100\relax
\ifnum#1>1000\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr-}%
+ \protected@edef#2{\@@fc@ordstr-}%
\fi
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@hundredthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr\@hundredthstring{\@tmpstrctr}}%
\fi
-\@modulo{\@strctr}{100}%
+\@FCmodulo{\@strctr}{100}%
\ifnum#1>99\relax
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr-}%
+ \protected@edef#2{\@@fc@ordstr-}%
\fi
\fi
\ifnum\@strctr>9\relax
\@tmpstrctr=\@strctr
\divide\@tmpstrctr by 10\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
\@tmpstrctr=\@strctr
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\ifnum\@tmpstrctr>0\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr-\@unitthstring{\@tmpstrctr}}%
+ \protected@edef#2{\@@fc@ordstr-\@unitthstring{\@tmpstrctr}}%
\fi
\else
\ifnum\@strctr=0\relax
\ifnum#1=0\relax
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@unitstring{0}}%
+ \protected@edef#2{\@@fc@ordstr\@unitstring{0}}%
\fi
\else
\let\@@fc@ordstr#2\relax
- \edef#2{\@@fc@ordstr\@unitthstring{\@strctr}}%
+ \protected@edef#2{\@@fc@ordstr\@unitthstring{\@strctr}}%
\fi
\fi
\fi
\fi
}%
+\global\let\@@ordinalstringportuges\@@ordinalstringportuges
\endinput
%%
%% End of file `fc-portuges.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
new file mode 100644
index 00000000000..60bdc54d659
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
@@ -0,0 +1,71 @@
+%%
+%% This is file `fc-portuguese.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fmtcount.dtx (with options: `fc-portuguese.def,package')
+%%
+%% fmtcount.dtx
+%% 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
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% 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.
+%%
+%% \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
+%% Lower-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
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%\subsection{Prefixes}
+%%\label{sec:latin-prefixes}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstring}]
+%%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options}
+%%\end{definition}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
+%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
+%%\end{definition}
+\ProvidesFCLanguage{portuguese}[2014/06/09]%
+\FCloadlang{portuges}%
+\global\let\@ordinalMportuguese=\@ordinalMportuges
+\global\let\@ordinalFportuguese=\@ordinalFportuges
+\global\let\@ordinalNportuguese=\@ordinalNportuges
+\global\let\@numberstringMportuguese=\@numberstringMportuges
+\global\let\@numberstringFportuguese=\@numberstringFportuges
+\global\let\@numberstringNportuguese=\@numberstringNportuges
+\global\let\@NumberstringMportuguese=\@NumberstringMportuges
+\global\let\@NumberstringFportuguese=\@NumberstringFportuges
+\global\let\@NumberstringNportuguese=\@NumberstringNportuges
+\global\let\@ordinalstringMportuguese=\@ordinalstringMportuges
+\global\let\@ordinalstringFportuguese=\@ordinalstringFportuges
+\global\let\@ordinalstringNportuguese=\@ordinalstringNportuges
+\global\let\@OrdinalstringMportuguese=\@OrdinalstringMportuges
+\global\let\@OrdinalstringFportuguese=\@OrdinalstringFportuges
+\global\let\@OrdinalstringNportuguese=\@OrdinalstringNportuges
+
+\endinput
+%%
+%% End of file `fc-portuguese.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
index 99d5f240631..1d59ac7ae85 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-spanish.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
@@ -49,14 +49,16 @@
%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
%%\end{definition}
\ProvidesFCLanguage{spanish}[2013/08/17]%
-\gdef\@ordinalMspanish#1{%
+\newcommand*\@ordinalMspanish[2]{%
\edef#2{\number#1\relax\noexpand\fmtord{o}}%
}%
-\gdef\@ordinalFspanish}[2]{%
+\global\let\@ordinalMspanish\@ordinalMspanish
+\newcommand{\@ordinalFspanish}[2]{%
\edef#2{\number#1\relax\noexpand\fmtord{a}}%
}%
+\global\let\@ordinalFspanish\@ordinalFspanish
\global\let\@ordinalNspanish\@ordinalMspanish
-\gdef\@@unitstringspanish#1{%
+\newcommand*\@@unitstringspanish[1]{%
\ifcase#1\relax
cero%
\or uno%
@@ -70,7 +72,8 @@
\or nueve%
\fi
}%
-\gdef\@@unitstringFspanish#1{%
+\global\let\@@unitstringspanish\@@unitstringspanish
+\newcommand*\@@unitstringFspanish[1]{%
\ifcase#1\relax
cera%
\or una%
@@ -84,7 +87,8 @@
\or nueve%
\fi
}%
-\gdef\@@tenstringspanish#1{%
+\global\let\@@unitstringFspanish\@@unitstringFspanish
+\newcommand*\@@tenstringspanish[1]{%
\ifcase#1\relax
\or diez%
\or veinte%
@@ -98,7 +102,8 @@
\or cien%
\fi
}%
-\gdef\@@teenstringspanish#1{%
+\global\let\@@tenstringspanish\@@tenstringspanish
+\newcommand*\@@teenstringspanish[1]{%
\ifcase#1\relax
diez%
\or once%
@@ -112,7 +117,8 @@
\or diecinueve%
\fi
}%
-\gdef\@@twentystringspanish#1{%
+\global\let\@@teenstringspanish\@@teenstringspanish
+\newcommand*\@@twentystringspanish[1]{%
\ifcase#1\relax
veinte%
\or veintiuno%
@@ -126,7 +132,8 @@
\or veintinueve%
\fi
}%
-\gdef\@@twentystringFspanish#1{%
+\global\let\@@twentystringspanish\@@twentystringspanish
+\newcommand*\@@twentystringFspanish[1]{%
\ifcase#1\relax
veinte%
\or veintiuna%
@@ -140,7 +147,8 @@
\or veintinueve%
\fi
}%
-\gdef\@@hundredstringspanish#1{%
+\global\let\@@twentystringFspanish\@@twentystringFspanish
+\newcommand*\@@hundredstringspanish[1]{%
\ifcase#1\relax
\or ciento%
\or doscientos%
@@ -153,7 +161,8 @@
\or novecientos%
\fi
}%
-\gdef\@@hundredstringFspanish#1{%
+\global\let\@@hundredstringspanish\@@hundredstringspanish
+\newcommand*\@@hundredstringFspanish[1]{%
\ifcase#1\relax
\or cienta%
\or doscientas%
@@ -166,7 +175,8 @@
\or novecientas%
\fi
}%
-\gdef\@@Unitstringspanish#1{%
+\global\let\@@hundredstringFspanish\@@hundredstringFspanish
+\newcommand*\@@Unitstringspanish[1]{%
\ifcase#1\relax
Cero%
\or Uno%
@@ -180,7 +190,8 @@
\or Nueve%
\fi
}%
-\gdef\@@UnitstringFspanish#1{%
+\global\let\@@Unitstringspanish\@@Unitstringspanish
+\newcommand*\@@UnitstringFspanish[1]{%
\ifcase#1\relax
Cera%
\or Una%
@@ -194,7 +205,8 @@
\or Nueve%
\fi
}%
-\gdef\@@Tenstringspanish#1{%
+\global\let\@@UnitstringFspanish\@@UnitstringFspanish
+\newcommand*\@@Tenstringspanish[1]{%
\ifcase#1\relax
\or Diez%
\or Veinte%
@@ -208,7 +220,8 @@
\or Cien%
\fi
}%
-\gdef\@@Teenstringspanish#1{%
+\global\let\@@Tenstringspanish\@@Tenstringspanish
+\newcommand*\@@Teenstringspanish[1]{%
\ifcase#1\relax
Diez%
\or Once%
@@ -222,7 +235,8 @@
\or Diecinueve%
\fi
}%
-\gdef\@@Twentystringspanish#1{%
+\global\let\@@Teenstringspanish\@@Teenstringspanish
+\newcommand*\@@Twentystringspanish[1]{%
\ifcase#1\relax
Veinte%
\or Veintiuno%
@@ -236,7 +250,8 @@
\or Veintinueve%
\fi
}%
-\gdef\@@TwentystringFspanish#1{%
+\global\let\@@Twentystringspanish\@@Twentystringspanish
+\newcommand*\@@TwentystringFspanish[1]{%
\ifcase#1\relax
Veinte%
\or Veintiuna%
@@ -250,7 +265,8 @@
\or Veintinueve%
\fi
}%
-\gdef\@@Hundredstringspanish#1{%
+\global\let\@@TwentystringFspanish\@@TwentystringFspanish
+\newcommand*\@@Hundredstringspanish[1]{%
\ifcase#1\relax
\or Ciento%
\or Doscientos%
@@ -263,7 +279,8 @@
\or Novecientos%
\fi
}%
-\gdef\@@HundredstringFspanish#1{%
+\global\let\@@Hundredstringspanish\@@Hundredstringspanish
+\newcommand*\@@HundredstringFspanish[1]{%
\ifcase#1\relax
\or Cienta%
\or Doscientas%
@@ -276,6 +293,7 @@
\or Novecientas%
\fi
}%
+\global\let\@@HundredstringFspanish\@@HundredstringFspanish
\DeclareRobustCommand{\@numberstringMspanish}[2]{%
\let\@unitstring=\@@unitstringspanish
\let\@teenstring=\@@teenstringspanish
@@ -364,7 +382,7 @@
}%
\global\let\@OrdinalstringFspanish\@OrdinalstringFspanish
\global\let\@OrdinalstringNspanish\@OrdinalstringMspanish
-\gdef\@@unitthstringspanish#1{%
+\newcommand*\@@unitthstringspanish[1]{%
\ifcase#1\relax
cero%
\or primero%
@@ -378,7 +396,8 @@
\or noveno%
\fi
}%
-\gdef\@@tenthstringspanish#1{%
+\global\let\@@unitthstringspanish\@@unitthstringspanish
+\newcommand*\@@tenthstringspanish[1]{%
\ifcase#1\relax
\or d\'ecimo%
\or vig\'esimo%
@@ -391,7 +410,8 @@
\or nonag\'esimo%
\fi
}%
-\gdef\@@teenthstringspanish#1{%
+\global\let\@@tenthstringspanish\@@tenthstringspanish
+\newcommand*\@@teenthstringspanish[1]{%
\ifcase#1\relax
d\'ecimo%
\or und\'ecimo%
@@ -405,7 +425,8 @@
\or decimonoveno%
\fi
}%
-\gdef\@@hundredthstringspanish#1{%
+\global\let\@@teenthstringspanish\@@teenthstringspanish
+\newcommand*\@@hundredthstringspanish[1]{%
\ifcase#1\relax
\or cent\'esimo%
\or ducent\'esimo%
@@ -418,7 +439,8 @@
\or noningent\'esimo%
\fi
}%
-\gdef\@@unitthstringFspanish#1{%
+\global\let\@@hundredthstringspanish\@@hundredthstringspanish
+\newcommand*\@@unitthstringFspanish[1]{%
\ifcase#1\relax
cera%
\or primera%
@@ -432,7 +454,8 @@
\or novena%
\fi
}%
-\gdef\@@tenthstringFspanish#1{%
+\global\let\@@unitthstringFspanish\@@unitthstringFspanish
+\newcommand*\@@tenthstringFspanish[1]{%
\ifcase#1\relax
\or d\'ecima%
\or vig\'esima%
@@ -445,7 +468,8 @@
\or nonag\'esima%
\fi
}%
-\gdef\@@teenthstringFspanish#1{%
+\global\let\@@tenthstringFspanish\@@tenthstringFspanish
+\newcommand*\@@teenthstringFspanish[1]{%
\ifcase#1\relax
d\'ecima%
\or und\'ecima%
@@ -459,7 +483,8 @@
\or decimonovena%
\fi
}%
-\gdef\@@hundredthstringFspanish#1{%
+\global\let\@@teenthstringFspanish\@@teenthstringFspanish
+\newcommand*\@@hundredthstringFspanish[1]{%
\ifcase#1\relax
\or cent\'esima%
\or ducent\'esima%
@@ -472,7 +497,8 @@
\or noningent\'esima%
\fi
}%
-\gdef\@@Unitthstringspanish#1{%
+\global\let\@@hundredthstringFspanish\@@hundredthstringFspanish
+\newcommand*\@@Unitthstringspanish[1]{%
\ifcase#1\relax
Cero%
\or Primero%
@@ -486,7 +512,8 @@
\or Noveno%
\fi
}%
-\gdef\@@Tenthstringspanish#1{%
+\global\let\@@Unitthstringspanish\@@Unitthstringspanish
+\newcommand*\@@Tenthstringspanish[1]{%
\ifcase#1\relax
\or D\'ecimo%
\or Vig\'esimo%
@@ -499,7 +526,8 @@
\or Nonag\'esimo%
\fi
}%
-\gdef\@@Teenthstringspanish#1{%
+\global\let\@@Tenthstringspanish\@@Tenthstringspanish
+\newcommand*\@@Teenthstringspanish[1]{%
\ifcase#1\relax
D\'ecimo%
\or Und\'ecimo%
@@ -513,7 +541,8 @@
\or Decimonoveno%
\fi
}%
-\gdef\@@Hundredthstringspanish#1{%
+\global\let\@@Teenthstringspanish\@@Teenthstringspanish
+\newcommand*\@@Hundredthstringspanish[1]{%
\ifcase#1\relax
\or Cent\'esimo%
\or Ducent\'esimo%
@@ -526,7 +555,8 @@
\or Noningent\'esimo%
\fi
}%
-\gdef\@@UnitthstringFspanish#1{%
+\global\let\@@Hundredthstringspanish\@@Hundredthstringspanish
+\newcommand*\@@UnitthstringFspanish[1]{%
\ifcase#1\relax
Cera%
\or Primera%
@@ -540,7 +570,8 @@
\or Novena%
\fi
}%
-\gdef\@@TenthstringFspanish#1{%
+\global\let\@@UnitthstringFspanish\@@UnitthstringFspanish
+\newcommand*\@@TenthstringFspanish[1]{%
\ifcase#1\relax
\or D\'ecima%
\or Vig\'esima%
@@ -553,7 +584,8 @@
\or Nonag\'esima%
\fi
}%
-\gdef\@@TeenthstringFspanish#1{%
+\global\let\@@TenthstringFspanish\@@TenthstringFspanish
+\newcommand*\@@TeenthstringFspanish[1]{%
\ifcase#1\relax
D\'ecima%
\or Und\'ecima%
@@ -567,7 +599,8 @@
\or Decimonovena%
\fi
}%
-\gdef\@@HundredthstringFspanish#1{%
+\global\let\@@TeenthstringFspanish\@@TeenthstringFspanish
+\newcommand*\@@HundredthstringFspanish[1]{%
\ifcase#1\relax
\or Cent\'esima%
\or Ducent\'esima%
@@ -580,7 +613,8 @@
\or Noningent\'esima%
\fi
}%
-\gdef\@@numberstringspanish#1#2{%
+\global\let\@@HundredthstringFspanish\@@HundredthstringFspanish
+\newcommand*\@@numberstringspanish[2]{%
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
@@ -600,7 +634,7 @@ this number}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
\@strctr=#1 \divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\ \@andname\ \@unitstring{\@strctr}}%
@@ -608,7 +642,7 @@ this number}%
\else
\@strctr=#1\relax
\divide\@strctr by 1000\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
@@ -624,7 +658,7 @@ this number}%
\edef#2{\@@fc@numstr\@thousand}%
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{1000}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100\relax
\ifnum\@strctr>0\relax
\ifnum#1>1000\relax
@@ -632,7 +666,7 @@ this number}%
\edef#2{\@@fc@numstr\ }%
\fi
\@tmpstrctr=#1\relax
- \@modulo{\@tmpstrctr}{1000}%
+ \@FCmodulo{\@tmpstrctr}{1000}%
\ifnum\@tmpstrctr=100\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@tenstring{10}}%
@@ -641,7 +675,7 @@ this number}%
\edef#2{\@@fc@numstr\@hundredstring{\@strctr}}%
\fi
\fi
-\@strctr=#1\relax \@modulo{\@strctr}{100}%
+\@strctr=#1\relax \@FCmodulo{\@strctr}{100}%
\ifnum#1>100\relax
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
@@ -652,7 +686,7 @@ this number}%
\divide\@strctr by 10\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@tenstring{\@strctr}}%
- \@strctr=#1\relax \@modulo{\@strctr}{10}%
+ \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
\ifnum\@strctr>0\relax
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\ \@andname\ \@unitstring{\@strctr}}%
@@ -670,18 +704,19 @@ this number}%
\fi
\else
\ifnum\@strctr>19\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@twentystring{\@strctr}}%
\else
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@numstr#2\relax
\edef#2{\@@fc@numstr\@teenstring{\@strctr}}%
\fi
\fi
\fi
}%
-\gdef\@@ordinalstringspanish#1#2{%
+\global\let\@@numberstringspanish\@@numberstringspanish
+\newcommand*\@@ordinalstringspanish[2]{%
\@strctr=#1\relax
\ifnum#1>99999
\PackageError{fmtcount}{Out of range}%
@@ -700,7 +735,7 @@ this number}%
\ifnum\@strctr>9\relax
\@tmpstrctr=\@strctr
\ifnum\@strctr<20
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@teenthstring{\@tmpstrctr}}%
\else
@@ -708,7 +743,7 @@ this number}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
\@tmpstrctr=\@strctr
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\ifnum\@tmpstrctr>0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@unitthstring{\@tmpstrctr}}%
@@ -723,7 +758,7 @@ this number}%
\edef#2{\@@fc@ordstr\@thousandth}%
\fi
\@strctr=#1\relax
-\@modulo{\@strctr}{1000}%
+\@FCmodulo{\@strctr}{1000}%
\ifnum\@strctr>99\relax
\@tmpstrctr=\@strctr
\divide\@tmpstrctr by 100\relax
@@ -734,7 +769,7 @@ this number}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@hundredthstring{\@tmpstrctr}}%
\fi
-\@modulo{\@strctr}{100}%
+\@FCmodulo{\@strctr}{100}%
\ifnum#1>99\relax
\ifnum\@strctr>0\relax
\let\@@fc@ordstr#2\relax
@@ -747,14 +782,14 @@ this number}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@tenthstring{\@tmpstrctr}}%
\@tmpstrctr=\@strctr
- \@modulo{\@tmpstrctr}{10}%
+ \@FCmodulo{\@tmpstrctr}{10}%
\ifnum\@tmpstrctr>0\relax
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\ \@unitthstring{\@tmpstrctr}}%
\fi
\else
\ifnum\@strctr>9\relax
- \@modulo{\@strctr}{10}%
+ \@FCmodulo{\@strctr}{10}%
\let\@@fc@ordstr#2\relax
\edef#2{\@@fc@ordstr\@teenthstring{\@strctr}}%
\else
@@ -772,6 +807,7 @@ this number}%
\fi
\fi
}%
+\global\let\@@ordinalstringspanish\@@ordinalstringspanish
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
index a1bb5a2c6ff..e55bea04492 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcnumparser.sty,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
@@ -148,7 +148,7 @@
\expandafter\fc@parse@integer@digits\fc@fractional@part\fc@end\fc@nil
\edef\fc@min@weight{\the\fc@digit@counter}%
}
-\@ifundefined{fc@parse@integer@digits}{}{%
+\ifcsundef{fc@parse@integer@digits}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of
macro `fc@parse@integer@digits'}}
\def\fc@parse@integer@digits#1#2\fc@nil{%
@@ -165,7 +165,7 @@
\newcommand*{\fc@unit@weight}{0}
-\@ifundefined{fc@read@unit}{}{%
+\ifcsundef{fc@read@unit}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro `fc@read@unit'}}
\def\fc@read@unit#1#2{%
\ifnum#2>\fc@max@weight
@@ -185,7 +185,7 @@
\fi
\fi
}
-\@ifundefined{fc@read@hundred}{}{%
+\ifcsundef{fc@read@hundred}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro `fc@read@hundred'}}
\def\fc@read@hundred#1#2{%
{%
@@ -201,7 +201,7 @@
\expandafter
}\@tempb
}
-\@ifundefined{fc@read@thousand}{}{%
+\ifcsundef{fc@read@thousand}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro
`fc@read@thousand'}}
\def\fc@read@thousand#1#2{%
@@ -218,7 +218,7 @@
\expandafter
}\@tempb
}
-\@ifundefined{fc@read@myriad}{}{%
+\ifcsundef{fc@read@myriad}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro
`fc@read@myriad'}}
\def\fc@read@myriad#1#2{%
@@ -235,7 +235,7 @@
\expandafter
}\@tempb
}
-\@ifundefined{fc@check@nonzeros}{}{%
+\ifcsundef{fc@check@nonzeros}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro
`fc@check@nonzeros'}}
\def\fc@check@nonzeros#1#2#3{%
@@ -298,7 +298,7 @@
\fi
\next
}
-\@ifundefined{fc@intpart@find@last}{}{%
+\ifcsundef{fc@intpart@find@last}{}{%
\PackageError{fcnumparser}{Duplicate definition}{Redefinition of macro
`fc@intpart@find@last'}}
\def\fc@intpart@find@last#1{%
@@ -325,7 +325,7 @@
\expandafter
}\@tempa\space
}
-\@ifundefined{fc@get@last@word}{}{\PackageError{fcnumparser}{Duplicate definition}{Redefinition
+\ifcsundef{fc@get@last@word}{}{\PackageError{fcnumparser}{Duplicate definition}{Redefinition
of macro `fc@get@last@word'}}%
\def\fc@get@last@word#1#2#3{%
{%
@@ -359,7 +359,7 @@
\expandafter
}\@tempa
}
-\@ifundefined{fc@get@last@letter}{}{\PackageError{fcnumparser}{Duplicate definition}{Redefinition
+\ifcsundef{fc@get@last@letter}{}{\PackageError{fcnumparser}{Duplicate definition}{Redefinition
of macro `fc@get@last@letter'}}%
\def\fc@get@last@letter#1#2#3{%
{%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
index b8bd2717a5c..44b7832fbcb 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcprefix.sty,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
@@ -141,7 +141,7 @@
}
\let\fc@power@of@millia@init\@gobbletwo
\let\fc@power@of@millia\fc@@prefix@millia
-\@ifundefined{fc@@latin@cardinal@pefix}{}{%
+\ifcsundef{fc@@latin@cardinal@pefix}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro `fc@@latin@cardinal@pefix'}}
\def\fc@@latin@cardinal@pefix#1#2{%
{%
@@ -251,7 +251,7 @@
\expandafter
}\@tempa
}
-\@ifundefined{fc@@latin@numeral@pefix}{}{%
+\ifcsundef{fc@@latin@numeral@pefix}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@latin@numeral@pefix'}}
\def\fc@@latin@numeral@pefix#1#2{%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
index 4cfa2a54d90..8c2ee534e9d 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fmtcount.sty,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
@@ -49,7 +49,7 @@
%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
%%\end{definition}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2013/08/17 v2.03]
+\ProvidesPackage{fmtcount}[2014/06/18 v2.04]
\RequirePackage{ifthen}
\RequirePackage{keyval}
\RequirePackage{etoolbox}
@@ -109,15 +109,15 @@
\@fc@loadifbabelorpolyglossialdf{italian}
\def\fmtcount@french{france}
\define@key{fmtcount}{french}[france]{%
- \@ifundefined{datefrench}%
+ \@FC@iflangloaded{french}%
+ {%
+ \setkeys{fcfrench}{#1}%
+ }%
{%
\PackageError{fmtcount}%
{Language `french' not defined}%
{You need to load babel before loading fmtcount}%
}%
- {%
- \setkeys{fcfrench}{#1}%
- }%
}
\define@key{fmtcount}{fmtord}{%
\ifthenelse{\equal{#1}{level}
@@ -154,7 +154,7 @@
\newcommand*{\fmtcountsetoptions}[1]{%
\def\fmtcount@fmtord{}%
\setkeys{fmtcount}{#1}%
- \@ifundefined{datefrench}{}%
+ \@FC@iflangloaded{french}{\ifcsundef{@ordinalstringMfrench}%
{%
\edef\@ordinalstringMfrench{\noexpand
\csname @ordinalstringMfrench\fmtcount@french\noexpand\endcsname}%
@@ -172,7 +172,7 @@
\csname @NumberstringMfrench\fmtcount@french\noexpand\endcsname}%
\edef\@NumberstringFfrench{\noexpand
\csname @NumberstringFfrench\fmtcount@french\noexpand\endcsname}%
- }%
+ }{}}{}%
\ifthenelse{\equal{\fmtcount@fmtord}{level}}%
{%
\renewcommand{\fmtord}[1]{##1}%
@@ -198,7 +198,7 @@
\def\fmtord#1{\textsuperscript{#1}}}
\ProcessOptions
\newcount\@DT@modctr
-\def\@modulo#1#2{%
+\newcommand*{\@FCmodulo}[2]{%
\@DT@modctr=#1\relax
\divide \@DT@modctr by #2\relax
\multiply \@DT@modctr by #2\relax
@@ -441,7 +441,7 @@
\expandafter\protect\expandafter\ordinalnum{%
\expandafter\the\csname c@#1\endcsname}%
}
-\@ifundefined{ordinal}
+\ifcsundef{ordinal}
{\let\ordinal\FCordinal}%
{%
\PackageWarning{fmtcount}%
@@ -949,7 +949,7 @@
\expandafter\the\csname c@#1\endcsname}%
}
\def\@setdef@ultfmtcount{%
- \@ifundefined{@ordinalMenglish}{\FCloadlang{english}}{}%
+ \ifcsundef{@ordinalMenglish}{\FCloadlang{english}}{}%
\def\@ordinalstringM{\@ordinalstringMenglish}%
\let\@ordinalstringF=\@ordinalstringMenglish
\let\@ordinalstringN=\@ordinalstringMenglish