Testar ny tagg HMET2 för H-metates steg 2; saunhaan>sauhnaan

giellalt · Sep 25, 2023 · 7455723 · 7455723
1 parent e84a5d9
commit 7455723
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/fst/affixes/nouns.lexc b/src/fst/affixes/nouns.lexc
@@ -142,7 +142,8 @@ LEXICON x1_sg_oblique
 !! **LEXICON @LEXNAME@** gives the rest
  +Sg+Gen:^WG%>n PxK ; !!≈ * @CODE@
  +Sg+Par:%>^A PxK ; !!≈ * @CODE@
- +Sg+Ill:^HMETA%>h^V^V n_PxK ; !!≈ * @CODE@ talhoon, paphiin, kashiin
+ +Sg+Ill:^HMETA%>h^V^V n_PxK ; !!≈ * @CODE@ talhoon, paphiin, kashiin !!TA BORT NÄR HMET2 klar
+ +Sg+Ill:^HMET2%>h^V^V n_PxK ; !!≈ * @CODE@ talhoon, paphiin, kashiin 
  +Sg+Ine:^WG%>ss^A PxK ;      !!≈ * @CODE@  etc.
  +Sg+Ela:^WG%>st^A PxK ;      ! talosta
  +Sg+All:^WG%>le PxxK ;        ! talole
@@ -642,7 +643,7 @@ LEXICON 3x_ue_pl
  +Pl+Abl:ks%>i2lt^A PxK ;
  +Pl+Abe:ks%>i2tt^A PxK ;
  +Pl+Ess:ks%>i2n^A PxK ;
- +Pl+Tra:ks TRA ;
+ +Pl+Tra: TRA ;
 
 LEXICON 3n_ime
 !! **LEXICON @LEXNAME@**

diff --git a/src/fst/phonology.twolc b/src/fst/phonology.twolc
@@ -16,6 +16,7 @@ a b c d e f g h i j k l m n o p q r s t u v w x y z å ä ö æ ø  !!= * @CODE@
 %^WG:0    !!= * @CODE@ = weak grade
 %^E2I:0   !!= * @CODE@ = kiele- > kieli
 %^HMETA:0 !!= * @CODE@ = vow metathesis for ill
+%^HMET2:0 !!= * @CODE@ = vow metathesis for sauhnaan etc
 %^AE:0    !!= * @CODE@ = a to e in otta- > otethaan
 %^IDEL:0  !!= * @CODE@ = trigger to delete i
 %>        !!= * @CODE@ = suffix boundary
@@ -39,7 +40,7 @@ t4:t      !!= * @CODE@  goes to 0 in imartelee : imarella
 
 Sets
 
-Dummy          = %+ %^WG %^E2I %^HMETA %^VDEL %^EDEL %^AE %^AO %^¤ %^IDEL ; !!= * @CODE@
+Dummy          = %+ %^WG %^E2I %^HMETA %^HMET2 %^VDEL %^EDEL %^AE %^AO %^¤ %^IDEL ; !!= * @CODE@
 DummyBorder    = Dummy %> ;                                          !!= * @CODE@
 ArchiVowel     = %^A %^O %^U ;                                       !!= * @CODE@ 
 SomeVowel      = %^V ;                                               !!= * @CODE@ 
@@ -346,7 +347,8 @@ v:0 <=> Vow v _ Vow: %^HMETA: ;
 !       [.#.|#] Cns:* Vow h _ ä:  (Dummy:) %>  h  :ä :ä ;
         [.#.|#] Cns:* Vow h _  :ö (Dummy:) %> (h) :ö ;
 !       [.#.|#] Cns:* Vow h _ ö:  (Dummy:) %>  h  :ö :ö ;
-                  Vow Vow   _ [l|m|n|r|v] Vow: %^HMETA: ; ! puohleen men vuotheen
+                  Vow Vow   _ [l|m|n|r|v] Vow:  %^HMET2: ; ! puohleen men vuotheen
+                 Vow Vow   _ [l|m|n|r|v] Vow:  %^HMETA: ; ! TA BORT NÄR HMET2 INFÖRD ÖVERALLT
                   Vow Vow   _ [l|m|n|r|v] e: %^WG: %> h: e e : ; ! huo0ne^WG>een : huohne0>een
                   Vow   l   _ [  m|n|r|v] Vow: %^HMETA: ; ! ilhmaa lm, lv, 
                   Vow   r   _ [  m|n  |v]     Vow: %^HMETA: ; ! 
@@ -511,10 +513,10 @@ v:0 <=> Vow v _ Vow: %^HMETA: ;
 "h:0"
 !! **RULE: @RULENAME@**
 h:0 <=>        Vow [p|t|k]                  _ e WeakGrade ;
-            Vow Vow :h Cns Vow: %^HMETA: %> _ ; ! puohleen
+            Vow Vow :h Cns Vow: [%^HMETA: | %^HMET2:] %> _ ; ! puohleen
 	[.#.|Cns] Vow s :s Vow: %^HMETA: %> _ %^V: %^V: ; ! issoon
                                       Vow h _ Vow: %^HMETA: ;
-  Vow Vow   :h [l|m|n|r|v] Vow: %^HMETA: %> _ ; ! huohneesheen
+  Vow Vow   :h [l|m|n|r|v] Vow: [%^HMETA: | %^HMET2:] %> _ ; ! huohneesheen
   Vow Vow   :h [l|m|n|r|v] e:   %^WG:    %> _ e e ; ! puohleen men vuotheen
   Vow   l   :h [  m|n|r|v] Vow: %^HMETA: %> _ ; ! ilhmaa lm, lv, 
   Vow   r   :h [  m|n  |v] Vow: %^HMETA: %> _ ; ! 
@@ -650,7 +652,7 @@ a:e <=> _ %^AE: ;
 
 "a:0"
 !! **RULE: @RULENAME@**
-a:0 <=>                                              _ %^HMETA: %> ;        ! before metathesis h
+a:0 <=>                                              _ [%^HMETA: | %^HMET2:] %> ;        ! before metathesis h
     [.#.|#] Cns:* RoundedVowel+ Cns:+ (:Cns)         _ (%^WG:)  %> [i2:|i3:|j] ;   ! kuva:kuvissa
     [.#.|#] Cns    a                                 _          %> [i2:|i3:|i4:] ; ! saa:sai
     [.#.|#] Cns:* Vow:+ Cns:+ Vow:+ Cns:+ (:Cns) (i) _ (%^WG:)  %>      i3: ;   ! ??? 
@@ -850,8 +852,8 @@ y:0 <=> [Cns|.#.|#] Vow (Cns) Cns _ %^HMETA: ;         ! deletion before metathe
 
 "a copying for h metathesis"
 !! **RULE: @RULENAME@**
-%^V:a <=> a: %^HMETA: %> h:     _ [:a|:i] ;
-          a: %^HMETA: %> h:  :a _    ;
+%^V:a <=> a: [%^HMETA: | %^HMET2:] %> h:     _ [:a|:i] ;
+          a: [%^HMETA: | %^HMET2:] %> h:  :a _    ;
           a           %> (h)    _ [n|t|s|l|%>|.#.] ;
 
 !! **Tests:**

diff --git a/src/fst/root.lexc b/src/fst/root.lexc
@@ -219,6 +219,7 @@ i8  !!≈ * **@CODE@** = past tense i of verbs that disappear: antaa : anto
  %^N 		 !!≈ * **@CODE@** = tulˆNut, kävel^N^Ut
  %^E2I   	 !!≈ * **@CODE@** = for e to i change
  %^HMETA 	 !!≈ * **@CODE@** = for h metathesis syksy - sykshyyn
+ %^HMET2 	 !!≈ * **@CODE@** = for h metathesis saunhaan - sauhnaan
  %^AO     	 !!≈ * **@CODE@** = a:o rannoissa
  %^WG     	 !!≈ * **@CODE@** = Weak grade matto - maton
  %^TES		 !!≈ * **@CODE@** =  in use?

diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc
@@ -2930,13 +2930,13 @@ tutna:tutna nx ;
 kauna:kauna nx ;
 ohrakauna:ohrakauna nx ;
 vihankauna:vihankauna nx ;
-sauna:sauna nx ;
-vittasauna:vittasauna nx ;
-täisauna:täisauna nx ;
-kuppaussauna:kuppaussauna nx ;
-sausauna:sausauna nx ;
-selkäsauna:selkäsauna nx ;
-sölkäsauna:sölkäsauna nx ;
+sauna:sauna n1 ;
+vittasauna:vitta#sauna n1 ;
+täisauna:täi#sauna n1 ;
+kuppaussauna:kuppaus#sauna n1 ;
+sausauna:sau#sauna n1 ;
+selkäsauna:selkä#sauna n1 ;
+sölkäsauna:sölkä#sauna n1 ;
 leuna:leuna nx ;
 pleuna:pleuna nx ;
 mettäpleuna:mettäpleuna nx ;