1
0
forked from GitHub/gf-rgl

Merge pull request #39 from inariksit/master

Finnish
This commit is contained in:
Inari Listenmaa
2018-10-09 14:17:38 +02:00
committed by GitHub
3 changed files with 11 additions and 4 deletions

View File

@@ -855,7 +855,8 @@ resource MorphoFin = ResFin ** open Prelude in {
"rk" + ("i" | "e") => ku + "rj" + o ;
"lk" + _ => ku + "l" + o ;
"rk" + _ => ku + "r" + o ;
("hk" | "tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän
"hki" => ku + "hi" ; -- for pyyhkiä, vihkiä
("hk"|"tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän
("f"|"s") + ("k" | "p" | "t") + _ => kukko ; -- *lasku-lasvun, *raspi-rasvin, *lastu-lasdun, *afta-aftan
("k"|"p") + "t" + _ => kukko ; -- *projekti-projekdin
"uku" => ku + "uvu" ;
@@ -884,7 +885,7 @@ resource MorphoFin = ResFin ** open Prelude in {
a + k@("k"|"p"|"t") + e@("e"|"a"|"ä"|"u"|"y"|"i"|"o"|"ö") => a + k + k + e ;
a + "d" + e@("e"|"a"|"ä"|"u"|"i"|"o"|"ö") => a + "t" + e ;
s + a@("a"|"ä"|"o"|"ö") + "e" => s + a + "ke" ; -- säe, tae, koe
s + "ui" => s + "uki" ; -- ruis
s + "u" + i@("i"|"e") => s + "uk" + i ; -- ruis, aueta
s + "aa" => s + "aka" ; -- taata
s + "i" + a@("a" | "e" | "i") => s + "ik" + a ; -- liata, siitä, pietä
a + "v" + e@("e"|"a"|"ä"|"u"|"i") => a + "p" + e ; -- taive/toive imposs

View File

@@ -62,6 +62,7 @@ oper
infElat : InfForm ; -- e.g. "tekemästä"
infIllat : InfForm ; -- e.g. "tekemään"
infAdess : InfForm ; -- e.g. "tekemällä"
infPart : InfForm ; -- e.g. "tekemistä"
infPresPart : InfForm ; -- e.g. "tekevän"
infPresPartAgr : InfForm ; -- e.g. "tekevänsä"
@@ -407,6 +408,7 @@ mkVS = overload {
infFirst = Inf1 ;
infElat = Inf3Elat ; infIllat = Inf3Illat ;
infIness = Inf3Iness ; infAdess = Inf3Adess ;
infPart = Inf4Part ;
infPresPart = InfPresPart ; infPresPartAgr = InfPresPartAgr ;
prePrep : Case -> Str -> Prep =

View File

@@ -171,18 +171,22 @@ param
-- These forms appear in complements to VV and V2V.
VVType = VVInf | VVIness | VVIllat | VVPresPart ;
VVType = VVInf | VVIness | VVIllat | VVPresPart | VVPart | VVAdess ;
oper
vvtype2infform : VVType -> InfForm = \vt -> case vt of {
VVInf => Inf1 ;
VVIness => Inf3Iness ;
VVIllat => Inf3Illat ;
VVAdess => Inf3Adess ;
VVPart => Inf4Part ;
VVPresPart => InfPresPart
} ;
infform2vvtype : InfForm -> VVType = \vt -> case vt of {
Inf3Iness => VVIness ;
Inf3Illat => VVIllat ;
Inf3Adess => VVAdess ;
Inf4Part => VVPart ;
InfPresPart => VVPresPart ;
_ => VVInf
} ;