diff --git a/lib/resource-1.0/finnish/LexiconFin.gf b/lib/resource-1.0/finnish/LexiconFin.gf index 1d3cd997d..01f30da39 100644 --- a/lib/resource-1.0/finnish/LexiconFin.gf +++ b/lib/resource-1.0/finnish/LexiconFin.gf @@ -331,7 +331,7 @@ lin flow_V = reg3V "virrata" "virtaan" "virtasi" ; fly_V = regV "lentää" ; freeze_V = regV "jäätyä" ; - give_V3 = dirdirV3 (regV "antaa") ; + give_V3 = dirdirV3 (reg3V "antaa" "annan" "antoi") ; hit_V2 = dirV2 (regV "lyödä") ; hold_V2 = dirV2 (regV "pitää") ; hunt_V2 = dirV2 (regV "metsästää") ; diff --git a/lib/resource-1.0/finnish/MorphoFin.gf b/lib/resource-1.0/finnish/MorphoFin.gf index e6e44f020..08f8ab513 100644 --- a/lib/resource-1.0/finnish/MorphoFin.gf +++ b/lib/resource-1.0/finnish/MorphoFin.gf @@ -687,7 +687,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn -> o = last juo ; a = last taa ; u = ifTok Str a "a" "u" "y" ; - soudin = souti + "n" ; ----weakGrade souti + "n" ; + soudin = weakGrade (init souti) + "in" ; in case taa of { "lla" | "llä" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ; "taa" | "tää" => vHuoltaa soutaa soudan souti soudin ; diff --git a/lib/resource-1.0/finnish/ResFin.gf b/lib/resource-1.0/finnish/ResFin.gf index 699f90c4a..edba59e7e 100644 --- a/lib/resource-1.0/finnish/ResFin.gf +++ b/lib/resource-1.0/finnish/ResFin.gf @@ -281,9 +281,19 @@ oper -- auxiliary of predication can be defined. verbOlla : Verb = - mkVerb + let olla = mkVerb "olla" "on" "olen" "ovat" "olkaa" "ollaan" "oli" "olin" "olisi" "ollut" "oltu" "ollun" ; + in {s = table { + Inf Inf3Iness => "olemassa" ; + Inf Inf3Elat => "olemasta" ; + Inf Inf3Illat => "olemaan" ; + Inf Inf3Adess => "olemalla" ; + Inf Inf3Abess => "olematta" ; + v => olla.s ! v + } + } ; + --3 Verbs -- @@ -324,7 +334,8 @@ oper tulleena = Predef.tk 2 tullut + ("een" + a) ; tulleen = (noun2adj (nhn (sRae tullut tulleena))).s ; tullun = (noun2adj (nhn (sKukko tultu tullun (tultu + ("j"+a))))).s ; - tulema = tuje + "m" + a ; + tulema = Predef.tk 3 tulevat + "m" + a ; +---- tulema = tuje + "m" + a ; vat = "v" + a + "t" in {s = table {