From f67420007952142cac26a93fe8ef653565a2f248 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 30 May 2012 12:07:32 +0000 Subject: [PATCH] the substantival form of every and some other Det's in English --- lib/src/english/DictEng.gf | 2 +- lib/src/english/MorphoEng.gf | 9 ++++++--- lib/src/english/StructuralEng.gf | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index bb82f349e..45600cc40 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -12512,7 +12512,7 @@ lin evergreen_A = compoundA (mkA "evergreen"); lin evergreen_N = mkN "evergreen" "evergreens"; lin everlasting_A = compoundA (mkA "everlasting"); lin evermore_Adv = mkAdv "evermore"; -lin every_Det = mkDeterminer singular "every"; +lin every_Det = mkDeterminerSpec singular "every" "everyone" False ; lin everybody_NP = regNP "everybody" singular ; lin everyday_A = compoundA (mkA "everyday"); lin everyone_NP = regNP "everyone" singular; diff --git a/lib/src/english/MorphoEng.gf b/lib/src/english/MorphoEng.gf index 9d0bcfe14..194a9e9a0 100644 --- a/lib/src/english/MorphoEng.gf +++ b/lib/src/english/MorphoEng.gf @@ -17,11 +17,14 @@ resource MorphoEng = open Prelude, (Predef=Predef), ResEng in { oper mkDeterminer : Number -> Str -> - {s : Str ; sp : NPCase => Str; n : Number ; hasNum : Bool} = \n,s -> + {s : Str ; sp : NPCase => Str; n : Number ; hasNum : Bool} = \n,s -> mkDeterminerSpec n s s False ; --- was True!? + + mkDeterminerSpec : Number -> Str -> Str -> Bool -> + {s : Str ; sp : NPCase => Str; n : Number ; hasNum : Bool} = \n,s,sp,hasNum -> {s = s; - sp = \\c => regGenitiveS s ! npcase2case c ; + sp = \\c => regGenitiveS sp ! npcase2case c ; n = n ; - hasNum = True ; -- doesn't matter since s = sp + hasNum = hasNum ; --- doesn't matter when s = sp } ; --2 Pronouns diff --git a/lib/src/english/StructuralEng.gf b/lib/src/english/StructuralEng.gf index d56c64ef4..a5edcd401 100644 --- a/lib/src/english/StructuralEng.gf +++ b/lib/src/english/StructuralEng.gf @@ -36,7 +36,7 @@ concrete StructuralEng of Structural = CatEng ** during_Prep = mkPrep "during" ; either7or_DConj = mkConj "either" "or" singular ; everybody_NP = regNP "everybody" singular ; - every_Det = mkDeterminer singular "every" ; + every_Det = mkDeterminerSpec singular "every" "everyone" False ; everything_NP = regNP "everything" singular ; everywhere_Adv = mkAdv "everywhere" ; few_Det = mkDeterminer plural "few" ;