diff --git a/src/finnish/Kotus.gf b/src/finnish/Kotus.gf index 802432d6..7f3b07cf 100644 --- a/src/finnish/Kotus.gf +++ b/src/finnish/Kotus.gf @@ -106,11 +106,11 @@ oper d28A : Str -> NForms -- 1 jälsi = \s -> dArpi s (Predef.tk 2 s + "len") ; d29 : Str -> NForms -- 1 lapsi - = \s -> let lapsi = dArpi s (init s + "en") in - table {2 => Predef.tk 3 s + "ta" ; i => lapsi ! i} ; + = \s -> let lapsi = dArpi s (init s + "en") ; a = vowHarmony s in + table {2 => Predef.tk 3 s + "st" + a ; i => lapsi ! i} ; d30 : Str -> NForms -- 2 veitsi - = \s -> let lapsi = dArpi s (init s + "en") in - table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; + = \s -> let lapsi = dArpi s (init s + "en") ; a = vowHarmony s in + table {2 => Predef.tk 3 s + "st" + a ; i => lapsi ! i} ; d31 : Str -> NForms -- 3 yksi = \s -> let y = Predef.tk 3 s ; diff --git a/src/finnish/MorphoFin.gf b/src/finnish/MorphoFin.gf index a17799ef..b92f32f3 100644 --- a/src/finnish/MorphoFin.gf +++ b/src/finnish/MorphoFin.gf @@ -639,7 +639,7 @@ resource MorphoFin = ResFin ** open Prelude in { in vForms12 harkita (harkit + "sen") - (harkit + "se") + (harkit + "see") (harkit + "sev" + a + "t") (harkit + "k" + a + a) (harkit + a + a + "n") diff --git a/src/scandinavian/SentenceScand.gf b/src/scandinavian/SentenceScand.gf index 336e4baa..72101768 100644 --- a/src/scandinavian/SentenceScand.gf +++ b/src/scandinavian/SentenceScand.gf @@ -36,7 +36,7 @@ incomplete concrete SentenceScand of Sentence = SlashVS np vs slash = mkClause (np.s ! nominative) np.a - (insertObj (\\_ => conjThat ++ slash.s ! Sub) (predV vs)) ** + (insertExt (conjThat ++ slash.s ! Sub) (predV vs)) ** {n3 = slash.n3 ; c2 = slash.c2} ; EmbedS s = {s = conjThat ++ s.s ! Sub} ; diff --git a/src/scandinavian/VerbScand.gf b/src/scandinavian/VerbScand.gf index 83f10b0a..2a457fc7 100644 --- a/src/scandinavian/VerbScand.gf +++ b/src/scandinavian/VerbScand.gf @@ -16,8 +16,8 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand, } ; ComplVV v vp = insertObjPost (\\a => v.c2.s ++ infVP vp a) (predV v) ; - ComplVS v s = insertObjPost (\\_ => conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ? - ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ; + ComplVS v s = insertExt (conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ? + ComplVQ v q = insertExt (q.s ! QIndir) (predV v) ; ComplVA v ap = insertObjPre (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ; SlashV2V v vp = predV v ** { @@ -25,11 +25,13 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand, c2 = v.c2 } ; SlashV2S v s = predV v ** { - n3 = \\_ => conjThat ++ s.s ! Sub ; + n3 = \\_ => [] ; + ext = conjThat ++ s.s ! Sub ; c2 = v.c2 } ; SlashV2Q v q = predV v ** { - n3 = \\_ => q.s ! QIndir ; + n3 = \\_ => [] ; + ext = q.s ! QIndir ; c2 = v.c2 } ; SlashV2A v ap = predV v ** {