fmtcount (9may15)

git-svn-id: svn://tug.org/texlive/trunk@37298 c570f23f-e606-0410-a88d-b1316a301751

19 files changed, 216 insertions, 109 deletions

diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
index b514c4a21c5..9a7ccc3c5d9 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{UKenglish}[2013/08/17]%
 \FCloadlang{english}%
 \global\let\@ordinalMUKenglish\@ordinalMenglish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
index 19c7bd4efcc..711a25082ba 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{USenglish}[2013/08/17]%
 \FCloadlang{english}%
 \global\let\@ordinalMUSenglish\@ordinalMenglish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
index da645326fd2..d143d70ca68 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{american}[2013/08/17]%
 \FCloadlang{USenglish}%
 \global\let\@ordinalMamerican\@ordinalMUSenglish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
index ab6e3fae49a..787ce1dea3a 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{british}[2013/08/17]%
 \FCloadlang{english}%
 \global\let\@ordinalMbritish\@ordinalMenglish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
index 0b5f820ff30..1b4d41824b4 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{english}[2013/08/17]%
 \newcommand*\@ordinalMenglish[2]{%
 \def\@fc@ord{}%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
index 356a5064561..607da3c3229 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{francais}[2013/08/17]%
 \FCloadlang{french}%
 \global\let\@ordinalMfrancais=\@ordinalMfrench
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
index 43180885d80..af6c49a242f 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{french}[2012/10/24]%
 \def\fc@french@set@plural#1#2#3#4#5#6{%
   \ifthenelse{\equal{#2}{reformed}}{%
@@ -165,6 +168,7 @@
     \def\fmtcount@french{#1}}%
 }%
 \@tempa{france}\@tempa{swiss}\@tempa{belgian}%
+\def\fmtcount@french{france}%
 \define@key{fcfrench}{dialect}[france]{%
   \ifthenelse{\equal{#1}{france}
     \or\equal{#1}{swiss}
@@ -189,22 +193,34 @@
 
 \newcommand*{\@ordinalMfrench}[2]{%
 \iffmtord@abbrv
-  \edef#2{\number#1\relax\noexpand\fmtord{e}}%
+  \ifnum#1=1 %
+    \edef#2{\number#1\relax\noexpand\fmtord{er}}%
+  \else
+    \edef#2{\number#1\relax\noexpand\fmtord{e}}%
+  \fi
 \else
-  \ifnum#1=1\relax
+  \PackageWarning{fmtcount}{Non abbreviated ordinal finals (`eme) are
+    considered incorrect in French.}%
+  \ifnum#1=1 %
     \edef#2{\number#1\relax\noexpand\fmtord{er}}%
   \else
-    \edef#2{\number#1\relax\noexpand\fmtord{eme}}%
+    \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}%
   \fi
 \fi}
 \newcommand*{\@ordinalFfrench}[2]{%
 \iffmtord@abbrv
-  \edef#2{\number#1\relax\noexpand\fmtord{e}}%
+  \ifnum#1=1 %
+     \edef#2{\number#1\relax\noexpand\fmtord{re}}%
+  \else
+     \edef#2{\number#1\relax\noexpand\fmtord{e}}%
+  \fi
 \else
+  \PackageWarning{fmtcount}{Non abbreviated ordinal finals (`eme) are
+    considered incorrect in French.}%
   \ifnum#1=1 %
-     \edef#2{\number#1\relax\noexpand\fmtord{i\`ere}}%
+     \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`ere}}%
   \else
-     \edef#2{\number#1\relax\noexpand\fmtord{i\`eme}}%
+     \protected@edef#2{\number#1\relax\noexpand\fmtord{\protect\`eme}}%
   \fi
 \fi}
 \let\@ordinalNfrench\@ordinalMfrench
@@ -463,7 +479,7 @@ z\'ero%
 \@@ordinalstringfrench{#1}{#2}%
 }
 \newcommand*\fc@@firstfrench{premier}
-\newcommand*\fc@@firstFfrench{premi\`ere}
+\newcommand*\fc@@firstFfrench{premi\protect\`ere}
 \DeclareRobustCommand{\@ordinalstringMfrenchfrance}[2]{%
 \let\fc@case\fc@CaseIden
 \let\fc@first=\fc@@firstfrench
@@ -1080,7 +1096,7 @@ z\'ero%
       \count0=0 %
     \fi
     \ifnum\count0=1 %
-      \edef\@tempa{\expandafter\fc@case\fc@first\@nil}%
+      \protected@edef\@tempa{\expandafter\fc@case\fc@first\@nil}%
     \else
       \def\@tempa##1{%
         \expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{%
@@ -1116,17 +1132,17 @@ z\'ero%
       \expandafter\fc@get@last@letter\expandafter{\@tempc}\@tempd\@tempe
       \def\@tempf{e}%
       \ifx\@tempe\@tempf
-        \edef\@tempa{\@tempb\expandafter\fc@case\@tempd i\`eme\@nil}%
+        \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd i\protect\`eme\@nil}%
       \else
         \def\@tempf{q}%
         \ifx\@tempe\@tempf
-          \edef\@tempa{\@tempb\expandafter\fc@case\@tempd qui\`eme\@nil}%
+          \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd qui\protect\`eme\@nil}%
         \else
           \def\@tempf{f}%
           \ifx\@tempe\@tempf
-            \edef\@tempa{\@tempb\expandafter\fc@case\@tempd vi\`eme\@nil}%
+            \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempd vi\protect\`eme\@nil}%
           \else
-            \edef\@tempa{\@tempb\expandafter\fc@case\@tempc i\`eme\@nil}%
+            \protected@edef\@tempa{\@tempb\expandafter\fc@case\@tempc i\protect\`eme\@nil}%
           \fi
         \fi
       \fi
@@ -1147,6 +1163,14 @@ z\'ero%
   \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}}%
 \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 65ee11c0e15..026b4e50437 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{frenchb}[2013/08/17]%
 \FCloadlang{french}%
 \global\let\@ordinalMfrenchb=\@ordinalMfrench
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
index 6f951e27153..3f0d859f0fc 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{german}[2014/06/09]%
 \newcommand{\@ordinalMgerman}[2]{%
   \edef#2{\number#1\relax.}%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
index 7dd3ce7e4b4..3b3bdc4460c 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{germanb}[2013/08/17]%
 \FCloadlang{german}%
 \global\let\@ordinalMgermanb=\@ordinalMgerman
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
index f9b728231d8..22a43458001 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{italian}[2013/08/17]
 
 \RequirePackage{itnumpar}
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
index a0e81dd3541..c9d38dd6604 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{ngerman}[2012/06/18]%
 \FCloadlang{german}%
 \FCloadlang{ngermanb}%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
index c3bfe07f7f2..1be2a82515d 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{ngermanb}[2013/08/17]%
 \FCloadlang{german}%
 \global\let\@ordinalMngermanb=\@ordinalMgerman
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
index 52262fa5745..0a4f696ef75 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{portuges}[2014/06/09]%
 \newcommand*\@ordinalMportuges[2]{%
   \ifnum#1=0\relax
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
index 60bdc54d659..18bb7e9f948 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{portuguese}[2014/06/09]%
 \FCloadlang{portuges}%
 \global\let\@ordinalMportuguese=\@ordinalMportuges
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
index 1d59ac7ae85..3a8c9eb2b37 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \ProvidesFCLanguage{spanish}[2013/08/17]%
 \newcommand*\@ordinalMspanish[2]{%
   \edef#2{\number#1\relax\noexpand\fmtord{o}}%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
index e55bea04492..b65bfd53cf0 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fcnumparser}[2012/09/28]
 \def\fc@counter@parser#1{%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
index 44b7832fbcb..e82d9a8b367 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,6 +48,9 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fcprefix}[2012/09/28]
 \RequirePackage{ifthen}
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
index df80c35e55e..6d55bef08fc 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 2014 Nicola Talbot and Vincent Belaïche
+%%  Copyright 2015 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-portuguese.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 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, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
 %% 
 %% \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,15 +48,25 @@
 %%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
 %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
 %%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% End:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2014/07/18 v3.00]
+\ProvidesPackage{fmtcount}[2015/05/05 v3.01]
 \RequirePackage{ifthen}
-\RequirePackage{keyval}
+\RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \RequirePackage{fcprefix}
 \RequirePackage{ifxetex}
 \RequirePackage{amsgen}
-\providecommand*{\fmtord}[1]{\textsuperscript{#1}}
+\providecommand*{\fc@orddef@ult}[1]{\fc@textsuperscript{#1}}
+\providecommand*{\fc@ord@multiling}[1]{%
+  \ifcsundef{fc@\languagename @alias@of}{%
+  \fc@orddef@ult{#1}}{%
+  \expandafter\let\expandafter\@tempa\csname fc@\languagename @alias@of\endcsname
+  \ifcsundef{fc@ord@\@tempa}{%
+    \fc@orddef@ult{#1}}{%
+\csname fc@ord@\@tempa\endcsname{#1}}}}
 \newcount\c@padzeroesN
 \c@padzeroesN=1\relax
 \providecommand*{\padzeroes}[1][17]{\c@padzeroesN=#1}
@@ -139,34 +149,72 @@ italian}
   \fi
 }
 \fc@iterate@on@languages\@fc@loadifbabelorpolyglossialdf
-\def\fmtcount@french{france}
-\define@key{fmtcount}{french}[france]{%
-  \@FC@iflangloaded{french}%
-  {%
-    \setkeys{fcfrench}{#1}%
+\def\fc@iterate@on@languages@body#1{%
+  \expandafter\def\csname fc@#1@alias@of\endcsname{#1}}
+\expandafter\@fc@iterate@on@languages\fc@supported@language@list,\@nil,%
+\def\@tempa#1#2{%
+  \expandafter\def\csname fc@#1@alias@of\endcsname{#2}%
+}%
+\@tempa{frenchb}{french}
+\@tempa{francais}{french}
+\@tempa{germanb}{german}
+\@tempa{ngermanb}{german}
+\@tempa{ngerman}{german}
+\@tempa{british}{english}
+\@tempa{american}{USenglish}
+\def\fc@iterate@on@languages@body#1{%
+  \define@key{fmtcount}{#1}[]{%
+    \@FC@iflangloaded{#1}%
+    {%
+      \setkeys{fc\csname fc@#1@alias@of\endcsname}{##1}%
+    }{%
+      \PackageError{fmtcount}%
+      {Language `#1' not defined}%
+      {You need to load \ifxetex polyglossia\else babel\fi\space before loading fmtcount}%
+    }%
   }%
-  {%
-    \PackageError{fmtcount}%
-    {Language `french' not defined}%
-    {You need to load babel before loading fmtcount}%
+  \ifthenelse{\equal{\csname fc@#1@alias@of\endcsname}{#1}}{%
+    \define@key{fc\csname fc@#1@alias@of\endcsname}{fmtord}{%
+      \ifthenelse{\equal{##1}{raise}\or\equal{##1}{level}}{%
+        \expandafter\let\expandafter\@tempa\csname fc@set@ord@as@##1\endcsname
+        \expandafter\@tempa\csname fc@ord@#1\endcsname
+      }{%
+        \ifthenelse{\equal{##1}{undefine}}{%
+          \expandafter\let\csname fc@ord@#1\endcsname\undefined
+        }{%
+          \PackageError{fmtcount}%
+          {Invalid value `##1' to fmtord key}%
+          {Option `fmtord' can only take the values `level', `raise'
+            or `undefine'}%
+        }}
+    }%
+  }{%
+    \expandafter\let\expandafter\@tempa\csname KV@\csname fc@#1@alias@of\endcsname @fmtord\endcsname
+    \expandafter\let\csname KV@#1@fmtord\endcsname\@tempa
   }%
 }
+\expandafter\@fc@iterate@on@languages\fc@supported@language@list,\@nil,%
+\def\fc@set@ord@as@level#1{%
+  \def#1##1{##1}%
+}
+\def\fc@set@ord@as@raise#1{%
+  \let#1\fc@textsuperscript
+}
 \define@key{fmtcount}{fmtord}{%
   \ifthenelse{\equal{#1}{level}
-           \or\equal{#1}{raise}
-           \or\equal{#1}{user}}%
+           \or\equal{#1}{raise}}%
   {%
+    \csname fc@set@ord@as@#1\endcsname\fc@orddef@ult
     \def\fmtcount@fmtord{#1}%
   }%
   {%
     \PackageError{fmtcount}%
     {Invalid value `#1' to fmtord key}%
-    {Option `fmtord' can only take the values `level', `raise'
-     or `user'}%
+    {Option `fmtord' can only take the values `level' or `raise'}%
   }%
 }
 \newif\iffmtord@abbrv
-\fmtord@abbrvfalse
+\fmtord@abbrvtrue
 \define@key{fmtcount}{abbrv}[true]{%
   \ifthenelse{\equal{#1}{true}\or\equal{#1}{false}}%
   {%
@@ -175,7 +223,7 @@ italian}
   {%
     \PackageError{fmtcount}%
     {Invalid value `#1' to fmtord key}%
-    {Option `fmtord' can only take the values `true' or
+    {Option `abbrv' can only take the values `true' or
      `false'}%
   }%
 }
@@ -183,59 +231,38 @@ italian}
   \RequirePackage{fmtprefix}%
   \fmtprefixsetoption{#1}%
 }
-\newcommand*{\fmtcountsetoptions}[1]{%
+\def\fmtcountsetoptions{%
   \def\fmtcount@fmtord{}%
-  \setkeys{fmtcount}{#1}%
-  \@FC@iflangloaded{french}{\ifcsundef{@ordinalstringMfrench}%
-  {%
-    \edef\@ordinalstringMfrench{\noexpand
-      \csname @ordinalstringMfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@ordinalstringFfrench{\noexpand
-      \csname @ordinalstringFfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@OrdinalstringMfrench{\noexpand
-      \csname @OrdinalstringMfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@OrdinalstringFfrench{\noexpand
-      \csname @OrdinalstringFfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@numberstringMfrench{\noexpand
-      \csname @numberstringMfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@numberstringFfrench{\noexpand
-      \csname @numberstringFfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@NumberstringMfrench{\noexpand
-      \csname @NumberstringMfrench\fmtcount@french\noexpand\endcsname}%
-    \edef\@NumberstringFfrench{\noexpand
-      \csname @NumberstringFfrench\fmtcount@french\noexpand\endcsname}%
-  }{}}{}%
-  \ifthenelse{\equal{\fmtcount@fmtord}{level}}%
-  {%
-    \renewcommand{\fmtord}[1]{##1}%
-  }%
-  {%
-    \ifthenelse{\equal{\fmtcount@fmtord}{raise}}%
-    {%
-      \renewcommand{\fmtord}[1]{\textsuperscript{##1}}%
-    }%
-    {%
-    }%
-  }
-}
+  \setkeys{fmtcount}}%
 \InputIfFileExists{fmtcount.cfg}%
 {%
   \PackageInfo{fmtcount}{Using configuration file fmtcount.cfg}%
 }%
 {%
 }
+\newcommand*{\fmtcount@loaded@by@option@lang@list}{}
 \newcommand*\@fc@declare@language@option[1]{%
   \DeclareOption{#1}{%
-    \@FC@iflangloaded{#1}{}{%
-      \fmtcount@language@optiontrue
-      \FCloadlang{#1}%
-     }}}%
+    \ifx\fmtcount@loaded@by@option@lang@list\@empty
+       \def\fmtcount@loaded@by@option@lang@list{#1}%
+    \else
+       \edef\fmtcount@loaded@by@option@lang@list{\fmtcount@loaded@by@option@lang@list,#1}%
+    \fi
+  }}%
 \fc@iterate@on@languages\@fc@declare@language@option
 \DeclareOption{level}{\def\fmtcount@fmtord{level}%
-  \def\fmtord#1{#1}}
+  \def\fc@orddef@ult#1{#1}}
 \DeclareOption{raise}{\def\fmtcount@fmtord{raise}%
-  \def\fmtord#1{\textsuperscript{#1}}}
+  \def\fc@orddef@ult#1{\fc@textsuperscript{#1}}}
 \ProcessOptions\relax
+\ifx\fmtcount@loaded@by@option@lang@list\@empty\else
+\def\fc@iterate@on@languages@body#1{%
+    \@FC@iflangloaded{#1}{}{%
+      \fmtcount@language@optiontrue
+      \FCloadlang{#1}%
+     }}
+\expandafter\@fc@iterate@on@languages\fmtcount@loaded@by@option@lang@list,\@nil,%
+\fi
 \newcount\@DT@modctr
 \newcommand*{\@FCmodulo}[2]{%
   \@DT@modctr=#1\relax
@@ -712,7 +739,7 @@ italian}
       \protect\@ordinalstringM{#2}{\@fc@ordstr}%
     }%
   }%
-  \expandafter\edef\csname @fcs@#1\endcsname{%
+  \expandafter\protected@edef\csname @fcs@#1\endcsname{%
     \noexpand\MakeUppercase{\@fc@ordstr}%
   }%
 }
@@ -1004,6 +1031,7 @@ italian}
   \def\@ordinalM{\@ordinalMenglish}%
   \let\@ordinalF=\@ordinalM
   \let\@ordinalN=\@ordinalM
+  \let\fmtord\fc@orddef@ult
 }
 \newcommand*{\fc@multiling}[2]{%
   \ifcsundef{@#1#2\languagename}%
@@ -1085,6 +1113,7 @@ italian}
   \def\@OrdinalstringN{%
     \fc@multiling{Ordinalstring}{N}%
   }%
+  \let\fmtord\fc@ord@multiling
 }
 \expandafter\@ifpackageloaded
 \expandafter{\ifxetex polyglossia\else babel\fi}%
@@ -1125,6 +1154,9 @@ italian}
     \fi
   }%
 }
+\AtBeginDocument{%
+   \ifcsundef{FBsupR}{\let\fc@textsuperscript\textsuperscript}{\let\fc@textsuperscript\fup}%
+}
 \let\@ordinal=\@ordinalM
 \let\@ordinalstring=\@ordinalstringM
 \let\@Ordinalstring=\@OrdinalstringM