diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty index 22545873e48..4cfa2a54d90 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 2012 Nicola Talbot and Vincent Belaïche +%% Copyright 2013 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -49,7 +49,7 @@ %%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} %%\end{definition} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2012/10/24 v2.02] +\ProvidesPackage{fmtcount}[2013/08/17 v2.03] \RequirePackage{ifthen} \RequirePackage{keyval} \RequirePackage{etoolbox} @@ -60,23 +60,26 @@ \c@padzeroesN=1\relax \providecommand*{\padzeroes}[1][17]{\c@padzeroesN=#1} \newcount\fc@tmpcatcode -\def\fc@languages{} +\def\fc@languages{}% \def\fc@mainlang{}% \newcommand*{\FCloadlang}[1]{% \@FC@iflangloaded{#1}{}% {% \fc@tmpcatcode=\catcode`\@\relax \catcode `\@ 11\relax - \input{fc-#1.def}% - \catcode `\@ \fc@tmpcatcode\relax - \ifdefempty{\fc@languages}% - {% - \def\fc@languages{#1}% - }% + \InputIfFileExists{fc-#1.def}% {% - \appto\fc@languages{,#1}% + \ifdefempty{\fc@languages}% + {% + \gdef\fc@languages{#1}% + }% + {% + \gappto\fc@languages{,#1}% + }% + \gdef\fc@mainlang{#1}% }% - \def\fc@mainlang{#1}% + {}% + \catcode `\@ \fc@tmpcatcode\relax }% } \newcommand{\@FC@iflangloaded}[3]{% @@ -85,23 +88,25 @@ \newcommand*{\ProvidesFCLanguage}[1]{% \ProvidesFile{fc-#1.def}% } -\newcommand*{\@fc@loadifbabelldf}[1]{% +\newcommand*{\@fc@loadifbabelorpolyglossialdf}[1]{% \ifcsundef{ver@#1.ldf}{}{\FCloadlang{#1}}% -} -\@fc@loadifbabelldf{english} -\@fc@loadifbabelldf{UKenglish} -\@fc@loadifbabelldf{british} -\@fc@loadifbabelldf{USenglish} -\@fc@loadifbabelldf{american} -\@fc@loadifbabelldf{spanish} -\@fc@loadifbabelldf{portuges} -\@fc@loadifbabelldf{french} -\@fc@loadifbabelldf{frenchb} -\@fc@loadifbabelldf{german}% -\@fc@loadifbabelldf{germanb}% -\@fc@loadifbabelldf{ngerman}% -\@fc@loadifbabelldf{ngermanb}% -\@fc@loadifbabelldf{italian} + \IfFileExists{gloss-#1.ldf}{\ifcsundef{#1@loaded}{}{\FCloadlang{#1}}}{}% +} +\@fc@loadifbabelorpolyglossialdf{english} +\@fc@loadifbabelorpolyglossialdf{UKenglish} +\@fc@loadifbabelorpolyglossialdf{british} +\@fc@loadifbabelorpolyglossialdf{USenglish} +\@fc@loadifbabelorpolyglossialdf{american} +\@fc@loadifbabelorpolyglossialdf{spanish} +\@fc@loadifbabelorpolyglossialdf{portuges} +\@fc@loadifbabelorpolyglossialdf{french} +\@fc@loadifbabelorpolyglossialdf{frenchb} +\@fc@loadifbabelorpolyglossialdf{francais} +\@fc@loadifbabelorpolyglossialdf{german}% +\@fc@loadifbabelorpolyglossialdf{germanb}% +\@fc@loadifbabelorpolyglossialdf{ngerman}% +\@fc@loadifbabelorpolyglossialdf{ngermanb}% +\@fc@loadifbabelorpolyglossialdf{italian} \def\fmtcount@french{france} \define@key{fmtcount}{french}[france]{% \@ifundefined{datefrench}% |