diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/CHANGES | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/README | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf | bin | 118989 -> 121492 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fmtcount/manual.html | 59 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx | 192 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/fmtcount/fmtcount.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-english.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-french.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 85 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/fmtcount.tpm | 8 |
14 files changed, 229 insertions, 146 deletions
diff --git a/Master/texmf-dist/doc/latex/fmtcount/CHANGES b/Master/texmf-dist/doc/latex/fmtcount/CHANGES index f27426baee1..412416bd5d7 100644 --- a/Master/texmf-dist/doc/latex/fmtcount/CHANGES +++ b/Master/texmf-dist/doc/latex/fmtcount/CHANGES @@ -1,5 +1,9 @@ fmtcount package versions: +Version 1.06: fixed language-related bug + +Version 1.05: fixed bug in \padzeroes + 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). diff --git a/Master/texmf-dist/doc/latex/fmtcount/README b/Master/texmf-dist/doc/latex/fmtcount/README index f51c9872974..bad070ef6f2 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.04 +LaTeX Package : fmtcount v 1.06 -Last Modified : 29 July 2006 +Last Modified : 6 January 2007 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 89ead352612..3600e0b5abd 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex index 7a07151851e..4c5a6e47f4e 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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 @@ -28,14 +28,15 @@ %% Right brace \} Tilde \~} \documentclass[a4paper]{article} -\usepackage[french]{babel} \usepackage{fmtcount} \newcounter{N} +\padzeroes[5] + \newcommand{\printrow}[1]{% \newline \setcounter{N}{#1} -\makebox[0.25in][r]{\theN\quad} +\makebox[0.75in][r]{\decimal{N}\quad} \makebox[0.75in][r]{\hexadecimal{N}\quad} \makebox[0.75in][r]{\ordinal{N}\quad} \makebox[2in][l]{\numberstring{N}} @@ -50,7 +51,7 @@ \begin{ttfamily} \noindent -\makebox[0.25in][c]{N} +\makebox[0.75in][c]{decimal} \makebox[0.75in][c]{hexadecimal} \makebox[0.75in][c]{ordinal} numberstring diff --git a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf Binary files differindex 8753cee4faa..8f4ba512f43 100644 --- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf +++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf diff --git a/Master/texmf-dist/doc/latex/fmtcount/manual.html b/Master/texmf-dist/doc/latex/fmtcount/manual.html index 3abde572230..d8ae7bd7712 100644 --- a/Master/texmf-dist/doc/latex/fmtcount/manual.html +++ b/Master/texmf-dist/doc/latex/fmtcount/manual.html @@ -1,19 +1,20 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<!--Converted with LaTeX2HTML 2002-2-1 (1.70) +<!--Converted with LaTeX2HTML 2002 (1.67) 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.04: Displaying the Values of LaTeX Counters</TITLE> -<META NAME="description" CONTENT="fmtcount.sty v1.04: Displaying the Values of LaTeX Counters"> +<TITLE>fmtcount.sty v1.06: Displaying the Values of LaTeX Counters</TITLE> +<META NAME="description" CONTENT="fmtcount.sty v1.06: 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="LaTeX2HTML v2002-2-1"> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> +<META NAME="Generator" CONTENT="LaTeX2HTML v2002"> <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> @@ -31,13 +32,10 @@ original version by: Nikos Drakos, CBLU, University of Leeds <P> - <H1 ALIGN="CENTER">fmtcount.sty v1.04: Displaying the Values of + <H1 ALIGN="CENTER">fmtcount.sty v1.06: Displaying the Values of LaTeX Counters</H1> -<DIV> - <P ALIGN="CENTER"><STRONG>Nicola L.C. Talbot</STRONG></P> -<P ALIGN="CENTER"><STRONG>29 July 2006</STRONG></P> -</DIV> +<P ALIGN="CENTER"><STRONG>6 January 2007</STRONG></P> <BR> <H2><A NAME="SECTION00010000000000000000"> @@ -46,24 +44,26 @@ Contents</A> <!--Table of Contents--> <UL> -<LI><A NAME="tex2html16" +<LI><A NAME="tex2html18" HREF="manual.html#SECTION00020000000000000000">Introduction</A> -<LI><A NAME="tex2html17" +<LI><A NAME="tex2html19" HREF="manual.html#SECTION00030000000000000000">Installation</A> -<LI><A NAME="tex2html18" +<LI><A NAME="tex2html20" HREF="manual.html#SECTION00040000000000000000">Available Commands</A> -<LI><A NAME="tex2html19" +<LI><A NAME="tex2html21" HREF="manual.html#SECTION00050000000000000000">Package Options</A> -<LI><A NAME="tex2html20" +<LI><A NAME="tex2html22" HREF="manual.html#SECTION00060000000000000000">Multilingual Support</A> -<LI><A NAME="tex2html21" +<LI><A NAME="tex2html23" HREF="manual.html#SECTION00070000000000000000">Configuration File fmtcount.cfg</A> -<LI><A NAME="tex2html22" +<LI><A NAME="tex2html24" HREF="manual.html#SECTION00080000000000000000">LaTeX2HTML style</A> -<LI><A NAME="tex2html23" +<LI><A NAME="tex2html25" HREF="manual.html#SECTION00090000000000000000">Acknowledgements</A> -<LI><A NAME="tex2html24" - HREF="manual.html#SECTION000100000000000000000">Contact Details</A> +<LI><A NAME="tex2html26" + HREF="manual.html#SECTION000100000000000000000">Troubleshooting</A> +<LI><A NAME="tex2html27" + HREF="manual.html#SECTION000110000000000000000">Contact Details</A> </UL> <!--End of Table of Contents--> <H1><A NAME="SECTION00020000000000000000"> @@ -307,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="#foot190"><SUP>1</SUP></A>, and will + HREF="#foot192"><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 @@ -414,6 +414,16 @@ support and my Spanish dictionary for the Spanish support. <P> <H1><A NAME="SECTION000100000000000000000"> +Troubleshooting</A> +</H1> + +<P> +There is a FAQ available at: <TT><A NAME="tex2html5" + HREF="http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/">http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/</A></TT>. + +<P> + +<H1><A NAME="SECTION000110000000000000000"> Contact Details</A> </H1> Dr Nicola Talbot @@ -425,11 +435,11 @@ University of East Anglia Norwich. NR4 7TJ. <BR> United Kingdom. -<BR> <TT><A NAME="tex2html5" +<BR> <TT><A NAME="tex2html6" 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="foot190">... defined</A><A +<DT><A NAME="foot192">... defined</A><A HREF="manual.html#tex2html4"><SUP>1</SUP></A></DT> <DD>this will be true if you have loaded <TT>babel</TT> @@ -438,7 +448,10 @@ will be true if you have loaded <TT>babel</TT> </DL> <BR><HR> <ADDRESS> -<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 +<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: 2007-01-06 </ADDRESS> </BODY> </HTML> diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx index 0c2b01910aa..ba813b38d30 100644 --- a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx +++ b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx @@ -12,7 +12,7 @@ % -author "Nicola Talbot" % -dir "source" % fmtcount -% Created on 2006/7/29 14:54 +% Created on 2007/1/6 16:52 %\fi %\iffalse %<*package> @@ -35,7 +35,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2006 Nicola Talbot, all rights reserved. +% Copyright (C) 2007 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -59,10 +59,10 @@ % %\RecordChanges %\OnlyDescription -%\def\filedate{29 July 2006} -%\def\fileversion{1.04} +%\def\filedate{6 January 2007} +%\def\fileversion{1.06} %\def\filename{fmtcount.dtx} -%\def\docdate{29 July 2006} +%\def\docdate{6 January 2007} % % \title{fmtcount.sty v\fileversion: Displaying the Values of %\LaTeX\ Counters} @@ -370,6 +370,10 @@ %I would like to thank my mother for the French and Portuguese %support and my Spanish dictionary for the Spanish support. % +%\section{Troubleshooting} +% +%There is a FAQ available at: \url{http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/}. +% % \section{Contact Details} % Dr Nicola Talbot\\ % School of Computing Sciences\\ @@ -381,9 +385,11 @@ % %\StopEventually{} %\section{The Code} +%\iffalse % \begin{macrocode} %<*fc-english.def> % \end{macrocode} +%\fi % English definitions % \begin{macrocode} \ProvidesFile{fc-english}[2005/04/29] @@ -775,12 +781,16 @@ this number}% \let\@OrdinalstringFenglish=\@OrdinalstringMenglish % \end{macrocode} +%\iffalse % \begin{macrocode} %</fc-english.def> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fc-french.def> % \end{macrocode} +%\fi % French % \begin{macrocode} \ProvidesFile{fc-french.def}[2005/04/29] @@ -1724,12 +1734,16 @@ this number}% \fi } % \end{macrocode} +%\iffalse % \begin{macrocode} %</fc-french.def> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fc-portuges.def> % \end{macrocode} +%\fi % Portuguse % \begin{macrocode} \ProvidesFile{fc-portuges.def}[2005/04/29] @@ -2291,12 +2305,16 @@ this number}% \fi } % \end{macrocode} +%\iffalse % \begin{macrocode} %</fc-portuges.def> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fc-spanish.def> % \end{macrocode} +%\fi % Spanish % \begin{macrocode} \ProvidesFile{fc-spanish.def}[2005/04/29] @@ -2977,25 +2995,35 @@ this number}% \fi } % \end{macrocode} +%\iffalse % \begin{macrocode} %</fc-spanish.def> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fmtcount.sty> % \end{macrocode} +%\fi %\subsection{fmtcount.sty} % This section deals with the code for |fmtcount.sty| % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2006/07/29 v1.04] +\ProvidesPackage{fmtcount}[2007/01/06 v1.06] \RequirePackage{ifthen} \RequirePackage{keyval} % \end{macrocode} % These commands need to be defined before the % configuration file is loaded. +% +% Define the macro to format the |st|, |nd|, |rd| or |th| of an +% ordinal. % \begin{macrocode} \providecommand{\fmtord}[1]{\textsuperscript{#1}} - +% \end{macrocode} +% Define |\padzeroes| to specify how many digits should be +% displayed. +% \begin{macrocode} \newcount\c@padzeroesN \c@padzeroesN=1\relax \providecommand{\padzeroes}[1][17]{\c@padzeroesN=#1} @@ -3010,7 +3038,8 @@ this number}% \@ifundefined{dateportuges}{}{\input{fc-portuges.def}} \@ifundefined{datefrench}{}{\input{fc-french.def}} % \end{macrocode} -%Provide Command to switch dialects (Does babel store +% Define keys for use with |\fmtcountsetoptions|. +% Key to switch French dialects (Does babel store %this kind of information?) % \begin{macrocode} \def\fmtcount@french{france} @@ -3026,7 +3055,9 @@ to load babel before loading fmtcount}}{ {Option `french' can only take the values `france', `belgian' or `swiss'}} }} - +% \end{macrocode} +% Key to determine how to display the ordinal +% \begin{macrocode} \define@key{fmtcount}{fmtord}{% \ifthenelse{\equal{#1}{level} \or\equal{#1}{raise} @@ -3035,7 +3066,10 @@ to load babel before loading fmtcount}}{ \PackageError{fmtcount}{Invalid value `#1' to fmtord key} {Option `fmtord' can only take the values `level', `raise' or `user'}}} - +% \end{macrocode} +% Key to determine whether the ordinal should be abbreviated +% (language dependent, currently only affects French ordinals.) +% \begin{macrocode} \newif\iffmtord@abbrv \fmtord@abbrvfalse \define@key{fmtcount}{abbrv}[true]{% @@ -3044,19 +3078,29 @@ or `user'}}} \PackageError{fmtcount}{Invalid value `#1' to fmtord key} {Option `fmtord' can only take the values `true' or `false'}}} - +% \end{macrocode} +% Define command to set options. +% \begin{macrocode} \newcommand{\fmtcountsetoptions}[1]{% \def\fmtcount@fmtord{}% \setkeys{fmtcount}{#1}% \@ifundefined{datefrench}{}{% -\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}% +\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}}{% @@ -3080,12 +3124,14 @@ or `user'}}} \def\fmtord#1{#1}} \DeclareOption{raise}{\def\fmtcount@fmtord{raise}% \def\fmtord#1{\textsuperscript{#1}}} - +% \end{macrocode} +% Process package options +% \begin{macrocode} \ProcessOptions - % \end{macrocode} % Define macro that performs modulo arthmetic. This is used for the -% date, time, ordinal and numberstring commands. +% date, time, ordinal and numberstring commands. (The fmtcount +% package was originally part of the datetime package.) % \begin{macrocode} \newcount\@DT@modctr \def\@modulo#1#2{% @@ -3094,7 +3140,6 @@ or `user'}}} \multiply \@DT@modctr by #2\relax \advance #1 by -\@DT@modctr} % \end{macrocode} -% Define the macro to format the |st|, |nd|, |rd| or |th| of an ordinal. % The following registers are needed by |\@ordinal| etc % \begin{macrocode} \newcount\@ordinalctr @@ -3103,10 +3148,14 @@ or `user'}}} \newcount\@tmpstrctr % \end{macrocode} %Define commands that display numbers in different bases. +% Define counters and conditionals needed. % \begin{macrocode} \newif\if@DT@padzeroes \newcount\@DT@loopN \newcount\@DT@X +% \end{macrocode} +% Binary +% \begin{macrocode} \newcommand{\@binary}[1]{% \@DT@padzeroestrue \@DT@loopN=17\relax @@ -3129,7 +3178,7 @@ or `user'}}} \let\binarynum=\@binary % \end{macrocode} -% +% Octal % \begin{macrocode} \newcommand{\@octal}[1]{% \ifnum#1>32768 @@ -3156,7 +3205,7 @@ or `user'}}} \fi} \let\octalnum=\@octal % \end{macrocode} -% +% Lowercase hexadecimal % \begin{macrocode} \newcommand{\@@hexadecimal}[1]{\ifcase#10\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi} @@ -3181,8 +3230,11 @@ or `user'}}} \@@hexadecimal\@DT@X} \let\hexadecimalnum=\@hexadecimal - -\newcommand{\@@Hexadecimal}[1]{\ifcase#10\or1\or2\or3\or4\or5\or6\or7\or8\or9\or A\or B\or C\or D\or E\or F\fi} +% \begin{macrocode} +% Uppercase hexadecimal +% \end{macrocode} +\newcommand{\@@Hexadecimal}[1]{\ifcase#10\or1\or2\or3\or4\or5\or6\or +7\or8\or9\or A\or B\or C\or D\or E\or F\fi} \newcommand{\@Hexadecimal}[1]{% \@DT@padzeroestrue @@ -3206,7 +3258,7 @@ or `user'}}} \let\Hexadecimalnum=\@Hexadecimal % \end{macrocode} -% +% Uppercase alphabetical representation (a \ldots\ z aa \ldots\ zz) % \begin{macrocode} \newcommand{\@aaalph}[1]{% \@DT@loopN=#1\relax @@ -3227,7 +3279,9 @@ or `user'}}} } \let\aaalphnum=\@aaalph - +% \end{macrocode} +% Uppercase alphabetical representation (a \ldots\ z aa \ldots\ zz) +% \begin{macrocode} \newcommand{\@AAAlph}[1]{% \@DT@loopN=#1\relax \advance\@DT@loopN by -1\relax @@ -3248,7 +3302,7 @@ or `user'}}} \let\AAAlphnum=\@AAAlph % \end{macrocode} -% +% Lowercase alphabetical representation % \begin{macrocode} \newcommand{\@abalph}[1]{% \ifnum#1>17576 @@ -3273,7 +3327,9 @@ or `user'}}} \fi} \let\abalphnum=\@abalph - +% \end{macrocode} +% Uppercase alphabetical representation +% \begin{macrocode} \newcommand{\@ABAlph}[1]{% \ifnum#1>17576 \PackageError{fmtcount}{Value of counter too large for \protect\@ABAlph}{Maximum value 17576} @@ -3297,30 +3353,30 @@ or `user'}}} \fi} \let\ABAlphnum=\@ABAlph - -\newcommand{\@decimal}[1]{% -\ifnum#1>10000 -\PackageError{fmtcount}{Value of counter too large for \protect\@decimal}{Maximum value 10000}\number#1\relax +% \end{macrocode} +% Recursive command to count number of characters in argument. +% |\@strctr| should be set to zero before calling it. +% \begin{macrocode} +\def\@fmtc@count#1#2\relax{% +\if\relax#1 \else -\@DT@padzeroestrue -\@DT@loopN=6\relax -\@strctr=\@DT@loopN -\whiledo{\(\@strctr<\c@padzeroesN\) \TE@or \(\@strctr=\c@padzeroesN\)}{0\advance\@strctr by 1}% -\@strctr=10000\relax -\@DT@X=#1\relax -\loop -\@DT@modctr=\@DT@X -\divide\@DT@modctr by \@strctr -\ifthenelse{\boolean{@DT@padzeroes} \and \(\@DT@modctr=0\) \and \(\@DT@loopN>\c@padzeroesN\)}{}{\the\@DT@modctr}% -\ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi -\multiply\@DT@modctr by \@strctr -\advance\@DT@X by -\@DT@modctr -\divide\@strctr by 10\relax -\advance\@DT@loopN by -1\relax -\ifnum\@strctr>1 -\repeat -\the\@DT@X +\advance\@strctr by 1\relax +\@fmtc@count#2\relax \fi} +% \end{macrocode} +% Internal decimal macro: +% \begin{macrocode} +\newcommand{\@decimal}[1]{% +\@strctr=0\relax +\expandafter\@fmtc@count\number#1\relax +\@DT@loopN=\c@padzeroesN +\advance\@DT@loopN by -\@strctr +\ifnum\@DT@loopN>0\relax +\@strctr=0\relax +\whiledo{\@strctr < \@DT@loopN}{0\advance\@strctr by 1}% +\fi +\number#1\relax +} \let\decimalnum=\@decimal % \end{macrocode} @@ -3449,9 +3505,8 @@ Available options are m or f}}% \def\@ordinalM{\@ordinalMenglish} \let\@ordinalF=\@ordinalM} -\@ifundefined{languagename}{% -\@setdef@ultfmtcount}{ -\ifthenelse{\equal{\languagename}{nohyphenation}}{\@setdef@ultfmtcount}{ +\@ifpackageloaded{babel}{ +\ifthenelse{\equal{\languagename}{nohyphenation}\or\equal{languagename}{english}}{\@setdef@ultfmtcount}{ \def\@numberstringM{\@ifundefined{@numberstringM\languagename}{% \PackageError{fmtcount}{No support for language '\languagename'}{% The fmtcount package currently does not support language @@ -3511,7 +3566,8 @@ The fmtcount package currently does not support language The fmtcount package currently does not support language '\languagename' for command \string\@OrdinalstringF}}{% \csname @OrdinalstringF\languagename\endcsname}} -}} +}}{% +\@setdef@ultfmtcount} % \end{macrocode} % Backwards compatibility: % \begin{macrocode} @@ -3521,12 +3577,16 @@ The fmtcount package currently does not support language \let\@numberstring=\@numberstringM \let\@Numberstring=\@NumberstringM % \end{macrocode} +%\iffalse % \begin{macrocode} %</fmtcount.sty> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fmtcount.perl> % \end{macrocode} +%\fi % \begin{macrocode} # File : fmtcount.perl # Author : Nicola Talbot @@ -5323,22 +5383,28 @@ sub load_fmtcount_cfg{ 1; % \end{macrocode} +%\iffalse % \begin{macrocode} %</fmtcount.perl> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fc-samp.tex> % \end{macrocode} +%\fi \documentclass[a4paper]{article} -\usepackage[french]{babel} +%\usepackage[french]{babel} \usepackage{fmtcount} \newcounter{N} +\padzeroes[5] + \newcommand{\printrow}[1]{% \newline \setcounter{N}{#1} -\makebox[0.25in][r]{\theN\quad} +\makebox[0.75in][r]{\decimal{N}\quad} \makebox[0.75in][r]{\hexadecimal{N}\quad} \makebox[0.75in][r]{\ordinal{N}\quad} \makebox[2in][l]{\numberstring{N}} @@ -5353,7 +5419,7 @@ sub load_fmtcount_cfg{ \begin{ttfamily} \noindent -\makebox[0.25in][c]{N} +\makebox[0.75in][c]{decimal} \makebox[0.75in][c]{hexadecimal} \makebox[0.75in][c]{ordinal} numberstring @@ -5425,12 +5491,16 @@ Passing numbers explicitly: \ordinalnum{10}, \Numberstringnum{10}, \Ordinalstringnum{10}. \end{document} +%\iffalse % \begin{macrocode} %</fc-samp.tex> % \end{macrocode} +%\fi +%\iffalse % \begin{macrocode} %<*fc-lang.tex> % \end{macrocode} +%\fi % This is an interactive script. Run it through \LaTeX % and enter appropriate responses. @@ -5638,8 +5708,10 @@ Current language: French (Belgium). \end{ttfamily} \end{document} +%\iffalse % \begin{macrocode} %</fc-lang.tex> % \end{macrocode} +%\fi %\Finale \endinput diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins b/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins index 52330ee2eff..736dd9f169f 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.91b 2006/7/29 14:54 +% fmtcount.ins generated using makedtx version 0.91b 2007/1/6 16:52 \input docstrip \preamble -Copyright (C) 2006 Nicola Talbot, all rights reserved. +Copyright (C) 2007 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 d1b953c4fa3..4ee468d0dc5 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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 3d54bafe259..f3a10c8fd81 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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 6802ca59ebb..8a18ff3a74d 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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 2510d34d83a..b0315393ae2 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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 8bca3804618..9ca97952fb5 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) 2006 Nicola Talbot, all rights reserved. +%% Copyright (C) 2007 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,11 +27,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2006/07/29 v1.04] +\ProvidesPackage{fmtcount}[2007/01/06 v1.06] \RequirePackage{ifthen} \RequirePackage{keyval} \providecommand{\fmtord}[1]{\textsuperscript{#1}} - \newcount\c@padzeroesN \c@padzeroesN=1\relax \providecommand{\padzeroes}[1][17]{\c@padzeroesN=#1} @@ -52,7 +51,6 @@ to load babel before loading fmtcount}}{ {Option `french' can only take the values `france', `belgian' or `swiss'}} }} - \define@key{fmtcount}{fmtord}{% \ifthenelse{\equal{#1}{level} \or\equal{#1}{raise} @@ -61,7 +59,6 @@ to load babel before loading fmtcount}}{ \PackageError{fmtcount}{Invalid value `#1' to fmtord key} {Option `fmtord' can only take the values `level', `raise' or `user'}}} - \newif\iffmtord@abbrv \fmtord@abbrvfalse \define@key{fmtcount}{abbrv}[true]{% @@ -70,19 +67,26 @@ or `user'}}} \PackageError{fmtcount}{Invalid value `#1' to fmtord key} {Option `fmtord' can only take the values `true' or `false'}}} - \newcommand{\fmtcountsetoptions}[1]{% \def\fmtcount@fmtord{}% \setkeys{fmtcount}{#1}% \@ifundefined{datefrench}{}{% -\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}% +\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}}{% @@ -97,9 +101,7 @@ or `user'}}} \def\fmtord#1{#1}} \DeclareOption{raise}{\def\fmtcount@fmtord{raise}% \def\fmtord#1{\textsuperscript{#1}}} - \ProcessOptions - \newcount\@DT@modctr \def\@modulo#1#2{% \@DT@modctr=#1\relax @@ -181,8 +183,8 @@ or `user'}}} \@@hexadecimal\@DT@X} \let\hexadecimalnum=\@hexadecimal - -\newcommand{\@@Hexadecimal}[1]{\ifcase#10\or1\or2\or3\or4\or5\or6\or7\or8\or9\or A\or B\or C\or D\or E\or F\fi} +\newcommand{\@@Hexadecimal}[1]{\ifcase#10\or1\or2\or3\or4\or5\or6\or +7\or8\or9\or A\or B\or C\or D\or E\or F\fi} \newcommand{\@Hexadecimal}[1]{% \@DT@padzeroestrue @@ -224,7 +226,6 @@ or `user'}}} } \let\aaalphnum=\@aaalph - \newcommand{\@AAAlph}[1]{% \@DT@loopN=#1\relax \advance\@DT@loopN by -1\relax @@ -267,7 +268,6 @@ or `user'}}} \fi} \let\abalphnum=\@abalph - \newcommand{\@ABAlph}[1]{% \ifnum#1>17576 \PackageError{fmtcount}{Value of counter too large for \protect\@ABAlph}{Maximum value 17576} @@ -291,30 +291,23 @@ or `user'}}} \fi} \let\ABAlphnum=\@ABAlph - -\newcommand{\@decimal}[1]{% -\ifnum#1>10000 -\PackageError{fmtcount}{Value of counter too large for \protect\@decimal}{Maximum value 10000}\number#1\relax +\def\@fmtc@count#1#2\relax{% +\if\relax#1 \else -\@DT@padzeroestrue -\@DT@loopN=6\relax -\@strctr=\@DT@loopN -\whiledo{\(\@strctr<\c@padzeroesN\) \TE@or \(\@strctr=\c@padzeroesN\)}{0\advance\@strctr by 1}% -\@strctr=10000\relax -\@DT@X=#1\relax -\loop -\@DT@modctr=\@DT@X -\divide\@DT@modctr by \@strctr -\ifthenelse{\boolean{@DT@padzeroes} \and \(\@DT@modctr=0\) \and \(\@DT@loopN>\c@padzeroesN\)}{}{\the\@DT@modctr}% -\ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi -\multiply\@DT@modctr by \@strctr -\advance\@DT@X by -\@DT@modctr -\divide\@strctr by 10\relax -\advance\@DT@loopN by -1\relax -\ifnum\@strctr>1 -\repeat -\the\@DT@X +\advance\@strctr by 1\relax +\@fmtc@count#2\relax \fi} +\newcommand{\@decimal}[1]{% +\@strctr=0\relax +\expandafter\@fmtc@count\number#1\relax +\@DT@loopN=\c@padzeroesN +\advance\@DT@loopN by -\@strctr +\ifnum\@DT@loopN>0\relax +\@strctr=0\relax +\whiledo{\@strctr < \@DT@loopN}{0\advance\@strctr by 1}% +\fi +\number#1\relax +} \let\decimalnum=\@decimal \newcommand{\FCordinal}[1]{% @@ -416,9 +409,8 @@ Available options are m or f}}% \def\@ordinalM{\@ordinalMenglish} \let\@ordinalF=\@ordinalM} -\@ifundefined{languagename}{% -\@setdef@ultfmtcount}{ -\ifthenelse{\equal{\languagename}{nohyphenation}}{\@setdef@ultfmtcount}{ +\@ifpackageloaded{babel}{ +\ifthenelse{\equal{\languagename}{nohyphenation}\or\equal{languagename}{english}}{\@setdef@ultfmtcount}{ \def\@numberstringM{\@ifundefined{@numberstringM\languagename}{% \PackageError{fmtcount}{No support for language '\languagename'}{% The fmtcount package currently does not support language @@ -478,7 +470,8 @@ The fmtcount package currently does not support language The fmtcount package currently does not support language '\languagename' for command \string\@OrdinalstringF}}{% \csname @OrdinalstringF\languagename\endcsname}} -}} +}}{% +\@setdef@ultfmtcount} \let\@ordinal=\@ordinalM \let\@ordinalstring=\@ordinalstringM \let\@Ordinalstring=\@OrdinalstringM diff --git a/Master/texmf-dist/tpm/fmtcount.tpm b/Master/texmf-dist/tpm/fmtcount.tpm index ef95dea5528..b029062d9b1 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/08/14 23:05:07</TPM:Date> + <TPM:Date>2007/01/09 01:36:37</TPM:Date> <TPM:Version>1.03 2005/06/20</TPM:Version> <TPM:Creator>karl</TPM:Creator> <TPM:Title> @@ -23,7 +23,7 @@ support. <TPM:Size>395124</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="78246"> + <TPM:RunFiles size="77907"> texmf-dist/tex/latex/fmtcount/fc-english.def texmf-dist/tex/latex/fmtcount/fc-french.def texmf-dist/tex/latex/fmtcount/fc-portuges.def @@ -31,7 +31,7 @@ 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="182498"> + <TPM:DocFiles size="185498"> texmf-dist/doc/latex/fmtcount/CHANGES texmf-dist/doc/latex/fmtcount/README texmf-dist/doc/latex/fmtcount/fc-lang.tex @@ -40,7 +40,7 @@ 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="134380"> + <TPM:SourceFiles size="135801"> texmf-dist/source/latex/fmtcount/fmtcount.dtx texmf-dist/source/latex/fmtcount/fmtcount.ins </TPM:SourceFiles> |