From fcb5b173f7aa8290eac92f36512c1ff0f2f0c369 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 1 Nov 2013 13:49:21 +0000 Subject: [PATCH] changed whichSg/Pl_IDet to which_IQuant in DictEngAbs and Eng, Fin, Swe, Chi implementations --- lib/src/chinese/DictEngChi.gf | 4 +--- lib/src/chinese/StructuralChi.gf | 2 +- lib/src/english/DictEng.gf | 3 +-- lib/src/english/DictEngAbs.gf | 3 +-- lib/src/finnish/DictEngFin.gf | 4 +--- lib/src/swedish/DictEngSwe.gf | 3 +-- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/src/chinese/DictEngChi.gf b/lib/src/chinese/DictEngChi.gf index 6edb942ab..0ef3cc8cc 100644 --- a/lib/src/chinese/DictEngChi.gf +++ b/lib/src/chinese/DictEngChi.gf @@ -97,8 +97,7 @@ lin when_IAdv = S.when_IAdv ; --CHECKED when_Subj = S.when_Subj ; --CHECKED where_IAdv = S.where_IAdv ; --CHECKED - whichPl_IDet = S.whichPl_IDet ; --CHECKED - whichSg_IDet = S.whichSg_IDet ; --CHECKED + which_IQuant = S.which_IQuant ; --CHECKED whoPl_IP = S.whoPl_IP ; --CHECKED whoSg_IP = S.whoSg_IP ; --CHECKED why_IAdv = S.why_IAdv ; --CHECKED @@ -5712,7 +5711,6 @@ antagonize_V2 = mkV2 "对抗" ; -- 3 affirm_V2 = mkV2 "肯定" ; -- 3 accede_V = mkV "加入" ; -- 3 working_class_A = mkA "工人阶级" ; -- 2 -whichSg_IDet = mkIDet "哪一个" ; -- 2 wash_V = mkV "洗" ; -- 2 violet_N = mkN "紫色" [] ; -- 2 vantage_N = mkN "优势" ; -- 2 diff --git a/lib/src/chinese/StructuralChi.gf b/lib/src/chinese/StructuralChi.gf index 609b43171..d2a66f727 100644 --- a/lib/src/chinese/StructuralChi.gf +++ b/lib/src/chinese/StructuralChi.gf @@ -171,7 +171,7 @@ there7from_Adv = mkAdv "从那里" ; -- from there there7to_Adv = mkAdv "到那里" ; therefore_PConj = ssword "因此" ; through_Prep = mkPrep "通过" ; -which_IQuant = mkIQuant "哪" ; +which_IQuant = mkIQuant "哪" ; -- --which_IQuant = ssword [] ; -- [mark] in sent, it depends on the context without_Prep = mkPrep "没有" [] mannerAdvType ; youPol_Pron = ssword "您" ; -- polite you diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 417fb8914..083a3be79 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -60981,8 +60981,7 @@ lin whet_V2 = mkV2 (mkV "whet" "whets" "whetted" "whetted" "whetting"); lin whether_Prep = mkPrep "whether"; lin whetstone_N = mkN "whetstone" "whetstones"; lin whey_N = mkN "whey" ; -lin whichPl_IDet = mkDeterminer plural "which"; -lin whichSg_IDet = mkDeterminer singular "which"; +lin which_IQuant = {s = \\_ => "which"} ; lin whichever_A = compoundA (mkA "whichever"); lin whichsoever_A = compoundA (mkA "whichsoever"); lin whiff_N = mkN "whiff" "whiffs"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index bc181ddf5..ee0a8361e 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -60896,8 +60896,7 @@ fun whet_V2 : V2; fun whether_Prep : Prep ; fun whetstone_N : N; fun whey_N : N; -fun whichPl_IDet : IDet; -fun whichSg_IDet : IDet; +fun which_IQuant : IQuant ; fun whichever_A : A; fun whichsoever_A : A; fun whiff_N : N; diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 8988dd885..de1d063f2 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -52198,8 +52198,7 @@ zymotic_A = mkWA "tsymoosiin" "liittyvä" ; when_IAdv = S.when_IAdv ; --CHECKED when_Subj = S.when_Subj ; --CHECKED where_IAdv = S.where_IAdv ; --CHECKED - whichPl_IDet = S.whichPl_IDet ; --CHECKED - whichSg_IDet = S.whichSg_IDet ; --CHECKED + which_IQuant = S.which_IQuant ; -- comment=CHECKED whoPl_IP = S.whoPl_IP ; --CHECKED whoSg_IP = S.whoSg_IP ; --CHECKED why_IAdv = S.why_IAdv ; --CHECKED @@ -54282,7 +54281,6 @@ beside_Prep = mkPrep "vieressä" ; --CHECKED aesthetic_A = mkA "esteettinen" ; --CHECKED see_V2V = mkV2V nahda_V (mkPrep genitive) infPresPart ; --CHECKED -whichSg_IDet = {s = S.mikaInt ! Sg ; n = Sg ; isNum = False} ; --CHECKED ---- why needed? -- whole Penn: down to 100 occurrences checked diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index ed0df7fbf..890facc81 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -23973,8 +23973,7 @@ lin whet_V2 = mkV2 (slipa_vb_1_V) | mkV2 (mkV "skärpa") | mkV2 (fila_vb_1_V) ; lin whether_Prep = mkPrep "huruvida" ; -- lin whetstone_N = bryne_nn_1_N ; -- comment=2 lin whey_N = vassle_nn_1_N | vassla_nn_1_N ; -- status=guess status=guess -lin whichPl_IDet = S.whichPl_IDet ; -- comment=CHECKED -lin whichSg_IDet = S.whichSg_IDet ; -- comment=CHECKED +lin which_IQuant = S.which_IQuant ; -- comment=CHECKED lin while_N = stund_nn_1_N ; -- comment=2 lin whim_N = ryck_nn_2_N ; -- comment=4 lin whimper_N = gny_nn_1_N ; -- comment=1