heasti now illegal

giellalt · May 7, 2024 · a8085e4 · a8085e4
1 parent e2409f6
commit a8085e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/fst/filters/block-derivations.est.xfscript b/src/fst/filters/block-derivations.est.xfscript
@@ -136,7 +136,8 @@ define BadDer4 [
     [{omandama} ("+Guess") "+V" "+Der/is"] |
     [Vow {ke} ("+Guess") "+A" "+Der/im"] |   # rohke+im is OK, peenike+im not OK
     [{hea} ("+Guess") "+A" "+Der/im"] |
-    [{asi} ("+Guess") "+N" "+Der/lik"]   # asilik is bad; asjalik is in the lexicon already
+    [{asi} ("+Guess") "+N" "+Der/lik"] |  # asilik is bad; asjalik is in the lexicon already
+    [{hea} ("+Guess") "+A" "+Der/sti"]    # heasti is bad; hästi is in the lexicon already
     ] ;
 
 # some words with certain suffixes make bad components in compounds  

diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
@@ -530,6 +530,12 @@ Multichar_Symbols
 +Der/ist !!= * `@CODE@`
 !!€ kapitalist: kapitalism+N+Der/ist+N+Sg+Nom
 
+!! N Prop --> N
+
++Der/lane !!= * `@CODE@`:  helveetslane:Helveetsia+N+Prop+Der/lane+N+Sg+Nom
+!!€ firenzelane: Firenze+N+Prop+Der/lane+N+Sg+Nom
+!!€ helveetslane: Helveetsia+N+Prop+Der/lane+N+Sg+Nom
+
 !! A --> N, V --> N
 
 +Der/us !!= * `@CODE@`
@@ -541,10 +547,6 @@ Multichar_Symbols
 +Der/ti !!= * `@CODE@`
 !!€ lauati: laud+N+Der/ti+Adv
 
-+Der/lane !!= * `@CODE@`:  helveetslane:Helveetsia+N+Prop+Der/lane+N+Sg+Nom
-!!€ firenzelane: Firenze+N+Prop+Der/lane+N+Sg+Nom
-!!€ helveetslane: Helveetsia+N+Prop+Der/lane+N+Sg+Nom
-
 !! N --> N, A --> A
 
 +Dim/ke !!= * `@CODE@`:  diminutive