From ab88fd8018fffc20783f8be0edc08d37ef692b01 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 9 Oct 2018 13:42:25 +0200
Subject: [PATCH 1/2] =?UTF-8?q?(Fin)=20More=20patterns=20for=20consonant?=
 =?UTF-8?q?=20gradation=20("pyyhki=C3=A4",=20"aueta")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/finnish/MorphoFin.gf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/finnish/MorphoFin.gf b/src/finnish/MorphoFin.gf
index 7edd84bae..a17799ef6 100644
--- a/src/finnish/MorphoFin.gf
+++ b/src/finnish/MorphoFin.gf
@@ -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

From 0cf74c04df413d570ea3d4fbbbd77432a7f4eea3 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 9 Oct 2018 14:12:28 +0200
Subject: [PATCH 2/2] (Fin) Add more infinite forms to VVType

---
 src/finnish/ParadigmsFin.gf | 4 +++-
 src/finnish/ResFin.gf       | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/finnish/ParadigmsFin.gf b/src/finnish/ParadigmsFin.gf
index 4cea49ebe..c45992d55 100644
--- a/src/finnish/ParadigmsFin.gf
+++ b/src/finnish/ParadigmsFin.gf
@@ -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ä"
 
@@ -406,7 +407,8 @@ mkVS = overload {
 
   infFirst = Inf1 ;
   infElat = Inf3Elat ; infIllat = Inf3Illat ;
-  infIness = Inf3Iness ; infAdess =  Inf3Adess ;
+  infIness = Inf3Iness ; infAdess = Inf3Adess ;
+  infPart = Inf4Part ;
   infPresPart = InfPresPart ; infPresPartAgr = InfPresPartAgr ;
 
   prePrep  : Case -> Str -> Prep = 
diff --git a/src/finnish/ResFin.gf b/src/finnish/ResFin.gf
index 61d36748c..76a69f104 100644
--- a/src/finnish/ResFin.gf
+++ b/src/finnish/ResFin.gf
@@ -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
     } ;