From dcd634f92eec92ff4b45030642000d6be838340a Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 18 Sep 2015 06:15:31 +0000 Subject: [PATCH] fixes in Dut Ita Spa numeral "one" --- lib/src/dutch/NumeralDut.gf | 2 +- lib/src/italian/NumeralIta.gf | 8 ++++---- lib/src/spanish/NumeralSpa.gf | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/src/dutch/NumeralDut.gf b/lib/src/dutch/NumeralDut.gf index 9c7869fe4..31d1d8091 100644 --- a/lib/src/dutch/NumeralDut.gf +++ b/lib/src/dutch/NumeralDut.gf @@ -23,7 +23,7 @@ lin pot01 = { s = \\f => table { - NCard g _ => "een" ; ---- "één" ; + NCard g _ => "één" ; --- een NOrd af => (regAdjective "eerst").s ! Posit ! af } ; n = Sg ; diff --git a/lib/src/italian/NumeralIta.gf b/lib/src/italian/NumeralIta.gf index a0fcf7246..c0bb4c70f 100644 --- a/lib/src/italian/NumeralIta.gf +++ b/lib/src/italian/NumeralIta.gf @@ -1,5 +1,5 @@ concrete NumeralIta of Numeral = CatIta [Numeral,Digits] ** - open CommonRomance, ResRomance, MorphoIta, Prelude in { + open CommonRomance, ResRomance, MorphoIta, PhonoIta, Prelude in { lincat Digit = {s : DForm => CardOrd => Str ; isContr : Bool} ; @@ -32,9 +32,9 @@ lin pot01 = {s =\\f,g => case f of { ental t => case t of {pred => case g of { - NCard Fem => "una" ; - _ => uno ! f ! g - }; + NCard Fem => elision "una" "un'" "una" ; + _ => pre {"un" ; "uno" / sImpuro} + } ; indip => case g of { NCard _ => [] ; _ => uno ! f ! g diff --git a/lib/src/spanish/NumeralSpa.gf b/lib/src/spanish/NumeralSpa.gf index 894f3cfe9..84cd34d88 100644 --- a/lib/src/spanish/NumeralSpa.gf +++ b/lib/src/spanish/NumeralSpa.gf @@ -41,6 +41,7 @@ lin pot01 = "décimo" "centésimo").s in {s =\\f,g => case of { => [] ; + => "un" ; => "una" ; => "cien" ; => "ciento" ;