From 02b30024843f22a3f7666d159150f00253e47b86 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 7 Nov 2023 18:12:55 +0100
Subject: [PATCH] =?UTF-8?q?(Fin)=20move=20#consonant=20to=20Morpho=20+=20a?=
 =?UTF-8?q?dd=20o=C3=B6Harmony?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/finnish/MorphoFin.gf    | 7 +++++++
 src/finnish/ParadigmsFin.gf | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/finnish/MorphoFin.gf b/src/finnish/MorphoFin.gf
index 422a6dbe..c2c1b6c9 100644
--- a/src/finnish/MorphoFin.gf
+++ b/src/finnish/MorphoFin.gf
@@ -726,6 +726,11 @@ resource MorphoFin = ResFin ** open Prelude in {
       _ => "y"
       } ;
 
+    oöHarmony : Str -> Str = \a -> case a of {
+      "a" => "o" ;
+      _ => "ö"
+      } ;
+
     VForms : Type = Predef.Ints 11 => Str ;
 
     vForms12 : (x1,_,_,_,_,_,_,_,_,_,_,x12 : Str) -> VForms =
@@ -861,6 +866,8 @@ resource MorphoFin = ResFin ** open Prelude in {
 
   vowel : pattern Str = #("a"|"e"|"i"|"o"|"u"|"y"|"ä"|"ö") ;
 
+  consonant : pattern Str = #("b"|"c"|"d"|"f"|"g"|"h"|"j"|"k"|"l"|"m"|"n"|"p"|"q"|"r"|"s"|"t"|"v"|"w"|"x"|"z") ;
+
 -- The following function defines how grade alternation works if it is active.
 -- In general, *whether there is* grade alternation must be given in the lexicon
 -- (cf. "auto - auton" not "audon"; "vihje - vihjeen" not "vihkeen").
diff --git a/src/finnish/ParadigmsFin.gf b/src/finnish/ParadigmsFin.gf
index c6eca84e..2d4c9ca9 100644
--- a/src/finnish/ParadigmsFin.gf
+++ b/src/finnish/ParadigmsFin.gf
@@ -712,8 +712,6 @@ mkVS = overload {
            }
       } ;
 
-  consonant : pattern Str = #("b"|"c"|"d"|"f"|"g"|"h"|"j"|"k"|"l"|"m"|"n"|"p"|"q"|"r"|"s"|"t"|"v"|"w"|"x"|"z") ;
-
   -- like nForms2, but 2nd argument is Pl Genitive
   nForms2plGen : (sydan,sydanten : Str) -> NForms = \sydan,sydanten ->
     table {