summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fmtcount
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-16 22:08:02 +0000
committerKarl Berry <karl@freefriends.org>2017-06-16 22:08:02 +0000
commitdaeca2690f349de566c97b23351ce146ed38d27d (patch)
treecd11629417d0e88ecda8efa0b4e9ba14a1613975 /Master/texmf-dist/tex/latex/fmtcount
parentbdb5d3ff840e8ff0dc1ba58c0f06da613965ab19 (diff)
fmtcount (16jun17)
git-svn-id: svn://tug.org/texlive/trunk@44615 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.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-american.def7
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-british.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-english.def13
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-francais.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-french.def448
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-german.def24
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-italian.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def29
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def24
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty12
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty157
19 files changed, 424 insertions, 312 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
index 9a7ccc3c5d9..9fc43ac3f22 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
index 711a25082ba..70e572e5d9a 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
index d143d70ca68..af698749158 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,7 +51,7 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{american}[2013/08/17]%
+\ProvidesFCLanguage{american}[2016/01/12]%
\FCloadlang{USenglish}%
\global\let\@ordinalMamerican\@ordinalMUSenglish
\global\let\@ordinalFamerican\@ordinalMUSenglish
@@ -68,6 +68,9 @@
\global\let\@OrdinalstringMamerican\@OrdinalstringMUSenglish
\global\let\@OrdinalstringFamerican\@OrdinalstringMUSenglish
\global\let\@OrdinalstringNamerican\@OrdinalstringMUSenglish
+\iffalse Local variables: \fi
+\iffalse mode: docTeX \fi
+\iffalse End: \fi
\endinput
%%
%% End of file `fc-american.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
index 787ce1dea3a..b789969a0c2 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
index 1b4d41824b4..fa0899efc61 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,7 +51,7 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{english}[2013/08/17]%
+\ProvidesFCLanguage{english}[2016/01/12]%
\newcommand*\@ordinalMenglish[2]{%
\def\@fc@ord{}%
\@orgargctr=#1\relax
@@ -256,7 +256,7 @@ this number}%
\fi
}%
\global\let\@@numberstringenglish\@@numberstringenglish
-\DeclareRobustCommand{\@numberstringMenglish}[2]{%
+\newcommand*{\@numberstringMenglish}[2]{%
\let\@unitstring=\@@unitstringenglish
\let\@teenstring=\@@teenstringenglish
\let\@tenstring=\@@tenstringenglish
@@ -478,7 +478,7 @@ this number}%
\fi
}%
\global\let\@@ordinalstringenglish\@@ordinalstringenglish
-\DeclareRobustCommand{\@ordinalstringMenglish}[2]{%
+\newcommand*{\@ordinalstringMenglish}[2]{%
\let\@unitthstring=\@@unitthstringenglish
\let\@teenthstring=\@@teenthstringenglish
\let\@tenthstring=\@@tenthstringenglish
@@ -493,7 +493,7 @@ this number}%
\global\let\@ordinalstringMenglish\@ordinalstringMenglish
\global\let\@ordinalstringFenglish=\@ordinalstringMenglish
\global\let\@ordinalstringNenglish=\@ordinalstringMenglish
-\DeclareRobustCommand{\@OrdinalstringMenglish}[2]{%
+\newcommand*{\@OrdinalstringMenglish}[2]{%
\let\@unitthstring=\@@Unitthstringenglish
\let\@teenthstring=\@@Teenthstringenglish
\let\@tenthstring=\@@Tenthstringenglish
@@ -508,6 +508,9 @@ this number}%
\global\let\@OrdinalstringMenglish\@OrdinalstringMenglish
\global\let\@OrdinalstringFenglish=\@OrdinalstringMenglish
\global\let\@OrdinalstringNenglish=\@OrdinalstringMenglish
+\iffalse Local variables: \fi
+\iffalse mode: docTeX \fi
+\iffalse End: \fi
\endinput
%%
%% End of file `fc-english.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
index 607da3c3229..1011938695a 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
index af6c49a242f..4b5100df890 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,51 +51,59 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{french}[2012/10/24]%
-\def\fc@french@set@plural#1#2#3#4#5#6{%
+\ProvidesFCLanguage{french}[2017/06/15]%
+\ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command
+\protect\fc@gl@let\space already defined.}}
+\ifcsundef{fc@gl@def}{\global\let\fc@gl@def\def}{\PackageError{fmtcount}{Command already defined}{Command
+\protect\fc@gl@def\space already defined.}}
+\gdef\fc@french@set@plural#1#2#3#4#5#6{%
\ifthenelse{\equal{#2}{reformed}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{#3}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{#3}%
}{%
\ifthenelse{\equal{#2}{traditional}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{#4}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{#4}%
}{%
\ifthenelse{\equal{#2}{reformed o}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{#5}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{#5}%
}{%
\ifthenelse{\equal{#2}{traditional o}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{#6}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{#6}%
}{%
\ifthenelse{\equal{#2}{always}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{0}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{0}%
}{%
\ifthenelse{\equal{#2}{never}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{1}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{1}%
}{%
\ifthenelse{\equal{#2}{multiple}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{2}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{2}%
}{%
\ifthenelse{\equal{#2}{multiple g-last}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{3}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{3}%
}{%
\ifthenelse{\equal{#2}{multiple l-last}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{4}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{4}%
}{%
\ifthenelse{\equal{#2}{multiple lng-last}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{5}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{5}%
}{%
\ifthenelse{\equal{#2}{multiple ng-last}}{%
- \expandafter\def\csname fc@frenchoptions@#1@plural\endcsname{6}%
+ \expandafter\fc@gl@def\csname fc@frenchoptions@#1@plural\endcsname{6}%
}{%
\PackageError{fmtcount}{Unexpected argument}{%
`#2' was unexpected: french option `#1 plural' expects `reformed', `traditional',
`reformed o', `traditional o', `always', `never', `multiple', `multiple g-last',
`multiple l-last', `multiple lng-last', or `multiple ng-last'.%
- }}}}}}}}}}}}}
+ }}}}}}}}}}}}}%
\def\@tempa#1#2#3{%
\define@key{fcfrench}{#1 plural}[reformed]{%
\fc@french@set@plural{#1}{##1}{#2}{#2}{#3}{#3}%
}%
-}
+ \expandafter\@tempb\csname KV@fcfrench@#1 plural\endcsname
+}%
+\def\@tempb#1{%
+ \global\let#1#1
+}%
\@tempa{vingt}{4}{5}
\@tempa{cent}{4}{5}
\@tempa{mil}{0}{0}
@@ -107,7 +115,8 @@
\csname KV@fcfrench@mil plural\endcsname{#1}%
\csname KV@fcfrench@n-illion plural\endcsname{#1}%
\csname KV@fcfrench@n-illiard plural\endcsname{#1}%
-}
+}%
+\expandafter\@tempb\csname KV@fcfrench@all plural\endcsname
\define@key{fcfrench}{dash or space}[reformed]{%
\ifthenelse{\equal{#1}{traditional}}{%
\let\fc@frenchoptions@supermillion@dos\space%
@@ -127,7 +136,7 @@
}%
}%
}%
-}
+}%
\define@key{fcfrench}{scale}[recursive]{%
\ifthenelse{\equal{#1}{long}}{%
\let\fc@poweroften\fc@@pot@longscalefrench
@@ -144,7 +153,7 @@
}%
}%
}%
-}
+}%
\define@key{fcfrench}{n-illiard upto}[infinity]{%
\ifthenelse{\equal{#1}{infinity}}{%
\def\fc@longscale@nilliard@upto{0}%
@@ -159,16 +168,16 @@
\fi
\def\fc@longscale@nilliard@upto{#1}%
}}%
-}
+}%
\def\@tempa#1{%
\define@key{fcfrench}{#1}[]{%
\PackageError{fmtcount}{Unexpected argument}{French option with key `#1' does not take
any value}}%
- \expandafter\def\csname KV@fcfrench@#1@default\endcsname{%
- \def\fmtcount@french{#1}}%
+ \csgdef{KV@fcfrench@#1@default}{%
+ \fc@gl@def\fmtcount@french{#1}}%
}%
\@tempa{france}\@tempa{swiss}\@tempa{belgian}%
-\def\fmtcount@french{france}%
+\gdef\fmtcount@french{france}%
\define@key{fcfrench}{dialect}[france]{%
\ifthenelse{\equal{#1}{france}
\or\equal{#1}{swiss}
@@ -176,21 +185,25 @@
\def\fmtcount@french{#1}}{%
\PackageError{fmtcount}{Invalid value `#1' to french option dialect key}
{Option `french' can only take the values `france',
- `belgian' or `swiss'}}}
+ `belgian' or `swiss'}}}%
+\expandafter\@tempb\csname KV@fcfrench@dialect\endcsname
\define@key{fcfrench}{mil plural mark}[le]{%
\def\fc@frenchoptions@mil@plural@mark{#1}}
-\def\fc@UpperCaseFirstLetter#1#2\@nil{%
+\expandafter\@tempb\csname KV@fcfrench@mil plural mark\endcsname
+\gdef\fc@UpperCaseFirstLetter#1#2\@nil{%
\uppercase{#1}#2}
-
-\def\fc@CaseIden#1\@nil{%
+\gdef\fc@CaseIden#1\@nil{%
#1%
-}
-\def\fc@UpperCaseAll#1\@nil{%
+}%
+\gdef\fc@UpperCaseAll#1\@nil{%
\uppercase{#1}%
+}%
+\global\let\fc@wcase\fc@CaseIden
+\global\let\fc@gcase\fc@CaseIden
+\gdef\fc@apply@gcase{%
+ \protected@edef\@tempa{\@tempa}%
+ \protected@edef\@tempa{\expandafter\fc@gcase\@tempa\@nil}%
}
-
-\let\fc@case\fc@CaseIden
-
\newcommand*{\@ordinalMfrench}[2]{%
\iffmtord@abbrv
\ifnum#1=1 %
@@ -207,6 +220,7 @@
\protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}%
\fi
\fi}
+\global\let\@ordinalMfrench\@ordinalMfrench
\newcommand*{\@ordinalFfrench}[2]{%
\iffmtord@abbrv
\ifnum#1=1 %
@@ -223,9 +237,10 @@
\protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}%
\fi
\fi}
-\let\@ordinalNfrench\@ordinalMfrench
+\global\let\@ordinalFfrench\@ordinalFfrench
+\global\let\@ordinalNfrench\@ordinalMfrench
\newcommand*{\@@unitstringfrench}[1]{%
-\noexpand\fc@case
+\noexpand\fc@wcase
\ifcase#1 %
z\'ero%
\or un%
@@ -239,9 +254,10 @@ z\'ero%
\or neuf%
\fi
\noexpand\@nil
-}
+}%
+\global\let\@@unitstringfrench\@@unitstringfrench
\newcommand*{\@@tenstringfrench}[1]{%
-\noexpand\fc@case
+\noexpand\fc@wcase
\ifcase#1 %
\or dix%
\or vingt%
@@ -255,9 +271,10 @@ z\'ero%
\or cent%
\fi
\noexpand\@nil
-}
+}%
+\global\let\@@tenstringfrench\@@tenstringfrench
\newcommand*{\@@teenstringfrench}[1]{%
-\noexpand\fc@case
+\noexpand\fc@wcase
\ifcase#1 %
dix%
\or onze%
@@ -266,12 +283,13 @@ z\'ero%
\or quatorze%
\or quinze%
\or seize%
-\or dix\noexpand\@nil-\noexpand\fc@case sept%
-\or dix\noexpand\@nil-\noexpand\fc@case huit%
-\or dix\noexpand\@nil-\noexpand\fc@case neuf%
+\or dix\noexpand\@nil-\noexpand\fc@wcase sept%
+\or dix\noexpand\@nil-\noexpand\fc@wcase huit%
+\or dix\noexpand\@nil-\noexpand\fc@wcase neuf%
\fi
\noexpand\@nil
-}
+}%
+\global\let\@@teenstringfrench\@@teenstringfrench
\newcommand*{\@@seventiesfrench}[1]{%
\@tenstring{6}%
\ifnum#1=1 %
@@ -280,9 +298,10 @@ z\'ero%
-%
\fi
\@teenstring{#1}%
-}
+}%
+\global\let\@@seventiesfrench\@@seventiesfrench
\newcommand*\@@eightiesfrench[1]{%
-\fc@case quatre\@nil-\noexpand\fc@case vingt%
+\fc@wcase quatre\@nil-\noexpand\fc@wcase vingt%
\ifnum#1>0 %
\ifnum\fc@frenchoptions@vingt@plural=0 % vingt plural=always
s%
@@ -321,269 +340,302 @@ z\'ero%
\fi
\noexpand\@nil
\fi
-}
+}%
+\global\let\@@eightiesfrench\@@eightiesfrench
\newcommand*{\@@ninetiesfrench}[1]{%
-\fc@case quatre\@nil-\noexpand\fc@case vingt%
+\fc@wcase quatre\@nil-\noexpand\fc@wcase vingt%
\ifnum\fc@frenchoptions@vingt@plural=0 % vingt plural=always
s%
\fi
\noexpand\@nil
-\@teenstring{#1}%
-}
+}%
+\global\let\@@ninetiesfrench\@@ninetiesfrench
\newcommand*{\@@seventiesfrenchswiss}[1]{%
\@tenstring{7}%
\ifnum#1=1\ \@andname\ \fi
\ifnum#1>1-\fi
\ifnum#1>0 \@unitstring{#1}\fi
-}
+}%
+\global\let\@@seventiesfrenchswiss\@@seventiesfrenchswiss
\newcommand*{\@@eightiesfrenchswiss}[1]{%
\@tenstring{8}%
\ifnum#1=1\ \@andname\ \fi
\ifnum#1>1-\fi
\ifnum#1>0 \@unitstring{#1}\fi
-}
+}%
+\global\let\@@eightiesfrenchswiss\@@eightiesfrenchswiss
\newcommand*{\@@ninetiesfrenchswiss}[1]{%
\@tenstring{9}%
\ifnum#1=1\ \@andname\ \fi
\ifnum#1>1-\fi
\ifnum#1>0 \@unitstring{#1}\fi
-}
+}%
+\global\let\@@ninetiesfrenchswiss\@@ninetiesfrenchswiss
\newcommand*\fc@french@common{%
+ \let\fc@wcase\fc@CaseIden
\let\@unitstring=\@@unitstringfrench
\let\@teenstring=\@@teenstringfrench
\let\@tenstring=\@@tenstringfrench
\def\@hundred{cent}%
\def\@andname{et}%
-}
-\DeclareRobustCommand{\@numberstringMfrenchswiss}[2]{%
-\let\fc@case\fc@CaseIden
+}%
+\global\let\fc@french@common\fc@french@common
+\newcommand*{\@numberstringMfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\let\fc@nbrstr@preamble\@empty
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@numberstringMfrenchfrance}[2]{%
-\let\fc@case\fc@CaseIden
+\global\let\@numberstringMfrenchswiss\@numberstringMfrenchswiss
+\newcommand*{\@numberstringMfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\@empty
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@numberstringMfrenchbelgian}[2]{%
-\let\fc@case\fc@CaseIden
+\global\let\@numberstringMfrenchfrance\@numberstringMfrenchfrance
+\newcommand*{\@numberstringMfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\@empty
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
+\global\let\@numberstringMfrenchbelgian\@numberstringMfrenchbelgian
\let\@numberstringMfrench=\@numberstringMfrenchfrance
-\DeclareRobustCommand{\@numberstringFfrenchswiss}[2]{%
-\let\fc@case\fc@CaseIden
+\newcommand*{\@numberstringFfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@numberstringFfrenchfrance}[2]{%
-\let\fc@case\fc@CaseIden
+\global\let\@numberstringFfrenchswiss\@numberstringFfrenchswiss
+\newcommand*{\@numberstringFfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@numberstringFfrenchbelgian}[2]{%
-\let\fc@case\fc@CaseIden
+\global\let\@numberstringFfrenchfrance\@numberstringFfrenchfrance
+\newcommand*{\@numberstringFfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
\let\fc@nbrstr@postamble\@empty
\@@numberstringfrench{#1}{#2}}
-\let\@numberstringFfrench=\@numberstringFfrenchfrance
-\let\@ordinalstringNfrench\@ordinalstringMfrench
-\DeclareRobustCommand{\@NumberstringMfrenchswiss}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@numberstringFfrenchbelgian\@numberstringFfrenchbelgian
+\global\let\@numberstringFfrench=\@numberstringFfrenchfrance
+\global\let\@ordinalstringNfrench\@ordinalstringMfrench
+\newcommand*{\@NumberstringMfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\let\fc@nbrstr@preamble\@empty
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@NumberstringMfrenchfrance}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@NumberstringMfrenchswiss\@NumberstringMfrenchswiss
+\newcommand*{\@NumberstringMfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\@empty
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@NumberstringMfrenchbelgian}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@NumberstringMfrenchfrance\@NumberstringMfrenchfrance
+\newcommand*{\@NumberstringMfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\@empty
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\let\@NumberstringMfrench=\@NumberstringMfrenchfrance
-\DeclareRobustCommand{\@NumberstringFfrenchswiss}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@NumberstringMfrenchbelgian\@NumberstringMfrenchbelgian
+\global\let\@NumberstringMfrench=\@NumberstringMfrenchfrance
+\newcommand*{\@NumberstringFfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@NumberstringFfrenchfrance}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@NumberstringFfrenchswiss\@NumberstringFfrenchswiss
+\newcommand*{\@NumberstringFfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@NumberstringFfrenchbelgian}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
+\global\let\@NumberstringFfrenchfrance\@NumberstringFfrenchfrance
+\newcommand*{\@NumberstringFfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\let\fc@nbrstr@preamble\fc@@nbrstr@Fpreamble
-\let\fc@nbrstr@postamble\@empty
+\let\fc@nbrstr@postamble\fc@apply@gcase
\@@numberstringfrench{#1}{#2}}
-\let\@NumberstringFfrench=\@NumberstringFfrenchfrance
-\let\@NumberstringNfrench\@NumberstringMfrench
-\DeclareRobustCommand{\@ordinalstringMfrenchswiss}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstfrench
+\global\let\@NumberstringFfrenchbelgian\@NumberstringFfrenchbelgian
+\global\let\@NumberstringFfrench=\@NumberstringFfrenchfrance
+\global\let\@NumberstringNfrench\@NumberstringMfrench
+\newcommand*{\@ordinalstringMfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first\fc@@firstfrench
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\@@ordinalstringfrench{#1}{#2}%
-}
+}%
+\global\let\@ordinalstringMfrenchswiss\@ordinalstringMfrenchswiss
\newcommand*\fc@@firstfrench{premier}
+\global\let\fc@@firstfrench\fc@@firstfrench
\newcommand*\fc@@firstFfrench{premi\protect\`ere}
-\DeclareRobustCommand{\@ordinalstringMfrenchfrance}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstfrench
+\global\let\fc@@firstFfrench\fc@@firstFfrench
+\newcommand*{\@ordinalstringMfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first=\fc@@firstfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}}
-\DeclareRobustCommand{\@ordinalstringMfrenchbelgian}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstfrench
+\global\let\@ordinalstringMfrenchfrance\@ordinalstringMfrenchfrance
+\newcommand*{\@ordinalstringMfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first=\fc@@firstfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\let\@ordinalstringMfrench=\@ordinalstringMfrenchfrance
-\DeclareRobustCommand{\@ordinalstringFfrenchswiss}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstFfrench
+}%
+\global\let\@ordinalstringMfrenchbelgian\@ordinalstringMfrenchbelgian
+\global\let\@ordinalstringMfrench=\@ordinalstringMfrenchfrance
+\newcommand*{\@ordinalstringFfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first\fc@@firstFfrench
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@ordinalstringFfrenchfrance}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstFfrench
+}%
+\global\let\@ordinalstringFfrenchswiss\@ordinalstringFfrenchswiss
+\newcommand*{\@ordinalstringFfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first=\fc@@firstFfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@ordinalstringFfrenchbelgian}[2]{%
-\let\fc@case\fc@CaseIden
-\let\fc@first=\fc@@firstFfrench
+}%
+\global\let\@ordinalstringFfrenchfrance\@ordinalstringFfrenchfrance
+\newcommand*{\@ordinalstringFfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@CaseIden
+\let\fc@first=\fc@@firstFfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\let\@ordinalstringFfrench=\@ordinalstringFfrenchfrance
-\let\@ordinalstringNfrench\@ordinalstringMfrench
-\DeclareRobustCommand{\@OrdinalstringMfrenchswiss}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstfrench
+}%
+\global\let\@ordinalstringFfrenchbelgian\@ordinalstringFfrenchbelgian
+\global\let\@ordinalstringFfrench=\@ordinalstringFfrenchfrance
+\global\let\@ordinalstringNfrench\@ordinalstringMfrench
+\newcommand*{\@OrdinalstringMfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first=\fc@@firstfrench
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@OrdinalstringMfrenchfrance}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstfrench
+}%
+\global\let\@OrdinalstringMfrenchswiss\@OrdinalstringMfrenchswiss
+\newcommand*{\@OrdinalstringMfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first\fc@@firstfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@OrdinalstringMfrenchbelgian}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstfrench
+}%
+\global\let\@OrdinalstringMfrenchfrance\@OrdinalstringMfrenchfrance
+\newcommand*{\@OrdinalstringMfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first\fc@@firstfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\let\@OrdinalstringMfrench=\@OrdinalstringMfrenchfrance
-\DeclareRobustCommand{\@OrdinalstringFfrenchswiss}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstfrench
+}%
+\global\let\@OrdinalstringMfrenchbelgian\@OrdinalstringMfrenchbelgian
+\global\let\@OrdinalstringMfrench=\@OrdinalstringMfrenchfrance
+\newcommand*{\@OrdinalstringFfrenchswiss}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first\fc@@firstfrench
\let\@seventies=\@@seventiesfrenchswiss
\let\@eighties=\@@eightiesfrenchswiss
\let\@nineties=\@@ninetiesfrenchswiss
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@OrdinalstringFfrenchfrance}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstFfrench
+}%
+\global\let\@OrdinalstringFfrenchswiss\@OrdinalstringFfrenchswiss
+\newcommand*{\@OrdinalstringFfrenchfrance}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first\fc@@firstFfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\DeclareRobustCommand{\@OrdinalstringFfrenchbelgian}[2]{%
-\let\fc@case\fc@UpperCaseFirstLetter
-\let\fc@first=\fc@@firstFfrench
+}%
+\global\let\@OrdinalstringFfrenchfrance\@OrdinalstringFfrenchfrance
+\newcommand*{\@OrdinalstringFfrenchbelgian}[2]{%
\fc@french@common
+\let\fc@gcase\fc@UpperCaseFirstLetter
+\let\fc@first\fc@@firstFfrench
\let\@seventies=\@@seventiesfrench
\let\@eighties=\@@eightiesfrench
\let\@nineties=\@@ninetiesfrench
\@@ordinalstringfrench{#1}{#2}%
-}
-\let\@OrdinalstringFfrench=\@OrdinalstringFfrenchfrance
-\let\@OrdinalstringNfrench\@OrdinalstringMfrench
+}%
+\global\let\@OrdinalstringFfrenchbelgian\@OrdinalstringFfrenchbelgian
+\global\let\@OrdinalstringFfrench=\@OrdinalstringFfrenchfrance
+\global\let\@OrdinalstringNfrench\@OrdinalstringMfrench
\ifcsundef{fc@@do@plural@mark}{}%
{\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@do@plural@mark'}}
@@ -624,28 +676,31 @@ z\'ero%
\fi
\fi
\fi
-}
+}%
+\global\let\fc@@do@plural@mark\fc@@do@plural@mark
\ifcsundef{fc@@nbrstr@Fpreamble}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@nbrstr@Fpreamble'}}
\def\fc@@nbrstr@Fpreamble{%
\fc@read@unit{\count1}{0}%
\ifnum\count1=1 %
- \let\fc@case@save\fc@case
- \def\fc@case{\noexpand\fc@case}%
+ \let\fc@wcase@save\fc@wcase
+ \def\fc@wcase{\noexpand\fc@wcase}%
\def\@nil{\noexpand\@nil}%
\let\fc@nbrstr@postamble\fc@@nbrstr@Fpostamble
\fi
-}
+}%
+\global\let\fc@@nbrstr@Fpreamble\fc@@nbrstr@Fpreamble
\def\fc@@nbrstr@Fpostamble{%
- \let\fc@case\fc@case@save
+ \let\fc@wcase\fc@wcase@save
\expandafter\fc@get@last@word\expandafter{\@tempa}\@tempb\@tempc
\def\@tempd{un}%
\ifx\@tempc\@tempd
\let\@tempc\@tempa
- \edef\@tempa{\@tempb\fc@case une\@nil}%
+ \edef\@tempa{\@tempb\fc@wcase une\@nil}%
\fi
-}
+}%
+\global\let\fc@@nbrstr@Fpostamble\fc@@nbrstr@Fpostamble
\ifcsundef{fc@@pot@longscalefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@longscalefrench'}}
@@ -683,7 +738,7 @@ z\'ero%
\ifnum\@temph=1 %
\count10=\fc@frenchoptions@mil@plural\space
\edef\@tempe{%
- \noexpand\fc@case
+ \noexpand\fc@wcase
mil%
\fc@@do@plural@mark\fc@frenchoptions@mil@plural@mark
\noexpand\@nil
@@ -700,7 +755,7 @@ z\'ero%
\count10=\csname fc@frenchoptions@n-illion@plural\endcsname\space
\fi
\edef\@tempe{%
- \noexpand\fc@case
+ \noexpand\fc@wcase
\@tempg
\the\toks10 %
\fc@@do@plural@mark s%
@@ -720,7 +775,8 @@ z\'ero%
\edef\@tempa{\the\toks0 \@temph \def\noexpand#3{\the\toks1}}%
\expandafter
}\@tempa
-}
+}%
+\global\let\fc@@pot@longscalefrench\fc@@pot@longscalefrench
\ifcsundef{fc@@pot@shortscalefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@shortscalefrench'}}
@@ -746,7 +802,7 @@ z\'ero%
\expandafter\fc@@latin@cardinal@pefix\expandafter{\the\count2}\@tempg
\count10=\csname fc@frenchoptions@n-illion@plural\endcsname\space
\edef\@tempe{%
- \noexpand\fc@case
+ \noexpand\fc@wcase
\@tempg
illion%
\fc@@do@plural@mark s%
@@ -766,7 +822,8 @@ z\'ero%
\edef\@tempa{\the\toks0 \@temph \def\noexpand#3{\the\toks1}}%
\expandafter
}\@tempa
-}
+}%
+\global\let\fc@@pot@shortscalefrench\fc@@pot@shortscalefrench
\ifcsundef{fc@@pot@recursivefrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@@pot@recursivefrench'}}
@@ -781,7 +838,7 @@ z\'ero%
\advance\count2 by -1 %
\let\@tempe\@empty
\edef\@tempf{\fc@frenchoptions@supermillion@dos
- de\fc@frenchoptions@supermillion@dos\fc@case milliards\@nil}%
+ de\fc@frenchoptions@supermillion@dos\fc@wcase milliards\@nil}%
\count11\count0 %
\ifnum\count2>0 %
\count3\count2 %
@@ -838,16 +895,16 @@ z\'ero%
\or
mil\fc@@do@plural@mark\fc@frenchoptions@mil@plural@mark
\noexpand\@nil\fc@frenchoptions@supermillion@dos
- \noexpand\fc@case milliards% 4
+ \noexpand\fc@wcase milliards% 4
\or
million\fc@@do@plural@mark s%
\noexpand\@nil\fc@frenchoptions@supermillion@dos
- de\fc@frenchoptions@supermillion@dos\noexpand\fc@case milliards% 5
+ de\fc@frenchoptions@supermillion@dos\noexpand\fc@wcase milliards% 5
\fi
}%
\edef\@tempe{%
\ifx\@tempf\@empty\else
- \expandafter\fc@case\@tempf\@nil
+ \expandafter\fc@wcase\@tempf\@nil
\fi
\@tempg
}%
@@ -860,7 +917,8 @@ z\'ero%
\edef\@tempa{\the\toks0 \@temph \def\noexpand#3{\the\toks1}}%
\expandafter
}\@tempa
-}
+}%
+\global\let\fc@@pot@recursivefrench\fc@@pot@recursivefrench
\ifcsundef{fc@muladdfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@muladdfrench'}}
@@ -909,6 +967,7 @@ z\'ero%
\expandafter
}\@tempa
}%
+\global\let\fc@muladdfrench\fc@muladdfrench
\ifcsundef{fc@lthundredstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@lthundredstringfrench'}}
@@ -978,7 +1037,8 @@ z\'ero%
\expandafter\@tempb\expandafter{\@tempa}%
\expandafter
}\@tempa
-}
+}%
+\global\let\fc@lthundredstringfrench\fc@lthundredstringfrench
\ifcsundef{fc@ltthousandstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`fc@ltthousandstringfrench'}}
@@ -1016,10 +1076,10 @@ z\'ero%
\ifnum\count2=0 %
\else
\ifnum\count2=1 %
- \expandafter\fc@case\@hundred\@nil
+ \expandafter\fc@wcase\@hundred\@nil
\else
\@unitstring{\count2}\fc@frenchoptions@submillion@dos
- \noexpand\fc@case\@hundred\@temps\noexpand\@nil
+ \noexpand\fc@wcase\@hundred\@temps\noexpand\@nil
\fi
\@tempb
\fi
@@ -1030,7 +1090,8 @@ z\'ero%
\expandafter\@tempb\expandafter{\@tempa}%
\expandafter
}\@tempa
-}
+}%
+\global\let\fc@ltthousandstringfrench\fc@ltthousandstringfrench
\ifcsundef{@@numberstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro `@@numberstringfrench'}}
\def\@@numberstringfrench#1#2{%
@@ -1041,7 +1102,7 @@ z\'ero%
\PackageError{fmtcount}{Out of range}%
{This macro does not work with fractional numbers}%
\fi
- \edef\@tempa{\ifcase\fc@sign@case\space\or\fc@case plus\@nil\or\fc@case moins\@nil\fi}%
+ \edef\@tempa{\ifcase\fc@sign@case\space\or\fc@wcase plus\@nil\or\fc@wcase moins\@nil\fi}%
\fc@nbrstr@preamble
\fc@@nbrstrfrench@inner
\fc@nbrstr@postamble
@@ -1049,7 +1110,8 @@ z\'ero%
\expandafter\@tempb\expandafter{\@tempa}%
\expandafter
}\@tempa
-}
+}%
+\global\let\@@numberstringfrench\@@numberstringfrench
\def\fc@@nbrstrfrench@inner{%
\count0=\fc@max@weight
\divide\count0 by 3 %
@@ -1070,7 +1132,8 @@ z\'ero%
\advance\count0 by -3 %
\ifnum\count6>\count0 \else
\repeat
-}
+}%
+\global\let\fc@@nbrstrfrench@inner\fc@@nbrstrfrench@inner
\ifcsundef{@@ordinalstringfrench}{}{%
\PackageError{fmtcount}{Duplicate definition}{Redefinition of macro
`@@ordinalstringfrench'}}
@@ -1096,7 +1159,7 @@ z\'ero%
\count0=0 %
\fi
\ifnum\count0=1 %
- \protected@edef\@tempa{\expandafter\fc@case\fc@first\@nil}%
+ \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}%
\else
\def\@tempa##1{%
\expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{%
@@ -1122,55 +1185,62 @@ z\'ero%
\@tempa{mil}%
\@tempa{n-illion}%
\@tempa{n-illiard}%
- \let\fc@case@save\fc@case
- \def\fc@case{\noexpand\fc@case}%
+ \let\fc@wcase@save\fc@wcase
+ \def\fc@wcase{\noexpand\fc@wcase}%
\def\@nil{\noexpand\@nil}%
\let\@tempa\@empty
\fc@@nbrstrfrench@inner
- \let\fc@case\fc@case@save
+ \let\fc@wcase\fc@wcase@save
\expandafter\fc@get@last@word\expandafter{\@tempa}\@tempb\@tempc
\expandafter\fc@get@last@letter\expandafter{\@tempc}\@tempd\@tempe
\def\@tempf{e}%
\ifx\@tempe\@tempf
- \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd i\protect\`eme\@nil}%
+ \protected@edef\@tempa{\@tempb\expandafter\fc@wcase\@tempd i\protect\`eme\@nil}%
\else
\def\@tempf{q}%
\ifx\@tempe\@tempf
- \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd qui\protect\`eme\@nil}%
+ \protected@edef\@tempa{\@tempb\expandafter\fc@wcase\@tempd qui\protect\`eme\@nil}%
\else
\def\@tempf{f}%
\ifx\@tempe\@tempf
- \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd vi\protect\`eme\@nil}%
+ \protected@edef\@tempa{\@tempb\expandafter\fc@wcase\@tempd vi\protect\`eme\@nil}%
\else
- \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempc i\protect\`eme\@nil}%
+ \protected@edef\@tempa{\@tempb\expandafter\fc@wcase\@tempc i\protect\`eme\@nil}%
\fi
\fi
\fi
\fi
+ \fc@apply@gcase
\def\@tempb##1{\def\@tempa{\def#2{##1}}}%
\expandafter\@tempb\expandafter{\@tempa}%
\expandafter
}\@tempa
-}
+}%
+\global\let\@@ordinalstringfrench\@@ordinalstringfrench
\newcommand*\fc@frenchoptions@setdefaults{%
\csname KV@fcfrench@all plural\endcsname{reformed}%
- \def\fc@frenchoptions@submillion@dos{-}%
- \let\fc@frenchoptions@supermillion@dos\space
- \let\fc@u@in@duo\@empty% Could be `u'
- % \let\fc@poweroften\fc@@pot@longscalefrench
- \let\fc@poweroften\fc@@pot@recursivefrench
- \def\fc@longscale@nilliard@upto{0}% infinity
- \def\fc@frenchoptions@mil@plural@mark{le}%
-}
-\fc@frenchoptions@setdefaults
-\def\@ordinalstringMfrench{\csuse{@ordinalstringMfrench\fmtcount@french}}%
-\def\@ordinalstringFfrench{\csuse{@ordinalstringFfrench\fmtcount@french}}%
-\def\@OrdinalstringMfrench{\csuse{@OrdinalstringMfrench\fmtcount@french}}%
-\def\@OrdinalstringFfrench{\csuse{@OrdinalstringFfrench\fmtcount@french}}%
-\def\@numberstringMfrench{\csuse{@numberstringMfrench\fmtcount@french}}%
-\def\@numberstringFfrench{\csuse{@numberstringFfrench\fmtcount@french}}%
-\def\@NumberstringMfrench{\csuse{@NumberstringMfrench\fmtcount@french}}%
-\def\@NumberstringFfrench{\csuse{@NumberstringFfrench\fmtcount@french}}%
+ \fc@gl@def\fc@frenchoptions@submillion@dos{-}%
+ \fc@gl@let\fc@frenchoptions@supermillion@dos\space
+ \fc@gl@let\fc@u@in@duo\@empty% Could be `u'
+ % \fc@gl@let\fc@poweroften\fc@@pot@longscalefrench
+ \fc@gl@let\fc@poweroften\fc@@pot@recursivefrench
+ \fc@gl@def\fc@longscale@nilliard@upto{0}% infinity
+ \fc@gl@def\fc@frenchoptions@mil@plural@mark{le}%
+}%
+\global\let\fc@frenchoptions@setdefaults\fc@frenchoptions@setdefaults
+{%
+ \let\fc@gl@def\gdef
+ \def\fc@gl@let{\global\let}%
+ \fc@frenchoptions@setdefaults
+}%
+\gdef\@ordinalstringMfrench{\csuse{@ordinalstringMfrench\fmtcount@french}}%
+\gdef\@ordinalstringFfrench{\csuse{@ordinalstringFfrench\fmtcount@french}}%
+\gdef\@OrdinalstringMfrench{\csuse{@OrdinalstringMfrench\fmtcount@french}}%
+\gdef\@OrdinalstringFfrench{\csuse{@OrdinalstringFfrench\fmtcount@french}}%
+\gdef\@numberstringMfrench{\csuse{@numberstringMfrench\fmtcount@french}}%
+\gdef\@numberstringFfrench{\csuse{@numberstringFfrench\fmtcount@french}}%
+\gdef\@NumberstringMfrench{\csuse{@NumberstringMfrench\fmtcount@french}}%
+\gdef\@NumberstringFfrench{\csuse{@NumberstringFfrench\fmtcount@french}}%
\iffalse Local variables: \fi
\iffalse mode: docTeX \fi
\iffalse End: \fi
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
index 026b4e50437..ca15d437f03 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
index 3f0d859f0fc..20871edb6c0 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,7 +51,7 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{german}[2014/06/09]%
+\ProvidesFCLanguage{german}[2016/01/12]%
\newcommand{\@ordinalMgerman}[2]{%
\edef#2{\number#1\relax.}%
}%
@@ -113,7 +113,7 @@
\fi
}%
\global\let\@@teenstringgerman\@@teenstringgerman
-\DeclareRobustCommand{\@numberstringMgerman}[2]{%
+\newcommand*{\@numberstringMgerman}[2]{%
\let\@unitstring=\@@unitstringgerman
\let\@teenstring=\@@teenstringgerman
\let\@tenstring=\@@tenstringgerman
@@ -122,14 +122,14 @@
\global\let\@numberstringMgerman\@numberstringMgerman
\global\let\@numberstringFgerman=\@numberstringMgerman
\global\let\@numberstringNgerman=\@numberstringMgerman
-\DeclareRobustCommand{\@NumberstringMgerman}[2]{%
+\newcommand*{\@NumberstringMgerman}[2]{%
\@numberstringMgerman{#1}{\@@num@str}%
\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
}%
\global\let\@NumberstringMgerman\@NumberstringMgerman
\global\let\@NumberstringFgerman=\@NumberstringMgerman
\global\let\@NumberstringNgerman=\@NumberstringMgerman
-\DeclareRobustCommand{\@ordinalstringMgerman}[2]{%
+\newcommand*{\@ordinalstringMgerman}[2]{%
\let\@unitthstring=\@@unitthstringMgerman
\let\@teenthstring=\@@teenthstringMgerman
\let\@tenthstring=\@@tenthstringMgerman
@@ -141,7 +141,7 @@
\@@ordinalstringgerman{#1}{#2}%
}%
\global\let\@ordinalstringMgerman\@ordinalstringMgerman
-\DeclareRobustCommand{\@ordinalstringFgerman}[2]{%
+\newcommand*{\@ordinalstringFgerman}[2]{%
\let\@unitthstring=\@@unitthstringFgerman
\let\@teenthstring=\@@teenthstringFgerman
\let\@tenthstring=\@@tenthstringFgerman
@@ -153,7 +153,7 @@
\@@ordinalstringgerman{#1}{#2}%
}%
\global\let\@ordinalstringFgerman\@ordinalstringFgerman
-\DeclareRobustCommand{\@ordinalstringNgerman}[2]{%
+\newcommand*{\@ordinalstringNgerman}[2]{%
\let\@unitthstring=\@@unitthstringNgerman
\let\@teenthstring=\@@teenthstringNgerman
\let\@tenthstring=\@@tenthstringNgerman
@@ -165,17 +165,17 @@
\@@ordinalstringgerman{#1}{#2}%
}%
\global\let\@ordinalstringNgerman\@ordinalstringNgerman
-\DeclareRobustCommand{\@OrdinalstringMgerman}[2]{%
+\newcommand*{\@OrdinalstringMgerman}[2]{%
\@ordinalstringMgerman{#1}{\@@num@str}%
\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
}%
\global\let\@OrdinalstringMgerman\@OrdinalstringMgerman
-\DeclareRobustCommand{\@OrdinalstringFgerman}[2]{%
+\newcommand*{\@OrdinalstringFgerman}[2]{%
\@ordinalstringFgerman{#1}{\@@num@str}%
\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
}%
\global\let\@OrdinalstringFgerman\@OrdinalstringFgerman
-\DeclareRobustCommand{\@OrdinalstringNgerman}[2]{%
+\newcommand*{\@OrdinalstringNgerman}[2]{%
\@ordinalstringNgerman{#1}{\@@num@str}%
\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
}%
@@ -470,7 +470,9 @@
}%
\global\let\@@ordinalstringgerman\@@ordinalstringgerman
\FCloadlang{germanb}%
-
+\iffalse Local variables: \fi
+\iffalse mode: docTeX \fi
+\iffalse End: \fi
\endinput
%%
%% End of file `fc-german.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
index 3b3bdc4460c..0f83e97d690 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
index 22a43458001..3f05150b763 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
index c9d38dd6604..52491b78ac0 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
index 1be2a82515d..e518b6aa18a 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
index 0a4f696ef75..372515fc99f 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,7 +51,7 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{portuges}[2014/06/09]%
+\ProvidesFCLanguage{portuges}[2016/01/12]%
\newcommand*\@ordinalMportuges[2]{%
\ifnum#1=0\relax
\edef#2{\number#1}%
@@ -245,7 +245,13 @@
\fi
}%
\global\let\@@HundredstringFportuges\@@HundredstringFportuges
-\DeclareRobustCommand{\@numberstringMportuges}[2]{%
+\cs{newcommand*} as robustness is handled now at top level in %
+\texttt{fmtcount.sty}, and we don't need \cs{long} macros. Concerned %
+macros are \cs{@numberstringMportuges}, \cs{@numberstringFportuges},
+\cs{@NumberstringMportuges}, \cs{@NumberstringFportuges},
+\cs{@ordinalstringMportuges}, \cs{@ordinalstringFportuges},
+\cs{@OrdinalstringMportuges}, and \cs{@OrdinalstringFportuges}.}
+\newcommand*{\@numberstringMportuges}[2]{%
\let\@unitstring=\@@unitstringportuges
\let\@teenstring=\@@teenstringportuges
\let\@tenstring=\@@tenstringportuges
@@ -255,7 +261,7 @@
\@@numberstringportuges{#1}{#2}%
}%
\global\let\@numberstringMportuges\@numberstringMportuges
-\DeclareRobustCommand{\@numberstringFportuges}[2]{%
+\newcommand*{\@numberstringFportuges}[2]{%
\let\@unitstring=\@@unitstringFportuges
\let\@teenstring=\@@teenstringportuges
\let\@tenstring=\@@tenstringportuges
@@ -266,7 +272,7 @@
}%
\global\let\@numberstringFportuges\@numberstringFportuges
\global\let\@numberstringNportuges\@numberstringMportuges
-\DeclareRobustCommand{\@NumberstringMportuges}[2]{%
+\newcommand*{\@NumberstringMportuges}[2]{%
\let\@unitstring=\@@Unitstringportuges
\let\@teenstring=\@@Teenstringportuges
\let\@tenstring=\@@Tenstringportuges
@@ -276,7 +282,7 @@
\@@numberstringportuges{#1}{#2}%
}%
\global\let\@NumberstringMportuges\@NumberstringMportuges
-\DeclareRobustCommand{\@NumberstringFportuges}[2]{%
+\newcommand*{\@NumberstringFportuges}[2]{%
\let\@unitstring=\@@UnitstringFportuges
\let\@teenstring=\@@Teenstringportuges
\let\@tenstring=\@@Tenstringportuges
@@ -287,7 +293,7 @@
}%
\global\let\@NumberstringFportuges\@NumberstringFportuges
\global\let\@NumberstringNportuges\@NumberstringMportuges
-\DeclareRobustCommand{\@ordinalstringMportuges}[2]{%
+\newcommand*{\@ordinalstringMportuges}[2]{%
\let\@unitthstring=\@@unitthstringportuges
\let\@unitstring=\@@unitstringportuges
\let\@teenthstring=\@@teenthstringportuges
@@ -297,7 +303,7 @@
\@@ordinalstringportuges{#1}{#2}%
}%
\global\let\@ordinalstringMportuges\@ordinalstringMportuges
-\DeclareRobustCommand{\@ordinalstringFportuges}[2]{%
+\newcommand*{\@ordinalstringFportuges}[2]{%
\let\@unitthstring=\@@unitthstringFportuges
\let\@unitstring=\@@unitstringFportuges
\let\@teenthstring=\@@teenthstringportuges
@@ -308,7 +314,7 @@
}%
\global\let\@ordinalstringFportuges\@ordinalstringFportuges
\global\let\@ordinalstringNportuges\@ordinalstringMportuges
-\DeclareRobustCommand{\@OrdinalstringMportuges}[2]{%
+\newcommand*{\@OrdinalstringMportuges}[2]{%
\let\@unitthstring=\@@Unitthstringportuges
\let\@unitstring=\@@Unitstringportuges
\let\@teenthstring=\@@teenthstringportuges
@@ -318,7 +324,7 @@
\@@ordinalstringportuges{#1}{#2}%
}%
\global\let\@OrdinalstringMportuges\@OrdinalstringMportuges
-\DeclareRobustCommand{\@OrdinalstringFportuges}[2]{%
+\newcommand*{\@OrdinalstringFportuges}[2]{%
\let\@unitthstring=\@@UnitthstringFportuges
\let\@unitstring=\@@UnitstringFportuges
\let\@teenthstring=\@@teenthstringportuges
@@ -702,6 +708,9 @@ this number}%
\fi
}%
\global\let\@@ordinalstringportuges\@@ordinalstringportuges
+\iffalse Local variables: \fi
+\iffalse mode: docTeX \fi
+\iffalse End: \fi
\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
index 18bb7e9f948..262a4c6a282 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuguese.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
index 3a8c9eb2b37..ddb0e1eb6e0 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,7 +51,7 @@
%% Local Variables:
%% coding: utf-8
%% End:
-\ProvidesFCLanguage{spanish}[2013/08/17]%
+\ProvidesFCLanguage{spanish}[2016/01/12]%
\newcommand*\@ordinalMspanish[2]{%
\edef#2{\number#1\relax\noexpand\fmtord{o}}%
}%
@@ -297,7 +297,7 @@
\fi
}%
\global\let\@@HundredstringFspanish\@@HundredstringFspanish
-\DeclareRobustCommand{\@numberstringMspanish}[2]{%
+\newcommand*{\@numberstringMspanish}[2]{%
\let\@unitstring=\@@unitstringspanish
\let\@teenstring=\@@teenstringspanish
\let\@tenstring=\@@tenstringspanish
@@ -308,7 +308,7 @@
\@@numberstringspanish{#1}{#2}%
}%
\global\let\@numberstringMspanish\@numberstringMspanish
-\DeclareRobustCommand{\@numberstringFspanish}[2]{%
+\newcommand*{\@numberstringFspanish}[2]{%
\let\@unitstring=\@@unitstringFspanish
\let\@teenstring=\@@teenstringspanish
\let\@tenstring=\@@tenstringspanish
@@ -320,7 +320,7 @@
}%
\global\let\@numberstringFspanish\@numberstringFspanish
\global\let\@numberstringNspanish\@numberstringMspanish
-\DeclareRobustCommand{\@NumberstringMspanish}[2]{%
+\newcommand*{\@NumberstringMspanish}[2]{%
\let\@unitstring=\@@Unitstringspanish
\let\@teenstring=\@@Teenstringspanish
\let\@tenstring=\@@Tenstringspanish
@@ -331,7 +331,7 @@
\@@numberstringspanish{#1}{#2}%
}%
\global\let\@NumberstringMspanish\@NumberstringMspanish
-\DeclareRobustCommand{\@NumberstringFspanish}[2]{%
+\newcommand*{\@NumberstringFspanish}[2]{%
\let\@unitstring=\@@UnitstringFspanish
\let\@teenstring=\@@Teenstringspanish
\let\@tenstring=\@@Tenstringspanish
@@ -343,7 +343,7 @@
}%
\global\let\@NumberstringFspanish\@NumberstringFspanish
\global\let\@NumberstringNspanish\@NumberstringMspanish
-\DeclareRobustCommand{\@ordinalstringMspanish}[2]{%
+\newcommand*{\@ordinalstringMspanish}[2]{%
\let\@unitthstring=\@@unitthstringspanish
\let\@unitstring=\@@unitstringspanish
\let\@teenthstring=\@@teenthstringspanish
@@ -353,7 +353,7 @@
\@@ordinalstringspanish{#1}{#2}%
}%
\global\let\@ordinalstringMspanish\@ordinalstringMspanish
-\DeclareRobustCommand{\@ordinalstringFspanish}[2]{%
+\newcommand*{\@ordinalstringFspanish}[2]{%
\let\@unitthstring=\@@unitthstringFspanish
\let\@unitstring=\@@unitstringFspanish
\let\@teenthstring=\@@teenthstringFspanish
@@ -364,7 +364,7 @@
}%
\global\let\@ordinalstringFspanish\@ordinalstringFspanish
\global\let\@ordinalstringNspanish\@ordinalstringMspanish
-\DeclareRobustCommand{\@OrdinalstringMspanish}[2]{%
+\newcommand*{\@OrdinalstringMspanish}[2]{%
\let\@unitthstring=\@@Unitthstringspanish
\let\@unitstring=\@@Unitstringspanish
\let\@teenthstring=\@@Teenthstringspanish
@@ -374,7 +374,7 @@
\@@ordinalstringspanish{#1}{#2}%
}
\global\let\@OrdinalstringMspanish\@OrdinalstringMspanish
-\DeclareRobustCommand{\@OrdinalstringFspanish}[2]{%
+\newcommand*{\@OrdinalstringFspanish}[2]{%
\let\@unitthstring=\@@UnitthstringFspanish
\let\@unitstring=\@@UnitstringFspanish
\let\@teenthstring=\@@TeenthstringFspanish
@@ -811,7 +811,9 @@ this number}%
\fi
}%
\global\let\@@ordinalstringspanish\@@ordinalstringspanish
-
+\iffalse Local variables: \fi
+\iffalse mode: docTeX \fi
+\iffalse End: \fi%\iffalse
\endinput
%%
%% End of file `fc-spanish.def'.
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
index b65bfd53cf0..92063a43f9c 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -52,7 +52,7 @@
%% coding: utf-8
%% End:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fcnumparser}[2012/09/28]
+\ProvidesPackage{fcnumparser}[2017/06/15]
\def\fc@counter@parser#1{%
\expandafter\fc@number@parser\expandafter{\the#1.}%
}
@@ -332,12 +332,12 @@
of macro `fc@get@last@word'}}%
\def\fc@get@last@word#1#2#3{%
{%
- \def\@tempa##1\fc@case##2\@nil\fc@end{%
+ \def\@tempa##1\fc@wcase##2\@nil\fc@end{%
\toks0{##1}%
- \toks1{##2\fc@case}%
+ \toks1{##2\fc@wcase}%
}%
\@tempa#1\fc@end
- \def\@tempa##1\fc@case##2\fc@end{%
+ \def\@tempa##1\fc@wcase##2\fc@end{%
\toks2{##1}%
\def\@tempb{##2}%
\toks3{##2}%
@@ -351,7 +351,7 @@
\expandafter\expandafter\expandafter\@tempt
\expandafter\expandafter\expandafter{%
\expandafter\the\expandafter\@tempt
- \expandafter\fc@case\the\toks2}%
+ \expandafter\fc@wcase\the\toks2}%
\toks1\toks3 %
\fi
\next
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
index e82d9a8b367..2518477c032 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
index 6d55bef08fc..e923c801f81 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 2015 Nicola Talbot and Vincent Belaïche
+%% Copyright 2017 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
@@ -51,8 +51,9 @@
%% Local Variables:
%% coding: utf-8
%% End:
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2015/05/05 v3.01]
+\ProvidesPackage{fmtcount}[2016/01/12 v3.02]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
@@ -277,7 +278,7 @@ italian}
\newif\if@DT@padzeroes
\newcount\@DT@loopN
\newcount\@DT@X
-\newcommand*{\@binary}[1]{%
+\newrobustcmd*{\@binary}[1]{%
\@DT@padzeroestrue
\@DT@loopN=17\relax
\@strctr=\@DT@loopN
@@ -303,7 +304,7 @@ italian}
}
\let\binarynum=\@binary
-\newcommand*{\@octal}[1]{%
+\newrobustcmd*{\@octal}[1]{%
\ifnum#1>32768
\PackageError{fmtcount}%
{Value of counter too large for \protect\@octal}
@@ -337,7 +338,7 @@ italian}
\ifcase#10\or1\or2\or3\or4\or5\or
6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi
}
-\newcommand*{\@hexadecimal}[1]{%
+\newrobustcmd*{\@hexadecimal}[1]{%
\@DT@padzeroestrue
\@DT@loopN=5\relax
\@strctr=\@DT@loopN
@@ -365,7 +366,7 @@ italian}
\ifcase#10\or1\or2\or3\or4\or5\or6\or
7\or8\or9\or A\or B\or C\or D\or E\or F\fi
}
-\newcommand*{\@Hexadecimal}[1]{%
+\newrobustcmd*{\@Hexadecimal}[1]{%
\@DT@padzeroestrue
\@DT@loopN=5\relax
\@strctr=\@DT@loopN
@@ -390,7 +391,7 @@ italian}
}
\let\Hexadecimalnum=\@Hexadecimal
-\newcommand*{\@aaalph}[1]{%
+\newrobustcmd*{\@aaalph}[1]{%
\@DT@loopN=#1\relax
\advance\@DT@loopN by -1\relax
\divide\@DT@loopN by 26\relax
@@ -409,7 +410,7 @@ italian}
}
\let\aaalphnum=\@aaalph
-\newcommand*{\@AAAlph}[1]{%
+\newrobustcmd*{\@AAAlph}[1]{%
\@DT@loopN=#1\relax
\advance\@DT@loopN by -1\relax
\divide\@DT@loopN by 26\relax
@@ -428,7 +429,7 @@ italian}
}
\let\AAAlphnum=\@AAAlph
-\newcommand*{\@abalph}[1]{%
+\newrobustcmd*{\@abalph}[1]{%
\ifnum#1>17576\relax
\PackageError{fmtcount}%
{Value of counter too large for \protect\@abalph}%
@@ -456,7 +457,7 @@ italian}
}
\let\abalphnum=\@abalph
-\newcommand*{\@ABAlph}[1]{%
+\newrobustcmd*{\@ABAlph}[1]{%
\ifnum#1>17576\relax
\PackageError{fmtcount}%
{Value of counter too large for \protect\@ABAlph}%
@@ -490,7 +491,7 @@ italian}
\@fmtc@count#2\relax
\fi
}
-\newcommand{\@decimal}[1]{%
+\newrobustcmd*{\@decimal}[1]{%
\@strctr=0\relax
\expandafter\@fmtc@count\number#1\relax
\@DT@loopN=\c@padzeroesN
@@ -504,8 +505,8 @@ italian}
\let\decimalnum=\@decimal
\newcommand{\FCordinal}[1]{%
- \expandafter\protect\expandafter\ordinalnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \ordinalnum{%
+ \the\value{#1}}%
}
\ifcsundef{ordinal}
{\let\ordinal\FCordinal}%
@@ -514,7 +515,7 @@ italian}
{\protect\ordinal \space already defined use
\protect\FCordinal \space instead.}
}
-\newcommand*{\ordinalnum}[1]{%
+\DeclareRobustCommand*{\ordinalnum}[1]{%
\new@ifnextchar[%
{\@ordinalnum{#1}}%
{\@ordinalnum{#1}[m]}%
@@ -545,10 +546,13 @@ italian}
}%
}
\newcommand*{\storeordinal}[2]{%
- \expandafter\protect\expandafter\storeordinalnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeordinalnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{%
+ \the\value{#2}}%
}
-\newcommand*{\storeordinalnum}[2]{%
+\newrobustcmd*{\storeordinalnum}[2]{%
\@ifnextchar[%
{\@storeordinalnum{#1}{#2}}%
{\@storeordinalnum{#1}{#2}[m]}%
@@ -578,10 +582,10 @@ italian}
}
\newcommand*{\FMCuse}[1]{\csname @fcs@#1\endcsname}
\newcommand*{\ordinalstring}[1]{%
- \expandafter\protect\expandafter\ordinalstringnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\ordinalstringnum\expandafter{%
+ \the\value{#1}}%
}
-\newcommand{\ordinalstringnum}[1]{%
+\newrobustcmd*{\ordinalstringnum}[1]{%
\new@ifnextchar[%
{\@ordinal@string{#1}}%
{\@ordinal@string{#1}[m]}%
@@ -612,10 +616,12 @@ italian}
}%
}
\newcommand*{\storeordinalstring}[2]{%
- \expandafter\protect\expandafter\storeordinalstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeordinalstringnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{\the\value{#2}}%
}
-\newcommand*{\storeordinalstringnum}[2]{%
+\newrobustcmd*{\storeordinalstringnum}[2]{%
\@ifnextchar[%
{\@store@ordinal@string{#1}{#2}}%
{\@store@ordinal@string{#1}{#2}[m]}%
@@ -644,10 +650,10 @@ italian}
\expandafter\let\csname @fcs@#1\endcsname\@fc@ordstr
}
\newcommand*{\Ordinalstring}[1]{%
- \expandafter\protect\expandafter\Ordinalstringnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\Ordinalstringnum\expandafter{%
+ \the\value{#1}}%
}
-\newcommand*{\Ordinalstringnum}[1]{%
+\newrobustcmd*{\Ordinalstringnum}[1]{%
\new@ifnextchar[%
{\@Ordinal@string{#1}}%
{\@Ordinal@string{#1}[m]}%
@@ -678,10 +684,12 @@ italian}
}%
}
\newcommand*{\storeOrdinalstring}[2]{%
- \expandafter\protect\expandafter\storeOrdinalstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeOrdinalstringnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{\the\value{#2}}%
}
-\newcommand*{\storeOrdinalstringnum}[2]{%
+\newrobustcmd*{\storeOrdinalstringnum}[2]{%
\@ifnextchar[%
{\@store@Ordinal@string{#1}{#2}}%
{\@store@Ordinal@string{#1}{#2}[m]}%
@@ -710,10 +718,12 @@ italian}
\expandafter\let\csname @fcs@#1\endcsname\@fc@ordstr
}
\newcommand*{\storeORDINALstring}[2]{%
- \expandafter\protect\expandafter\storeORDINALstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeORDINALstringnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{\the\value{#2}}%
}
-\newcommand*{\storeORDINALstringnum}[2]{%
+\newrobustcmd*{\storeORDINALstringnum}[2]{%
\@ifnextchar[%
{\@store@ORDINAL@string{#1}{#2}}%
{\@store@ORDINAL@string{#1}{#2}[m]}%
@@ -744,11 +754,11 @@ italian}
}%
}
\newcommand*{\ORDINALstring}[1]{%
- \expandafter\protect\expandafter\ORDINALstringnum{%
- \expandafter\the\csname c@#1\endcsname
+ \expandafter\ORDINALstringnum\expandafter{%
+ \the\value{#1}%
}%
}
-\newcommand*{\ORDINALstringnum}[1]{%
+\newrobustcmd*{\ORDINALstringnum}[1]{%
\new@ifnextchar[%
{\@ORDINAL@string{#1}}%
{\@ORDINAL@string{#1}[m]}%
@@ -780,7 +790,7 @@ italian}
}
\newcommand*{\storenumberstring}[2]{%
\expandafter\protect\expandafter\storenumberstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ \expandafter\the\value{#2}}%
}
\newcommand{\storenumberstringnum}[2]{%
\@ifnextchar[%
@@ -811,10 +821,10 @@ italian}
\expandafter\let\csname @fcs@#1\endcsname\@fc@numstr
}
\newcommand*{\numberstring}[1]{%
- \expandafter\protect\expandafter\numberstringnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\numberstringnum\expandafter{%
+ \the\value{#1}}%
}
-\newcommand*{\numberstringnum}[1]{%
+\newrobustcmd*{\numberstringnum}[1]{%
\new@ifnextchar[%
{\@number@string{#1}}%
{\@number@string{#1}[m]}%
@@ -845,8 +855,10 @@ italian}
}%
}
\newcommand*{\storeNumberstring}[2]{%
- \expandafter\protect\expandafter\storeNumberstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeNumberstringnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{\the\value{#2}}%
}
\newcommand{\storeNumberstringnum}[2]{%
\@ifnextchar[%
@@ -877,10 +889,10 @@ italian}
\expandafter\let\csname @fcs@#1\endcsname\@fc@numstr
}
\newcommand*{\Numberstring}[1]{%
- \expandafter\protect\expandafter\Numberstringnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\Numberstringnum\expandafter{%
+ \the\value{#1}}%
}
-\newcommand*{\Numberstringnum}[1]{%
+\newrobustcmd*{\Numberstringnum}[1]{%
\new@ifnextchar[%
{\@Number@string{#1}}%
{\@Number@string{#1}[m]}%
@@ -911,8 +923,10 @@ italian}
}%
}
\newcommand{\storeNUMBERstring}[2]{%
- \expandafter\protect\expandafter\storeNUMBERstringnum{#1}{%
- \expandafter\the\csname c@#2\endcsname}%
+ {%
+ \toks0{\storeNUMBERstringnum{#1}}%
+ \expandafter
+ }\the\toks0\expandafter{\the\value{#2}}%
}
\newcommand{\storeNUMBERstringnum}[2]{%
\@ifnextchar[%
@@ -945,10 +959,10 @@ italian}
}%
}
\newcommand*{\NUMBERstring}[1]{%
- \expandafter\protect\expandafter\NUMBERstringnum{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\NUMBERstringnum\expandafter{%
+ \the\value{#1}}%
}
-\newcommand*{\NUMBERstringnum}[1]{%
+\newrobustcmd*{\NUMBERstringnum}[1]{%
\new@ifnextchar[%
{\@NUMBER@string{#1}}%
{\@NUMBER@string{#1}[m]}%
@@ -979,40 +993,49 @@ italian}
}%
}
\providecommand*{\binary}[1]{%
- \expandafter\protect\expandafter\@binary{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@binary
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\aaalph}[1]{%
- \expandafter\protect\expandafter\@aaalph{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@aaalph
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\AAAlph}[1]{%
- \expandafter\protect\expandafter\@AAAlph{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@AAAlph
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\abalph}[1]{%
- \expandafter\protect\expandafter\@abalph{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@abalph
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\ABAlph}[1]{%
- \expandafter\protect\expandafter\@ABAlph{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@ABAlph
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\hexadecimal}[1]{%
- \expandafter\protect\expandafter\@hexadecimal{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@hexadecimal
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\Hexadecimal}[1]{%
- \expandafter\protect\expandafter\@Hexadecimal{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@Hexadecimal
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\octal}[1]{%
- \expandafter\protect\expandafter\@octal{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@octal
+ \expandafter{%
+ \the\value{#1}}%
}
\providecommand*{\decimal}[1]{%
- \expandafter\protect\expandafter\@decimal{%
- \expandafter\the\csname c@#1\endcsname}%
+ \expandafter\@decimal
+ \expandafter{%
+ \the\value{#1}}%
}
\def\@setdef@ultfmtcount{%
\ifcsundef{@ordinalMenglish}{\FCloadlang{english}}{}%