From 27faeceacd441677a049a895ea70fd4691c8c6e0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Aug 2006 23:05:07 +0000 Subject: fmtcount (30jul06) git-svn-id: svn://tug.org/texlive/trunk@1961 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fmtcount/fc-english.def | 2 +- Master/texmf-dist/tex/latex/fmtcount/fc-french.def | 2 +- Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def | 2 +- Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def | 2 +- Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 14 ++++++++------ 5 files changed, 12 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fmtcount') diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def index 6cdb240e170..d1b953c4fa3 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def @@ -5,7 +5,7 @@ %% The original source files were: %% %% fmtcount.dtx (with options: `fc-english.def,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def index 2d962c670d4..3d54bafe259 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def @@ -5,7 +5,7 @@ %% The original source files were: %% %% fmtcount.dtx (with options: `fc-french.def,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def index 83fec7d9de8..6802ca59ebb 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def @@ -5,7 +5,7 @@ %% The original source files were: %% %% fmtcount.dtx (with options: `fc-portuges.def,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def index 0410de73d84..2510d34d83a 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def @@ -5,7 +5,7 @@ %% The original source files were: %% %% fmtcount.dtx (with options: `fc-spanish.def,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty index 02fba14a600..8bca3804618 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% fmtcount.dtx (with options: `fmtcount.sty,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this @@ -27,7 +27,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2005/06/20 v1.03] +\ProvidesPackage{fmtcount}[2006/07/29 v1.04] \RequirePackage{ifthen} \RequirePackage{keyval} \providecommand{\fmtord}[1]{\textsuperscript{#1}} @@ -317,10 +317,12 @@ or `user'}}} \fi} \let\decimalnum=\@decimal -\newcommand{\ordinal}[1]{% +\newcommand{\FCordinal}[1]{% \expandafter\protect\expandafter\ordinalnum{% \expandafter\the\csname c@#1\endcsname}} - +\@ifundefined{ordinal}{\let\ordinal\FCordinal}{% +\PackageWarning{fmtcount}{\string\ordinal +\space already defined use \string\FCordinal \space instead.}} \newcommand{\ordinalnum}[1]{\@ifnextchar[{\@ordinalnum{#1}}{% \@ordinalnum{#1}[m]}} @@ -328,8 +330,8 @@ or `user'}}} \ifthenelse{\equal{#2}{f}}{% \protect\@ordinalF{#1}}{% \ifthenelse{\equal{#2}{m}}{}{% -\PackageError{fmtcount}{Invalid gender option `#2' to -\string\ordinal}{Available options are m or f}}% +\PackageError{fmtcount}{Invalid gender option `#2'}{% +Available options are m or f}}% \protect\@ordinalM{#1}}} \newcommand{\ordinalstring}[1]{% -- cgit v1.2.3