From fe0903a2e1508d4946485ad1041817af6ccbacc4 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 21 Jun 2006 10:18:10 +0000 Subject: [PATCH] cien-ciento in spanish --- lib/resource-1.0/spanish/NumeralSpa.gf | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/resource-1.0/spanish/NumeralSpa.gf b/lib/resource-1.0/spanish/NumeralSpa.gf index 0ea55c1e2..33860683c 100644 --- a/lib/resource-1.0/spanish/NumeralSpa.gf +++ b/lib/resource-1.0/spanish/NumeralSpa.gf @@ -41,7 +41,8 @@ lin pot01 = {s =\\f,g => case of { => [] ; => "una" ; - => "ciento" ; + => "cien" ; + => "ciento" ; _ => uno ! f ! g } ; n = Pl @@ -56,9 +57,9 @@ lin pot1 d = spl (d.s ! tiotal) ; lin pot1plus d e = {s = \\g => d.s ! tiotal ! g ++ y_CardOrd g ++ e.s ! ental indip ! g ; n = Pl} ; lin pot1as2 n = n ; -lin pot2 d = spl (d.s ! hundra) ; +lin pot2 d = spl (d.s ! hundra False) ; lin pot2plus d e = - {s = \\g => d.s ! hundra ! g ++ e.s ! g ; n = Pl} ; + {s = \\g => d.s ! hundra True ! g ++ e.s ! g ; n = Pl} ; lin pot2as3 n = n ; lin pot3 n = spl (\\g => n.s ! NCard Masc ++ mil g) ; lin pot3plus n m = {s = \\g => n.s ! NCard Masc ++ mil g ++ m.s ! g ; n = Pl} ; @@ -73,9 +74,9 @@ oper => regCard ventesimo g n ; => venti ; => regCard ventesimo g n ; - => ducento ; - => Predef.tk 2 ducento + "as" ; - => regCard ducentesimo g n + => ducento ; + => Predef.tk 2 ducento + "as" ; + => regCard ducentesimo g n } } ; @@ -96,7 +97,7 @@ oper } ; param - DForm = ental Pred | ton | tiotal | hundra ; + DForm = ental Pred | ton | tiotal | hundra Bool ; Pred = pred | indip ; }