diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty index 4cfa2a54d90..8c2ee534e9d 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fmtcount.sty,package') %% %% fmtcount.dtx -%% Copyright 2013 Nicola Talbot and Vincent Belaïche +%% Copyright 2014 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fcnumparser.sty, fcprefix.sty, fmtcount.sty, fc-american.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fcnumparser.sty, fcprefix.sty, fmtcount.sty, fc-american.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -49,7 +49,7 @@ %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} %%\end{definition} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2013/08/17 v2.03] +\ProvidesPackage{fmtcount}[2014/06/18 v2.04] \RequirePackage{ifthen} \RequirePackage{keyval} \RequirePackage{etoolbox} @@ -109,15 +109,15 @@ \@fc@loadifbabelorpolyglossialdf{italian} \def\fmtcount@french{france} \define@key{fmtcount}{french}[france]{% - \@ifundefined{datefrench}% + \@FC@iflangloaded{french}% + {% + \setkeys{fcfrench}{#1}% + }% {% \PackageError{fmtcount}% {Language `french' not defined}% {You need to load babel before loading fmtcount}% }% - {% - \setkeys{fcfrench}{#1}% - }% } \define@key{fmtcount}{fmtord}{% \ifthenelse{\equal{#1}{level} @@ -154,7 +154,7 @@ \newcommand*{\fmtcountsetoptions}[1]{% \def\fmtcount@fmtord{}% \setkeys{fmtcount}{#1}% - \@ifundefined{datefrench}{}% + \@FC@iflangloaded{french}{\ifcsundef{@ordinalstringMfrench}% {% \edef\@ordinalstringMfrench{\noexpand \csname @ordinalstringMfrench\fmtcount@french\noexpand\endcsname}% @@ -172,7 +172,7 @@ \csname @NumberstringMfrench\fmtcount@french\noexpand\endcsname}% \edef\@NumberstringFfrench{\noexpand \csname @NumberstringFfrench\fmtcount@french\noexpand\endcsname}% - }% + }{}}{}% \ifthenelse{\equal{\fmtcount@fmtord}{level}}% {% \renewcommand{\fmtord}[1]{##1}% @@ -198,7 +198,7 @@ \def\fmtord#1{\textsuperscript{#1}}} \ProcessOptions \newcount\@DT@modctr -\def\@modulo#1#2{% +\newcommand*{\@FCmodulo}[2]{% \@DT@modctr=#1\relax \divide \@DT@modctr by #2\relax \multiply \@DT@modctr by #2\relax @@ -441,7 +441,7 @@ \expandafter\protect\expandafter\ordinalnum{% \expandafter\the\csname c@#1\endcsname}% } -\@ifundefined{ordinal} +\ifcsundef{ordinal} {\let\ordinal\FCordinal}% {% \PackageWarning{fmtcount}% @@ -949,7 +949,7 @@ \expandafter\the\csname c@#1\endcsname}% } \def\@setdef@ultfmtcount{% - \@ifundefined{@ordinalMenglish}{\FCloadlang{english}}{}% + \ifcsundef{@ordinalMenglish}{\FCloadlang{english}}{}% \def\@ordinalstringM{\@ordinalstringMenglish}% \let\@ordinalstringF=\@ordinalstringMenglish \let\@ordinalstringN=\@ordinalstringMenglish |