Merge pull request #473 from adelon/master

Small fixes for English and Finnish

src/english/IrregEng.gf

@@ -149,7 +149,7 @@ flags optimize=values ;
   stick_V = irregV "stick" "stuck" "stuck" ;
   sting_V = irregV "sting" "stung" "stung" ;
   stink_V = irregV "stink" "stank" "stunk" ;
-  stride_V = irregV "stride" "strod" "stridden" ;
+  stride_V = irregV "stride" "strode" "stridden" ;
   strike_V = irregV "strike" "struck" "struck" ;
   string_V = irregV "string" "strung" "strung" ;
   strive_V = irregV "strive" "strove" "striven" ;

src/finnish/LexiconFin.gf

@@ -148,8 +148,7 @@ lin
   play_V2 = mkV2 (mkV "pelata") cpartitive ; --- leikkiä, soittaa
   policeman_N = mkN "poliisi" ;
   priest_N = mkN "pappi" ;
-  probable_AS = mkAS --- for vowel harmony
-    (mkA (mkN "todennäköinen") "tonennäköisempi" "todennäköisin") ; ---- sta
+  probable_AS = mkAS (compoundA "toden" (mkA "näköinen")) ;
   queen_N = mkN "kuningatar" ;
   radio_N = mk2N "radio" "radioita" ;
   rain_V0 = mkV0 (mk2V "sataa" "satoi") ;

src/finnish/MorphoFin.gf

@@ -1064,7 +1064,7 @@ oper
       Transl => "niiksi" ;
       Ess    => "niinä" ;
       Iness  => "niissä" ;
-      Elat   => "niitä" ;
+      Elat   => "niistä" ;
       Illat  => "niihin" ;
       Adess  => "niillä" ;
       Ablat  => "niiltä" ;

src/finnish/NumeralFin.gf

@@ -142,7 +142,7 @@ oper
     (ordN "a" "sadas") ;
 
   tuhatN = co
-    (snoun2nounBind (mkN "tuhat" "tuhannen" "tuhatta" "ruhantena" "tuhanteen"
+    (snoun2nounBind (mkN "tuhat" "tuhannen" "tuhatta" "tuhantena" "tuhanteen"
     "tuhansien" "tuhansia" "tuhansina" "tuhansissa" "tuhansiin"))
     (ordN "a" "tuhannes")  ;
 
@@ -173,7 +173,7 @@ oper
 
   miljoonaN = co
     (snoun2nounBind (mkN "miljoona"))
-    (ordN "s" "miljoonas") ;
+    (ordN "a" "miljoonas") ;
 
   miljoonaaN = {s = table {
     Sg => miljoonaN.s ;
@@ -186,7 +186,7 @@ oper
 
   miljardiN = co
     (snoun2nounBind (mkN "miljardi"))
-    (ordN "s" "miljardis") ;
+    (ordN "a" "miljardis") ;
 
   miljardiaN = {s = table {
     Sg => miljardiN.s ;

src/finnish/ParadigmsFin.gf

@@ -221,7 +221,15 @@ oper
     = \s -> lin A {s = \\_,_ => s ; h = Back ; p = [] ; hasPrefix = False} ; ----- stemming adds bogus endings
 
   compoundA : Str -> A -> A  -- prefix glued to adjective, e.g. "hevos"+"vetoinen"
-    = \s,a -> lin A {s = \\d,c => s + a.s ! d ! c  ; h = a.h ; p = s + a.p ; hasPrefix = a.hasPrefix} ;
+    = \s,a -> lin A {
+      s = \\d,c => s + a.s ! d ! c ;
+      h = a.h ;
+      p = case a.hasPrefix of {
+        True => s + a.p ;
+        False => []
+        } ;
+      hasPrefix = a.hasPrefix
+      } ;
 
   prefixA : Str -> A -> A -- in modifying use, an uninflected glued prefix, e.g. "sähkö" for "sähköinen"
     = \pr,a -> a ** {

src/finnish/StemFin.gf

@@ -76,7 +76,7 @@ oper
     let
       tuoree = init (tuore.s ! NCase Sg Gen) ;
       tuoreesti  = tuoree + "sti" ;
-      tuoreemmin =  init tuoree ;
+      tuoreemmin = init tuoree + "in" ;
     in {s = table {
          AN f => tuore.s ! f ;
          AAdv => if_then_Str isPos tuoreesti tuoreemmin

src/finnish/stemmed/StemFin.gf

@@ -148,7 +148,7 @@ oper
     let 
       tuoree = tuore.s ! 1 ;
       tuoreesti  = tuoree + "sti" ; 
-      tuoreemmin =  init tuoree ;
+      tuoreemmin = init tuoree + "in" ;
     in {s = table {
          SAN f => tuore.s ! f ;
          SAAdv => if_then_Str isPos tuoreesti tuoreemmin

src/morphodict/MorphoDictEng.gf

@@ -5345,7 +5345,7 @@ lin bestir_V = mkV "bestir" "bestirred" "bestirred" ;
 lin bestow_V = mkV "bestow" "bestowed" "bestowed" ;
 lin bestowal_N = mkN "bestowal" "bestowals" ;
 lin bestrew_V = mkV "bestrew" "bestrewed" "bestrewed" ;
-lin bestride_V = mkV "bestride" "bestrod" "bestridden" ;
+lin bestride_V = mkV "bestride" "bestrode" "bestridden" ;
 lin bestubbled_A = mkAMost "bestubbled" "bestubbledly" ;
 lin bet_N = mkN "bet" "bets" ;
 lin bet_V = mkV "bet" "betted" "betted" ;
@@ -48049,7 +48049,7 @@ lin strict_A = mkA "strict" "stricter" "strictest" "strictly" ;
 lin strictness_N = mkN "strictness" "strictnesses" ;
 lin stricture_N = mkN "stricture" "strictures" ;
 lin stride_N = mkN "stride" "strides" ;
-lin stride_V = mkV "stride" "strod" "stridden" ;
+lin stride_V = mkV "stride" "strode" "stridden" ;
 lin strident_A = mkAMost "strident" "stridently" ;
 lin strider_N = mkN "strider" "striders" ;
 lin stridor_N = mkN "stridor" "stridors" ;