Work with A_OIGED

separate rules for the three phenomena g:k e:0 d:t
giellalt · Apr 5, 2024 · eee060b · eee060b
1 parent 1102df0
commit eee060b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/src/fst/morphology/affixes/adjectives.lexc b/src/fst/morphology/affixes/adjectives.lexc
@@ -48,8 +48,8 @@ LEXICON A_JAUH  !!≈ * **@CODE@** =  jauh:jauh
 LEXICON A_OIGED  !!≈ * **@CODE@** = oiged:oig%{eØ%}d
 !oi|ged (-ktan, -ktoid)
  N_OIGED ;
-+Comp:%^RmVow%^DEVOICE%>e%>mb N_POIG ;
-
++Comp:%^PEN%^DEVOICE%^RmVow%^DEVOICE%>e%>mb N_POIG ;
+!^PEN^DEVOICE^RmVow^DEVOICE
 LEXICON A_KEL  !!≈ * **@CODE@** = kel':kel
  N_KEL ;
 +Comp:%>e%>mb N_POIG ;

diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
@@ -353,12 +353,13 @@ R ; ! xxx check
 LEXICON N_OIGED !oiged:oig%{eØ%}d
 !oi|ged (-ktan, -ktoid)
 : SG-NOM-SUF ;
-:%^RmVow%^DEVOICE%>a SG-OBLIQUE ;
+!^PEN^DEVOICE^RmVow^DEVOICE
+:%^PEN%^DEVOICE%^RmVow%^DEVOICEa SG-OBLIQUE ;
 R ; ! xxx check
 ! Plural
-:%^RmVow%^DEVOICE%>a PL-NOM-SUF ;
-:%^RmVow%^DEVOICE%>a PL-ACC-SUF ;
-:%^RmVow%^DEVOICE%>o PL-OBLIQUE ;
+:%^PEN%^DEVOICE%^RmVow%^DEVOICE%>a PL-NOM-SUF ;
+:%^PEN%^DEVOICE%^RmVow%^DEVOICE%>a PL-ACC-SUF ;
+:%^PEN%^DEVOICE%^RmVow%^DEVOICE%>o PL-OBLIQUE ;
 
 LEXICON N_SAMAL !samal:sam%{aØ%}l
 : SG-NOM-SUF ;

diff --git a/src/fst/morphology/phonology.twolc b/src/fst/morphology/phonology.twolc
@@ -91,7 +91,7 @@ QÄQ1:0  !!= * @CODE@
 
 ! Veps 
  %^DEVOICE:0   !!= * @CODE@  vezi:vet; pen’:pen’t
-
+ %^PEN:0       !!= * @CODE@  Control final vs penultimate
 
 ! this k is not effected by gradation
 K1:k   !!= * @CODE@ 
@@ -188,6 +188,9 @@ Rules
 !! **RULE: @RULENAME@** = 
 !! **@RULENAME@**  
  e:0 <=> # Cns* Vow+ Cns+ _  %> i  ;
+         Cns: _ Cns: (%^PEN: %^DEVOICE:) %^RmVow: ;
+!!€ oiged^PEN^DEVOICE^RmVow^DEVOICEa>n
+!!€ oik0t0000a>n
 
 "Stem-internal vowel loss"
 !! **RULE: @RULENAME@** = 
@@ -214,16 +217,25 @@ V1:Vx <=> Vx Cns:* %> h _ ;
 !!€ marj>hV1
 !!€ marj>ha
 
+"vowel loss"
+!! **@RULENAME@** vauged: vauktan
+ Vx:Vy <=> Cns: _ (%^PEN: %^DEVOICE:) %^RmVow: ;
+              where Vx in (u a)
+	            Vy in (0 0) matched ;
 
 !! ### Consonant change 
 
 "devoicing of adjecent stops"
 !! **@RULENAME@** vauged: vauktan
  Cx:Cy <=>  _ [%{eØ%}: |%{uØ%}: ] Cns:CnsVoiceless %^RmVow: %^DEVOICE: %> ;
             Cns:CnsVoiceless [ %{eØ%}: | %{uØ%}: ] _ %^RmVow: %^DEVOICE: %> ;
+	    [i | n | Vow:] _ (%^PEN: %^DEVOICE:) (%^RmVow:) %^DEVOICE: ;
+	    [i | n | Vow:] _ Vow: Cns: %^PEN: %^DEVOICE: ;
               where Cx in (g d)
                     Cy in (k t) matched ;
-
+!! oiged+A+Sg+Gen: __right/oikea__
+!!€ oiged^PEN^DEVOICE^RmVow^DEVOICEa>n
+!!€ oik0t0000a>n
 
 "d:z in vodes, voziš"
 !! **@RULENAME@**  

diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
@@ -359,7 +359,8 @@ Multichar_Symbols
 
 !! #### More archiphonemes (Protoletters for xfst)
 
-%^DEVOICE     !!≈ * **@CODE@**  = 
+%^DEVOICE     !!≈ * **@CODE@**  = haikta: haig
+%^PEN       !!= * @CODE@  Control final vs penultimate
 QAQ1   !!≈ * **@CODE@** 
 QAO1   !!≈ * **@CODE@** 
 QÄQ1   !!≈ * **@CODE@** 

diff --git a/src/fst/morphology/stems/adjectives_newwords.lexc b/src/fst/morphology/stems/adjectives_newwords.lexc
@@ -624,18 +624,18 @@ vähähk+A:vähähk A_JAUH ;
 hen+A:hen A_JAUH ;
 avar+A:avar A_JAUH ;
 
-rohked:rohk%{eØ%}d A_OIGED ;
-oiged+A:oig%{eØ%}d A_OIGED ;
-muiged+A:muig%{eØ%}d A_OIGED ;
-sanged+A:sang%{eØ%}d A_OIGED ;
-karged+A:karg%{eØ%}d A_OIGED ;
-korged+A:korg%{eØ%}d A_OIGED ;
-kauged+A:kaug%{eØ%}d A_OIGED ;
-vauged+A:vaug%{eØ%}d A_OIGED ;
-sel’ged+A:sel’g%{eØ%}d A_OIGED ;
-notked+A:notk%{eØ%}d A_OIGED ;
-pehmed+A:pehm%{eØ%}d A_OIGED ;
-varmed+A:varm%{eØ%}d A_OIGED ;
+rohked:rohked A_OIGED ;
+oiged+A:oiged A_OIGED ;
+muiged+A:muiged A_OIGED ;
+sanged+A:sanged A_OIGED ;
+karged+A:karged A_OIGED ;
+korged+A:korged A_OIGED ;
+kauged+A:kauged A_OIGED ;
+vauged+A:vauged A_OIGED ;
+sel’ged+A:sel’ged A_OIGED ;
+notked+A:notked A_OIGED ;!CHECKME
+pehmed+A:pehmed A_OIGED ;!CHECKME
+varmed+A:varmed A_OIGED ;!CHECKME
 
 vihmakaz+A:vihmaka A_VEDEKAZ ;
 solakaz+A:solaka A_VEDEKAZ ;