fmtcount (25sep12)

git-svn-id: svn://tug.org/texlive/trunk@27805 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
index a7e513a5d27..4459215df96 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
@@ -7,7 +7,7 @@
 %% fmtcount.dtx  (with options: `fc-spanish.def,package')
 %% 
 %%  fmtcount.dtx
-%%  Copyright 2009 Nicola Talbot
+%%  Copyright 2012 Nicola Talbot
 %% 
 %%  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.
 %% 
-%%  This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fmtcount.sty, fc-british.def, fc-english.def, fc-french.def, fc-german.def, fc-italian.def, fc-portuges.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fmtcount.perl, fc-lang.tex, fc-samp.tex.
+%%  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.
 %% 
 %% \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
@@ -38,7 +38,17 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesFile{fc-spanish.def}[2007/05/26]
+%%\subsection{Prefixes}
+%%\label{sec:latin-prefixes}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstring}]
+%%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options}
+%%\end{definition}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
+%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
+%%\end{definition}
+\ProvidesFCLanguage{spanish}[2012/06/18]
 \newcommand{\@ordinalMspanish}[2]{%
 \edef#2{\number#1\relax\noexpand\fmtord{o}}}
 \newcommand{\@ordinalFspanish}[2]{%
@@ -75,7 +85,7 @@ cera%
 \newcommand{\@@tenstringspanish}[1]{%
 \ifcase#1\relax
 \or diez%
-\or viente%
+\or veinte%
 \or treinta%
 \or cuarenta%
 \or cincuenta%
@@ -181,7 +191,7 @@ Cera%
 \newcommand{\@@Tenstringspanish}[1]{%
 \ifcase#1\relax
 \or Diez%
-\or Viente%
+\or Veinte%
 \or Treinta%
 \or Cuarenta%
 \or Cincuenta%
@@ -272,7 +282,7 @@ Veinte%
 \let\@twentystring=\@@twentystringFspanish
 \let\@hundredstring=\@@hundredstringFspanish
 \def\@hundred{cien}\def\@thousand{mil}%
-\def\@andname{y}%
+\def\@andname{b}%
 \@@numberstringspanish{#1}{#2}}
 \let\@numberstringNspanish\@numberstringMspanish
 \DeclareRobustCommand{\@NumberstringMspanish}[2]{%
@@ -290,7 +300,7 @@ Veinte%
 \let\@tenstring=\@@Tenstringspanish
 \let\@twentystring=\@@TwentystringFspanish
 \let\@hundredstring=\@@HundredstringFspanish
-\def\@andname{y}%
+\def\@andname{b}%
 \def\@hundred{Cien}\def\@thousand{Mil}%
 \@@numberstringspanish{#1}{#2}}
 \let\@NumberstringNspanish\@NumberstringMspanish
@@ -540,7 +550,6 @@ D\'ecima%
 \or Octingent\'esima%
 \or Noningent\'esima%
 \fi}
-
 \newcommand{\@@numberstringspanish}[2]{%
 \ifnum#1>99999
 \PackageError{fmtcount}{Out of range}%
@@ -606,7 +615,7 @@ this number}%
 \ifnum#1>100\relax
   \ifnum\@strctr>0\relax
     \let\@@fc@numstr#2\relax
-    \edef#2{\@@fc@numstr\ \@andname\ }%
+    \edef#2{\@@fc@numstr\ }%
   \fi
 \fi
 \ifnum\@strctr>29\relax
@@ -733,6 +742,7 @@ this number}%
 \fi
 \fi
 }
+
 \endinput
 %%
 %% End of file `fc-spanish.def'.