From f3cb0ae064822186d468479c13b22ffe7b5c8f61 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 31 Mar 2013 14:04:13 +0000 Subject: [PATCH] fixed the sp form of Eng DetQuant in the presence of card and ord; the code could be simplified now --- lib/src/english/NounEng.gf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/english/NounEng.gf b/lib/src/english/NounEng.gf index 18332b5fd..28b9dfe8b 100644 --- a/lib/src/english/NounEng.gf +++ b/lib/src/english/NounEng.gf @@ -35,7 +35,7 @@ concrete NounEng of Noun = CatEng ** open MorphoEng, ResEng, Prelude in { s = quant.s ! num.hasCard ! num.n ++ num.s ! Nom; sp = \\c => case num.hasCard of { False => quant.sp ! num.hasCard ! num.n ! c ++ num.s ! Nom ; - True => quant.sp ! num.hasCard ! num.n ! npNom ++ num.s ! npcase2case c + True => quant.s ! num.hasCard ! num.n ++ num.s ! npcase2case c } ; n = num.n ; hasNum = num.hasCard @@ -43,7 +43,7 @@ concrete NounEng of Noun = CatEng ** open MorphoEng, ResEng, Prelude in { DetQuantOrd quant num ord = { s = quant.s ! num.hasCard ! num.n ++ num.s ! Nom ++ ord.s ! Nom; - sp = \\c => quant.sp ! num.hasCard ! num.n ! npNom ++ num.s ! Nom ++ ord.s ! npcase2case c ; + sp = \\c => quant.s ! num.hasCard ! num.n ++ num.s ! Nom ++ ord.s ! npcase2case c ; n = num.n ; hasNum = True } ;