diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt index 3fc81cd9a..c3a9a888c 100644 --- a/examples/phrasebook/missing.txt +++ b/examples/phrasebook/missing.txt @@ -1,5 +1,20 @@ DisambPhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookBul : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookCat : MMust ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookDan : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookDut : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookFin : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookFre : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookGer : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookHin : AScared ATired MMust ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookIta : MCan MMust ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookLav : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookNor : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookPes : AHasAge AHasChildren AHasRoom AHasTable AmountCurrency Belgian DrinkNumber ItCost MCan MKnow MMust NNumeral ObjNumber ObjPlur PNumber PPrice ThesPlur ThesePlur ThosePlur V2Wait VWait +PhrasebookPol : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookRon : ObjPlur ThesPlur ThesePlur ThosePlur +PhrasebookRus : Belgian Belgium Flemish ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookSpa : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookSwe : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookTha : ObjPlur ThesPlur ThesePlur ThosePlur diff --git a/lib/src/chinese/ParadigmsChi.gf b/lib/src/chinese/ParadigmsChi.gf index c3be2cbd2..134091f6b 100644 --- a/lib/src/chinese/ParadigmsChi.gf +++ b/lib/src/chinese/ParadigmsChi.gf @@ -105,10 +105,10 @@ oper = ATManner ; mkPrep = overload { ---- is this the right order of the fields? - mkPrep : Str -> Preposition - = \s -> ResChi.mkPreposition [] s ; - mkPrep : Str -> Str -> Preposition - = \s,t -> ResChi.mkPreposition s t ; + mkPrep : Str -> Prep + = \s -> lin Prep (ResChi.mkPreposition [] s) ; + mkPrep : Str -> Str -> Prep + = \s,t -> lin Prep (ResChi.mkPreposition s t) ; } ; emptyPrep : Preposition = mkPrep [] ; diff --git a/lib/src/chinese/VerbChi.gf b/lib/src/chinese/VerbChi.gf index b208f78be..b344ca8d7 100644 --- a/lib/src/chinese/VerbChi.gf +++ b/lib/src/chinese/VerbChi.gf @@ -32,6 +32,7 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in { } ; UseComp comp = comp ; + UseCopula = predV copula ; SlashVV v vp = ---- too simple? insertObj (mkNP (infVP vp)) (predV v) ** {c2 = vp.c2 ; isPre = vp.isPre} ; @@ -59,5 +60,7 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in { CompAdv adv = insertObj adv (predV zai_V) ; + VPSlashPrep vp prep = vp ** {c2 = prep ; isPre = True} ; + } diff --git a/lib/src/romanian/VerbRon.gf b/lib/src/romanian/VerbRon.gf index 205be78fd..7544d6ab0 100644 --- a/lib/src/romanian/VerbRon.gf +++ b/lib/src/romanian/VerbRon.gf @@ -166,6 +166,7 @@ concrete VerbRon of Verb = UseComp comp = insertSimpObj comp.s copula ; + UseCopula = copula ; CompAP ap = {s = \\ag => ap.s ! AF ag.g ag.n Indef ANomAcc} ; CompCN cn = { s = \\ag => cn.s ! ag.n ! Indef ! ANomAcc }; --- RE 7/12/2010 @@ -178,7 +179,7 @@ concrete VerbRon of Verb = PassV2 v = insertSimpObj (\\a => v.s ! PPasse a.g a.n Indef ANomAcc) auxPassive ** {lock_VP = <>}; - + VPSlashPrep vp prep = vp ** {c2 = prep ; needAgr = False; needClit = True} ; ---- AR oper auxPassive = copula ;