diff --git a/src/finnish/MorphoFin.gf b/src/finnish/MorphoFin.gf index 1777347c5..e1a2580ec 100644 --- a/src/finnish/MorphoFin.gf +++ b/src/finnish/MorphoFin.gf @@ -750,7 +750,7 @@ resource MorphoFin = ResFin ** open Prelude in { vat = "v" + a + "t" ; liene = init lienee ; tulta = tult + a ; - tulevaP = (noun2adj (nhn (sKukko tuleva (tuleva + "n") (init tuleva + "ia")))).s ; + tulevaP = (noun2adj (nhn (sKukko tuleva (tuleva + "n") (init tuleva + "i" + a)))).s ; tultavaP = (noun2adj (nhn (sKukko (tulta + "v" + a) (tulta + "v" + a + "n") (tulta + "vi" + a)))).s ; tulemaP = (noun2adj (nhn (sKukko tulema (tulema + "n") (init tulema + "i" + a)))).s ; diff --git a/src/finnish/ParadigmsFin.gf b/src/finnish/ParadigmsFin.gf index 216b49746..bea18dd6a 100644 --- a/src/finnish/ParadigmsFin.gf +++ b/src/finnish/ParadigmsFin.gf @@ -642,6 +642,7 @@ mkVS = overload { mkA : (hyva,parempi,paras : N) -> (hyvin,paremmin,parhaiten : Str) -> A = \h,p,ps,hn,pn,ph -> lin A (mkAdj h p ps hn pn ph) ; + mkA : V -> A = presPartA ; } ; mkA_1 : Str -> A = \x -> lin A (noun2adjDeg (mk1N x)) ; @@ -667,7 +668,14 @@ mkVS = overload { (snoun2compar suuri) (snoun2superl suuri) ; + + presPartA : SVerb -> A = \tullaSV -> + let tulla = sverb2verb True tullaSV ; + tuleva : NForm => Str = \\nf => tulla.s ! PresPartAct (AN nf) ; + tuleva_SN = { s = tuleva ; + h = tullaSV.h } ; + in noun2adjDeg tuleva_SN ; -- verbs