diff --git a/lib/src/finnish/ExtraFin.gf b/lib/src/finnish/ExtraFin.gf index 766629557..5e00b914f 100644 --- a/lib/src/finnish/ExtraFin.gf +++ b/lib/src/finnish/ExtraFin.gf @@ -254,6 +254,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** ---- TODO maybe squeeze s2 between the fin and inf (but this is subtle) ---- sinua olen rakastanut minä -> sinua olen minä rakastanus -- advantage though: works for all V2 verbs, need not be transitive +---- TODO: agr should be to the agent PassAgentVPSlash vp np = { s = {s = vp.s.s ; h = vp.s.h ; p = vp.s.p ; sc = npform2subjcase vp.c2.c} ; diff --git a/lib/src/finnish/NounFin.gf b/lib/src/finnish/NounFin.gf index 07c09ea15..764580c86 100644 --- a/lib/src/finnish/NounFin.gf +++ b/lib/src/finnish/NounFin.gf @@ -116,7 +116,8 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, StemFin, Prelude in } ; PossPron p = { - s1,sp = \\_,_ => p.poss ; + s1 = \\_,_ => p.poss ; -- [] in det position with proDrop + sp = \\_,_ => p.s ! NPCase Gen ; -- to prevent [] with proDrop s2 = case p.hasPoss of { True => table {Front => BIND ++ possSuffixFront p.a ; Back => BIND ++ possSuffix p.a } ; diff --git a/lib/src/translator/ExtensionsFin.gf b/lib/src/translator/ExtensionsFin.gf index 0a4d59312..9696fb29c 100644 --- a/lib/src/translator/ExtensionsFin.gf +++ b/lib/src/translator/ExtensionsFin.gf @@ -124,4 +124,14 @@ lin --in Verb, SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash + DirectComplVS t np vs utt = + mkS (lin Adv (optCommaSS utt)) (mkS t positivePol (mkCl np (lin V vs))) ; + + DirectComplVQ t np vs q = + mkS (lin Adv (optCommaSS (mkUtt q))) (mkS t positivePol (mkCl np (lin V vs))) ; + + FocusObjS np sslash = + mkS (lin Adv (optCommaSS (ss (appCompl True Pos sslash.c2 np)))) ; ---- Pos could be Neg: häntä minä en tunne + + } diff --git a/lib/src/translator/TranslateFin.gf b/lib/src/translator/TranslateFin.gf index 013d682cc..4979827cb 100644 --- a/lib/src/translator/TranslateFin.gf +++ b/lib/src/translator/TranslateFin.gf @@ -26,7 +26,8 @@ concrete TranslateFin of Translate = DocumentationFin, ChunkFin, - ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP], + ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP, + DirectComplVS, DirectComplVQ, FocusObjS], DictionaryFin **