summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/tools/tpm-ctan-check2
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/CHANGES2
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/README4
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-samp.pdfbin34541 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdfbin117682 -> 118989 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fmtcount.perl4
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/manual.html33
-rw-r--r--Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx59
-rw-r--r--Master/texmf-dist/source/latex/fmtcount/fmtcount.ins4
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-english.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-french.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty14
-rw-r--r--Master/texmf-dist/tpm/fmtcount.tpm9
-rw-r--r--Master/texmf/lists/fmtcount1
18 files changed, 89 insertions, 55 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 09712dd8224..c91f14ebfef 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -65,7 +65,7 @@ sub main
makecell makeplot mathdots mathmode mcaption
memoir mentis metauml mfpic
mhchem minitoc microtype minitoc mla-paper
- moderncv movie15 muthesis
+ moderncv movie15 munich muthesis
nag ncclatex ncctools newlfm noitcrul
nomencl nomentbl ntheorem-vn numprint
oberdiek octavo
diff --git a/Master/texmf-dist/doc/latex/fmtcount/CHANGES b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
index 0decf94d737..f27426baee1 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/CHANGES
+++ b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
@@ -1,5 +1,7 @@
fmtcount package versions:
+Version 1.04: provided \FCordinal to avoid clashes with the memoir class.
+
Version 1.03: Minor bug fixes (concerning fmtcount.cfg and the effect of \padzeroes).
Version 1.02: Added multilingual support
diff --git a/Master/texmf-dist/doc/latex/fmtcount/README b/Master/texmf-dist/doc/latex/fmtcount/README
index eede71472c8..f51c9872974 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/README
+++ b/Master/texmf-dist/doc/latex/fmtcount/README
@@ -1,6 +1,6 @@
-LaTeX Package : fmtcount v 1.03
+LaTeX Package : fmtcount v 1.04
-Last Modified : 20 June 2005
+Last Modified : 29 July 2006
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
index 798fbfee3ac..89ead352612 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
+++ b/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% fmtcount.dtx (with options: `fc-lang.tex,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/doc/latex/fmtcount/fc-samp.pdf b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.pdf
deleted file mode 100644
index 4316679d0cc..00000000000
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-samp.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
index 2fb8b23549c..7a07151851e 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
+++ b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% fmtcount.dtx (with options: `fc-samp.tex,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/doc/latex/fmtcount/fmtcount.pdf b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
index cf5aaa39b24..8753cee4faa 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
+++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.perl b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.perl
index 941b48fa98c..875f41febc1 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.perl
+++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.perl
@@ -145,6 +145,10 @@ sub do_cmd_ordinalnum{
join('', $num, "\\fmtord${OP}$br_id${CP}$suffix${OP}$br_id${CP}", $_[0]);
}
+sub do_cmd_FCordinal{
+ &do_cmd_ordinal;
+}
+
sub do_cmd_ordinal{
local($ctr, $val, $id, $_) = &read_counter_value($_[0]);
local($gender)='m';
diff --git a/Master/texmf-dist/doc/latex/fmtcount/manual.html b/Master/texmf-dist/doc/latex/fmtcount/manual.html
index 9fa76258784..3abde572230 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/manual.html
+++ b/Master/texmf-dist/doc/latex/fmtcount/manual.html
@@ -1,22 +1,19 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--Converted with jLaTeX2HTML 2002-2-1 (1.70) JA patch-2.0
-patched version by: Kenshi Muto, Debian Project.
-* modified by: Shige TAKENO
-LaTeX2HTML 2002-2-1 (1.70),
+<!--Converted with LaTeX2HTML 2002-2-1 (1.70)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
-<TITLE>fmtcount.sty v1.03: Displaying the Values of LaTeX Counters</TITLE>
-<META NAME="description" CONTENT="fmtcount.sty v1.03: Displaying the Values of LaTeX Counters">
+<TITLE>fmtcount.sty v1.04: Displaying the Values of LaTeX Counters</TITLE>
+<META NAME="description" CONTENT="fmtcount.sty v1.04: Displaying the Values of LaTeX Counters">
<META NAME="keywords" CONTENT="manual">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
-<META NAME="Generator" CONTENT="jLaTeX2HTML v2002-2-1 JA patch-2.0">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2002-2-1">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -34,12 +31,12 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<P>
- <H1 ALIGN="CENTER">fmtcount.sty v1.03: Displaying the Values of
+ <H1 ALIGN="CENTER">fmtcount.sty v1.04: Displaying the Values of
LaTeX Counters</H1>
<DIV>
-<P ALIGN="CENTER"><STRONG>N.L.C. Talbot</STRONG></P>
-<P ALIGN="CENTER"><STRONG>1 July 2005</STRONG></P>
+<P ALIGN="CENTER"><STRONG>Nicola L.C. Talbot</STRONG></P>
+<P ALIGN="CENTER"><STRONG>29 July 2006</STRONG></P>
</DIV>
<BR>
@@ -119,6 +116,15 @@ The macro <code>\ordinal{</code><I>counter</I><code>}</code> will
the output: 3<SUP>rd</SUP>.
<P>
+<B>Note:</B> the <TT>memoir</TT> class also defines a command called
+<code>\ordinal</code> which takes a number as an argument instead of a
+counter. In order to overcome this incompatiblity, if you want
+to use the <TT>fmtcount</TT> package with the <TT>memoir</TT> class
+you should use <code>\FCordinal</code> to access <TT>fmtcount</TT>'s
+version of <code>\ordinal</code>, and use <code>\ordinal</code> to use
+<TT>memoir</TT>'s version of that command.
+
+<P>
The macro <code>\ordinalnum</code> is like <code>\ordinal</code>
but takes an actual number rather than a counter as the
argument. For example: <code>\ordinalnum{3}</code> will
@@ -301,7 +307,7 @@ limited multilingual support. The following languages are
implemented: English, Spanish, Portuguese, French, French (Swiss)
and French (Belgian). The package checks to see if the
command <code>\date</code><I>language</I> is defined<A NAME="tex2html4"
- HREF="#foot179"><SUP>1</SUP></A>, and will
+ HREF="#foot190"><SUP>1</SUP></A>, and will
load the code for those languages. The commands <code>\ordinal</code>,
<code>\ordinalstring</code> and <code>\numberstring</code> (and their
variants) will then be formatted in the currently
@@ -423,7 +429,7 @@ United Kingdom.
HREF="http://theoval.cmp.uea.ac.uk/~nlct/">http://theoval.cmp.uea.ac.uk/~nlct/</A></TT>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot179">... defined</A><A
+<DT><A NAME="foot190">... defined</A><A
HREF="manual.html#tex2html4"><SUP>1</SUP></A></DT>
<DD>this
will be true if you have loaded <TT>babel</TT>
@@ -432,8 +438,7 @@ will be true if you have loaded <TT>babel</TT>
</DL>
<BR><HR>
<ADDRESS>
-Dr Nicola L C Talbot
-2005-07-04
+<a href=http://theoval.cmp.uea.ac.uk/~nlct/>Nicola L. C. Talbot</a>. <a href=http://www.cmp.uea.ac.uk/>School of Computing Sciences</a>. <a href=http://www.uea.ac.uk/>University of East Anglia.</a> Last Modified: 2006-07-29
</ADDRESS>
</BODY>
</HTML>
diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx
index fe7f838d450..0c2b01910aa 100644
--- a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx
+++ b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx
@@ -1,5 +1,5 @@
%\iffalse
-% fmtcount.dtx generated using makedtx version 0.9b (c) Nicola Talbot
+% fmtcount.dtx generated using makedtx version 0.91b (c) Nicola Talbot
% Command line args:
% -macrocode ".*\.perl"
% -setambles ".*\.perl=>\nopreamble\nopostamble"
@@ -12,7 +12,7 @@
% -author "Nicola Talbot"
% -dir "source"
% fmtcount
-% Created on 2005/7/1 14:39
+% Created on 2006/7/29 14:54
%\fi
%\iffalse
%<*package>
@@ -35,7 +35,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2005 Nicola Talbot, all rights reserved.
+% Copyright (C) 2006 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -50,7 +50,7 @@
-\newcommand{\stynamefmt}[1]{\textsf{#1}}
+\newcommand{\styname}[1]{\textsf{#1}}\newcommand{\clsname}[1]{\textsf{#1}}
\begin{document}
\DocInput{fmtcount.dtx}
\end{document}
@@ -59,19 +59,19 @@
%
%\RecordChanges
%\OnlyDescription
-%\def\filedate{20 June 2005}
-%\def\fileversion{1.03}
+%\def\filedate{29 July 2006}
+%\def\fileversion{1.04}
%\def\filename{fmtcount.dtx}
-%\def\docdate{1 July 2005}
+%\def\docdate{29 July 2006}
%
% \title{fmtcount.sty v\fileversion: Displaying the Values of
%\LaTeX\ Counters}
-% \author{N.L.C. Talbot}
+% \author{Nicola L.C. Talbot}
% \date{\docdate}
% \maketitle
% \tableofcontents
% \section{Introduction}
-%The \stynamefmt{fmtcount} package provides commands to display
+%The \styname{fmtcount} package provides commands to display
%the values of \LaTeX\ counters in a variety of formats. It also
%provides equivalent commands for actual numbers rather than
%counter names. Limited multilingual support is available.
@@ -107,6 +107,14 @@
% For example, if the current section is 3, then \verb"\ordinal{section}" will produce
% the output: 3\textsuperscript{rd}.
%
+%\textbf{Note:} the \clsname{memoir} class also defines a command called
+%\verb"\ordinal" which takes a number as an argument instead of a
+%counter. In order to overcome this incompatiblity, if you want
+%to use the \styname{fmtcount} package with the \clsname{memoir} class
+%you should use \verb"\FCordinal" to access \styname{fmtcount}'s
+%version of \verb"\ordinal", and use \verb"\ordinal" to use
+%\clsname{memoir}'s version of that command.
+%
%\DescribeMacro{\ordinalnum}
%The macro \verb"\ordinalnum" is like \verb!\ordinal!
%but takes an actual number rather than a counter as the
@@ -279,12 +287,12 @@
%
%\section{Multilingual Support}
%
-%Version 1.02 of the \stynamefmt{fmtcount} package now has
+%Version 1.02 of the \styname{fmtcount} package now has
%limited multilingual support. The following languages are
%implemented: English, Spanish, Portuguese, French, French (Swiss)
%and French (Belgian). The package checks to see if the
%command \verb"\date"\meta{language} is defined\footnote{this
-%will be true if you have loaded \stynamefmt{babel}}, and will
+%will be true if you have loaded \styname{babel}}, and will
%load the code for those languages. The commands \verb"\ordinal",
%\verb"\ordinalstring" and \verb'\numberstring' (and their
%variants) will then be formatted in the currently
@@ -319,10 +327,10 @@
%
%You can save your preferred default settings to a file called
%\texttt{fmtcount.cfg}, and place it on the \TeX\ path. These
-%settings will then be loaded by the \stynamefmt{fmtcount}
+%settings will then be loaded by the \styname{fmtcount}
%package.
%
-%Note that if you are using the \stynamefmt{datetime} package,
+%Note that if you are using the \styname{datetime} package,
%the \texttt{datetime.cfg} configuration file will override
%the \texttt{fmtcount.cfg} configuration file.
%For example, if \texttt{datetime.cfg} has the line:
@@ -2979,7 +2987,7 @@ this number}%
% This section deals with the code for |fmtcount.sty|
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2005/06/20 v1.03]
+\ProvidesPackage{fmtcount}[2006/07/29 v1.04]
\RequirePackage{ifthen}
\RequirePackage{keyval}
% \end{macrocode}
@@ -3326,11 +3334,22 @@ or `user'}}}
% the cross-referencing stuff working, which is why
% the optional argument comes \emph{after} the compulsory
% argument, instead of the usual manner of placing it before.
+% Version 1.04 changed \verb"\ordinal" to \verb"\FCordinal"
+% to prevent it clashing with the memoir class.
% \begin{macrocode}
-\newcommand{\ordinal}[1]{%
+\newcommand{\FCordinal}[1]{%
\expandafter\protect\expandafter\ordinalnum{%
\expandafter\the\csname c@#1\endcsname}}
-
+% \end{macrocode}
+% If \verb"\ordinal" isn't defined make "\ordinal" a synonym
+% for \verb"\FCordinal" to maintain compatibility with previous
+% versions.
+% \begin{macrocode}
+\@ifundefined{ordinal}{\let\ordinal\FCordinal}{%
+\PackageWarning{fmtcount}{\string\ordinal
+\space already defined use \string\FCordinal \space instead.}}
+% \end{macrocode}
+% \begin{macrocode}
\newcommand{\ordinalnum}[1]{\@ifnextchar[{\@ordinalnum{#1}}{%
\@ordinalnum{#1}[m]}}
@@ -3338,8 +3357,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]{%
@@ -3656,6 +3675,10 @@ sub do_cmd_ordinalnum{
join('', $num, "\\fmtord${OP}$br_id${CP}$suffix${OP}$br_id${CP}", $_[0]);
}
+sub do_cmd_FCordinal{
+ &do_cmd_ordinal;
+}
+
sub do_cmd_ordinal{
local($ctr, $val, $id, $_) = &read_counter_value($_[0]);
local($gender)='m';
diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins b/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins
index c1ed2c10e64..52330ee2eff 100644
--- a/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins
+++ b/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins
@@ -1,8 +1,8 @@
-% fmtcount.ins generated using makedtx version 0.9b 2005/7/1 14:39
+% fmtcount.ins generated using makedtx version 0.91b 2006/7/29 14:54
\input docstrip
\preamble
-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-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]{%
diff --git a/Master/texmf-dist/tpm/fmtcount.tpm b/Master/texmf-dist/tpm/fmtcount.tpm
index 633e874cb68..86ce70d1124 100644
--- a/Master/texmf-dist/tpm/fmtcount.tpm
+++ b/Master/texmf-dist/tpm/fmtcount.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/fmtcount.zip">
<TPM:Name>fmtcount</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:53:28</TPM:Date>
+ <TPM:Date>2006/08/14 23:04:20</TPM:Date>
<TPM:Version>1.03 2005/06/20</TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>
@@ -22,7 +22,7 @@ support.
<TPM:Author></TPM:Author>
<TPM:Size>426593</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="78118">
+ <TPM:RunFiles size="78256">
texmf-dist/tex/latex/fmtcount/fc-english.def
texmf-dist/tex/latex/fmtcount/fc-french.def
texmf-dist/tex/latex/fmtcount/fc-portuges.def
@@ -30,17 +30,16 @@ texmf-dist/tex/latex/fmtcount/fc-spanish.def
texmf-dist/tex/latex/fmtcount/fmtcount.sty
texmf-dist/tpm/fmtcount.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="215088">
+ <TPM:DocFiles size="182498">
texmf-dist/doc/latex/fmtcount/CHANGES
texmf-dist/doc/latex/fmtcount/README
texmf-dist/doc/latex/fmtcount/fc-lang.tex
-texmf-dist/doc/latex/fmtcount/fc-samp.pdf
texmf-dist/doc/latex/fmtcount/fc-samp.tex
texmf-dist/doc/latex/fmtcount/fmtcount.pdf
texmf-dist/doc/latex/fmtcount/fmtcount.perl
texmf-dist/doc/latex/fmtcount/manual.html
</TPM:DocFiles>
- <TPM:SourceFiles size="133387">
+ <TPM:SourceFiles size="134380">
texmf-dist/source/latex/fmtcount/fmtcount.dtx
texmf-dist/source/latex/fmtcount/fmtcount.ins
</TPM:SourceFiles>
diff --git a/Master/texmf/lists/fmtcount b/Master/texmf/lists/fmtcount
index 5b8f62d2771..bd27b4b2a76 100644
--- a/Master/texmf/lists/fmtcount
+++ b/Master/texmf/lists/fmtcount
@@ -1,7 +1,6 @@
texmf-dist/doc/latex/fmtcount/CHANGES
texmf-dist/doc/latex/fmtcount/README
texmf-dist/doc/latex/fmtcount/fc-lang.tex
-texmf-dist/doc/latex/fmtcount/fc-samp.pdf
texmf-dist/doc/latex/fmtcount/fc-samp.tex
texmf-dist/doc/latex/fmtcount/fmtcount.pdf
texmf-dist/doc/latex/fmtcount/fmtcount.perl