Continue K/G

giellalt · Nov 6, 2024 · 8c9868c · 8c9868c
1 parent 87b9f5e
commit 8c9868c
Show file tree

Hide file tree

Showing 14 changed files with 2,029 additions and 1,938 deletions.
diff --git a/src/fst/morphology/affixes/adjectives.lexc b/src/fst/morphology/affixes/adjectives.lexc
@@ -203,11 +203,16 @@ LEXICON A_CHAAQCC !!= * @CODE@ čääʹcc:čää%{ʹØ%}cc
 :%^PAL%^KK2GG   A-ATTR_es ;
 : A-01_CHAAQCC ;
 
-LEXICON A_KAQLBB !!= * @CODE@ käʹlbb:kälbb âʹlǧǧ:â%^1VOW%{ʹØ%}lgg
+LEXICON A_KAQLBB !!= * @CODE@ käʹlbb:kälbb 
 ! vowel: monophthong
 :%^V2VV%^PAL%^YXX2YX   A-ATTR_es ;
 : A-01_KAQLBB ;
 
+LEXICON A_1E_VQYKK !!= * @CODE@ âʹlǧǧ:â%^1VOW%{ʹØ%}lgg
+! vowel: monophthong
+:%^V2VV%^PAL%^YXX2YX%^PALK   A-ATTR_es ;
+: A-01_1E_VQYKK ;
+
 LEXICON A_HAAQSKH !!= * @CODE@ hääʹsǩ:hää%{ʹØ%}sk
 ! vowel: monophthong
 ! gradation: no
@@ -848,6 +853,13 @@ LEXICON A_LOSSYD !!= * @CODE@ lossâd:loss
 : A-01_VISKKYD ;
 :âd A2N-VUOTT ;
 
+LEXICON A_11Y_VYKK !!= * @CODE@ viskkâd:viskk
+:%^PAL%^PALK AdjAttr-es ;
+: A-01_VISKKYD ;
+:âd A2N-VUOTT ;
+: ADJ-DER/COMP_aeaeb ;
+: ADJ-DER/SUPERL_ummus ;
+
 LEXICON A_VISKKYD !!= * @CODE@ viskkâd:viskk
 :%^PAL AdjAttr-es ;
 : A-01_VISKKYD ;
@@ -4575,6 +4587,20 @@ LEXICON A-01_CHAAQCC
 !2016-12-05-NotUsed!:%^PAL  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) pâʹjj- Ess+Px..
 !2016-12-05-NotUsed!
 
+LEXICON A-01_1E_VQYKK
+!! * Yaml: **N-algg**
+:%^PAL%^PALK A-02_E-STEM_SG-NOM ;		  			!!= * @CODE@ (1) Sg.Nom: âʹlǧǧ
+:%^V2VV%^PAL%^YXX2YX%^PALK A-02_E-STEM_SG-ABE/ACC/GEN ;	!!= * @CODE@ (2) Pl.Nom: ââʹlj
+: A-02_E-STEM_SG-ILL ;	     			   	!!= * @CODE@ (3) Sg.Ill: âlgga
+:%^V2VV%^PAL%^YXX2YX%^PALK%>e A-02_SG-LOC ;		!!= * @CODE@ (4) Sg.Loc: ââʹljest
+:%^V2VV%^VOWRaise%^PAL%^YXX2YX%^PALK A-02_SG-COM_IN ; !!= * @CODE@ (5) Sg.Com: õõʹljin
+:%^PAL%^PALK%>e A-02_ESS/PAR ;	       			!!= * @CODE@ (6) Ess: âʹlǧǧen
+:%^V2VV%^YXX2YX A-02_E-STEM_N_KUYLAZH ;		!!= * @CODE@ (9) Der/Dimin.N.Sg.Nom: ââlǥaž
+ E-STEM-PX-RETAIN-WITHOUT-PAL ;   !!= * @CODE@ (10) kälbb-
+:%^PAL%^YXX2YX%^PALK E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) käʹlb-
+:%^PAL%^PALK  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) käʹlbb Ess+Px..
+:%^V2VV%^PAL%^YXX2YX%^PALK A-02_PL-NOM ;	!!= * @CODE@ (2) Pl.Nom: ââʹlj
+:%^V2VV%^VOWRaise%^PAL%^YXX2YX%^PALK A-02_E-STEM_PL-OBL ; !!= * @CODE@ (5) Sg.Com: õõʹljin
 
 LEXICON A-01_KAQLBB
 ! gradation: yes

diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
diff --git a/src/fst/morphology/affixes/propernouns.lexc b/src/fst/morphology/affixes/propernouns.lexc
@@ -642,6 +642,9 @@ LEXICON PROP_KUYLAZH_mal
 LEXICON PROP_KOALVAK_mal
 +Sem/Mal+Cmp/SgNom: ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_KOALVAK ;
+LEXICON PROP_1E_VQYKK_mal
++Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
++Sem/Mal: NMN_1E_VQYKK ;
 LEXICON PROP_KAQLBB_mal
 +Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_KAQLBB ;

diff --git a/src/fst/morphology/affixes/verbs.lexc b/src/fst/morphology/affixes/verbs.lexc
@@ -322,12 +322,12 @@ LEXICON V0_1Y_VVKK
 !!€ põõss%^VOWLower
 !!€ pââss0
 
-+Ind+Prs+Pl3:%^VV2V%^VOWLower%^PAL%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: veʹǩǩe
++Ind+Prs+Pl3:%^VV2V%^VOWLower%^PAL%^PALK%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: veʹǩǩe
 !! +V+Ind+Prs+Pl3
-!!€ põõ0ss%^VV2V%^VOWLower%^PAL%>e
+!!€ põõ0ss%^VV2V%^VOWLower%^PAL%^PALK%>e
 !!€ pâ0ʹss000%>e
 
-:%^VV2V%^PAL VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: viʹǩǩe
+:%^VV2V%^PAL%^PALK VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: viʹǩǩe
 !! +V+Ind+Prt+Pl3,  Ind+Prt+Sg1, Ind+Prt+Sg2, Ind+Prt+Sg4
 !!€ põõ0ss%^VV2V%^PAL%>e
 !!€ põ0ʼss00%>e
@@ -987,8 +987,8 @@ LEXICON V0_1Y_IOKK !!= * @CODE@ čiõkkâd:čiõkk
 !  with lexc stem
 : VSUF-INF_YD ; !1 čiõkkâd
 :%^VOWLower VSUF-IND-PRS-SG3_YD ; !2 čeâkk
-+Ind+Prs+Pl3:%^VOWLower%^PALÄ%^PAL%^CC2CCC%>e K ; !3 čeäʹǩˈǩe
-:%^PAL%^CC2CCC VSUF-IND-PRT-PL3_YD ; !4 čiõʹǩˈǩe
++Ind+Prs+Pl3:%^VOWLower%^PALÄ%^PAL%^CC2CCC%^PALK%>e K ; !3 čeäʹǩˈǩe
+:%^PAL%^CC2CCC%^PALK VSUF-IND-PRT-PL3_YD ; !4 čiõʹǩˈǩe
 :%^KK2GG VSUF-I-POTKOND_YD ; !5 čiõǥǥ
 +Err/Orth-should-be-grade-minus1: VSUF-I-POTKOND_YD ; !5 ERR
 +Pot+Sg3:%^KK2GG%>âž   K ; !6 čiõǥǥâž
@@ -1299,10 +1299,10 @@ LEXICON V0_1Y_VYKK
 :%^VOWLower VSUF-IND-PRS-SG3_YD ; !!= * @CODE@ (2,9)  Ind.Prs.Sg3: tåbdd
 !! +Ind+Prs+Sg3, +Imprt+Pl3
 
-+Ind+Prs+Pl3:%^VOWLower%^PAL%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: tåʹbdde
++Ind+Prs+Pl3:%^VOWLower%^PAL%^PALK%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: tåʹbdde
 !! +Ind+Prs+Pl3
 
-:%^PAL VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: toʹbdde
+:%^PAL%^PALK VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: toʹbdde
 !! +Ind+Prt+Pl3,  Ind+Prt+Sg1, Ind+Prt+Sg2, Ind+Prt+Sg4
 
 :%^V2VV%^YXX2YX VSUF-I-POTKOND_YD ; !!= * @CODE@ (5-6)  Pot.Sg3: toobdâž
@@ -1499,10 +1499,10 @@ LEXICON V0_1Y_VWYKK !!= * @CODE@ kuõskkâd:kuõskk
 :%^VOWLower VSUF-IND-PRS-SG3_YD ; !!= * @CODE@ (2)  Ind.Prs.Sg3: kuâskk
 !! +Ind+Prs+Sg3, +Imprt+Pl3
 
-+Ind+Prs+Pl3:%^VOWLower%^PALE%^PAL%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: kueʹsǩǩe (allophonic)
++Ind+Prs+Pl3:%^VOWLower%^PALE%^PAL%^PALK%>e K ; !!= * @CODE@ (3)  Ind.Prs.Pl3: kueʹsǩǩe (allophonic)
 !! +Ind+Prs+Pl3
 
-:%^PAL VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: kuõʹsǩǩe
+:%^PAL%^PALK VSUF-IND-PRT-PL3_YD ; !!= * @CODE@ (4)  Ind.Prt.Pl3: kuõʹsǩǩe
 !! +Ind+Prt+Pl3,  Ind+Prt+Sg1, Ind+Prt+Sg2, Ind+Prt+Sg4
 
 :%^YXX2YX VSUF-I-POTKOND_YD ; !!= * @CODE@ (5-6)  Ind.Pot.Sg3: kuõskâž
@@ -1677,7 +1677,7 @@ LEXICON V0_1Y_VWUKK !!= * @CODE@ čuõiggâd:čuõigg
 ! THIS NEEDS MORE DEVELOPING
 : VSUF-INF_YD ; !1
 :%^VOWLower VSUF-IND-PRS-SG3_YD ; !2
-+Ind+Prs+Pl3:%^VOWLower%^PAL%>e K ; !3
++Ind+Prs+Pl3:%^VOWLower%^PAL%^PALK%>e K ; !3
 :%^PAL%^PALK VSUF-IND-PRT-PL3_YD ; !4
 :%^YXX2YX VSUF-I-POTKOND_YD ; !5
 +Err/Orth-should-be-grade-minus1: VSUF-I-POTKOND_YD ; !5 ERR
@@ -4003,7 +4003,7 @@ LEXICON V0_1E_VQKK !!= * @CODE@ câʹǩǩed:câ%^1VOW%{ʹØ%}kk
 ! seek parallel in TÄTTAD
 ! FORMS
 !! ExtraStrong-LowVowel-Palatalization
-:%^PAL VSUF-INF_ED ; !!= * @CODE@ (1) +V+Inf: käʹtted
+:%^PAL%^PALK VSUF-INF_ED ; !!= * @CODE@ (1) +V+Inf: käʹtted
 !! V+Inf, Ind+Prs+Pl1, Ind+Prs+Pl2, Imprt+Pl1, Imprt+Pl2
 !! Actio, ActEss, PrsPrc
 
@@ -4012,19 +4012,19 @@ LEXICON V0_1E_VQKK !!= * @CODE@ câʹǩǩed:câ%^1VOW%{ʹØ%}kk
 !! +V+Ind+Prs+Sg3, Ind.Prt.ConNeg, PrfPrc
 
 !! Strong-LowVowel-Palatalization
-+Ind+Prs+Pl3:%^PAL%>e K ; !!= * @CODE@ (3) +V+Ind+Prs+Pl3: käʹtte
++Ind+Prs+Pl3:%^PAL%^PALK%>e K ; !!= * @CODE@ (3) +V+Ind+Prs+Pl3: käʹtte
 !! +V+Ind+Prs+Pl3
 
 !! ExtraStrong-RaisedVowel-Palatalization
-:%^VOWRaise%^PAL%> VSUF-IND-PRT-PL3_ED ; !!= * @CODE@ (4) +V+Ind+Prt+Pl3: joʹtte
+:%^VOWRaise%^PAL%^PALK%> VSUF-IND-PRT-PL3_ED ; !!= * @CODE@ (4) +V+Ind+Prt+Pl3: joʹtte
 !! +V+Ind+Prt+Pl3,  Ind+Prt+Sg1, Ind+Prt+Sg2, Ind+Prt+Sg4
 
 !! Strong-StableV-Palatalization
-:%^V2VV%^PAL VSUF-IND-PRS-CONNEG_ED ; !!= * @CODE@ (5) +V+Imprt+Sg2: kääʹtt
+:%^V2VV%^PAL%^PALK VSUF-IND-PRS-CONNEG_ED ; !!= * @CODE@ (5) +V+Imprt+Sg2: kääʹtt
 !! Imprt+Sg2, Ind+Prs+ConNeg, Ind+Prs+Sg4, VAbess, GerTemp, GerInstr
 
 !! Strong-RaisedVowel-Palatalization
-:%^V2VV%^VOWRaise%^PAL VSUF-POTENTIAL_ED ; !!= * @CODE@  (6) +V+Pot+Sg3: kaaʹttež
+:%^V2VV%^VOWRaise%^PAL%^PALK VSUF-POTENTIAL_ED ; !!= * @CODE@  (6) +V+Pot+Sg3: kaaʹttež
 !! Ind+Prt+Sg3, Ind+Prt+Pl1, Ind+Prt+Pl2, Pot,
 
 !! Strong-LowVowel-No-palatalization
@@ -4039,11 +4039,11 @@ LEXICON V0_1E_VQKK !!= * @CODE@ câʹǩǩed:câ%^1VOW%{ʹØ%}kk
 !! Imprt+Pl3
 
 !! (10) Allegro for incoative: käʹđ»
-:%^PAL%^CC2CAllegro%>e FOR-ALLEGRO-DEVERBAL-DERIVATION ;
+:%^PAL%^CC2CAllegro%^PALK%>e FOR-ALLEGRO-DEVERBAL-DERIVATION ;
 +Use/NGminip+Use/SpellNoSugg:%^PAL%>e FOR-ALLEGRO-DEVERBAL-DERIVATION ; !!= * @CODE@ largo
 
 !! (11) Present Participle:
-:%^VOWRaise%^PAL%> FOR-VSUF-PRSPRC_ED ; !!= * @CODE@ (11) +V+Act+PrsPrc: solõʹtti
+:%^VOWRaise%^PAL%^PALK%> FOR-VSUF-PRSPRC_ED ; !!= * @CODE@ (11) +V+Act+PrsPrc: solõʹtti
 
 !! (12) Weak-RaisedVowel-NoPalatalization
 :%^V2VV%^VOWRaise VSUF-CHED_ED ; !!= * @CODE@  (12) +Der+Der/ched: solõõtt-

diff --git a/src/fst/morphology/phonology.twolc b/src/fst/morphology/phonology.twolc
@@ -323,7 +323,7 @@ BetweenVowLengthAndPALNo = [NeutrVowHeight NeutrDiphPALTint ] ;
 BetweenVowHeightAndConsGrade = [(NeutrDiphPALTint (%^Allegro:) %^PAL:|(%^PALÂ:|%^PALÕ:) (%^Allegro:) %^PALNo:)] ;
 !! `BetweenVowHeightAndConsGrade = [((%^PALE:\|%^PALÄ:\|%^PALẸ:\|%^PALÕ:) (%^Allegro:) %^PAL:\|(%^PALÂ:\](%^PALÕ:) (%^Allegro:) %^PALNo:)) ;`
 
-BetweenVowHeightAndMorph = [  (NeutrDiphPALTint (%^Allegro:) %^PAL:|(%^PALÂ:|%^PALÕ:) (%^Allegro:) %^PALNo:) ([(%^Allegro:) %^CC2C:|(%^Allegro:) %^CC2CAllegro:]|%^C2CC:|%^YXX2YX:|%^K2GG:|%^KK2GG:|%^CC2CCC:|%^CCC2C:|%^CCC2CC:|%^YXX2VX:|%^YXX2VXX:|%^KKK2GG:) RBound ] ;
+BetweenVowHeightAndMorph = [  (NeutrDiphPALTint (%^Allegro:) %^PAL:|(%^PALÂ:|%^PALÕ:) (%^Allegro:) %^PALNo:) ([(%^Allegro:) %^CC2C:|(%^Allegro:) %^CC2CAllegro:]|%^C2CC:|%^YXX2YX:|%^K2GG:|%^KK2GG:|%^CC2CCC:|%^CCC2C:|%^CCC2CC:|%^YXX2VX:|%^YXX2VXX:|%^KKK2GG:) (%^PALK:) RBound ] ;
 
 
 BetweenPALNoAndMorphRightArrow = [([(%^Allegro:) %^CC2C:|(%^Allegro:) %^CC2CAllegro:]|%^C2CC:|%^YXX2YX:|%^K2GG:|%^KK2GG:|%^CC2CCC:|%^CCC2C:|%^CCC2CC:|%^YXX2VX:|%^YXX2VXX:|%^KKK2GG:) ] ;
@@ -1366,7 +1366,7 @@ OnSetC u: _   (ʹ:|%{ʹØ%}:) [Cns:+ (%{XC%}:)|Cns:+ (ˈ:|:ˈ) Cns:+|r d d:]  %^
  %^1VOW:ä <=>
  OnSetC [ä|Ä] _ (i|:u) (ʹ:|%{ʹØ%}:) Cns:+ %^V2VV: BetweenVowHeightAndMorph ;
 ! OnSetC [ä|Ä] _ (i|:u) (ʹ:|%{ʹØ%}:) Cns:+ %^V2VV: ;
- OnSetC ä _ (ʹ:|%{ʹØ%}:) Cns:+ %^V2VV: ([(%^Allegro:) (%^PAL:) %^CC2C:|(%^Allegro:) (%^PAL:) %^CC2CAllegro:|%^YXX2YX:]) RBound ;
+ OnSetC ä _ (ʹ:|%{ʹØ%}:) Cns:+ %^V2VV: ([(%^Allegro:) (%^PAL:) %^CC2C:|(%^Allegro:) (%^PAL:) %^CC2CAllegro:|%^YXX2YX:]) (%^PALK:) RBound ;
 !!€ ä^1VOWldd^V2VV^CC2C
 !!€ ääld000
 !!€ jä^1VOWu0rr^V2VV^PAL^CC2C
@@ -2772,7 +2772,8 @@ e:  _ (%{ʹØ%}: h:|%{ʹØ%}: v:|i|u) [:ʹ|%{ʹØ%}:ʹ]  [Cns:+ (%{XC%}:)|Cns:+
 
 "even syllabic verbs I, 'lgg>'lj"
 !! **@RULENAME@** - used in
- g:j  <=> Vow: (%^1VOW:)  [ i [:ʹ|%{ʹØ%}:ʹ] |[:ʹ|%{ʹØ%}:ʹ] [l|r|d:]]  _ g: NeutrVowLenghtHeight (%^PAL:) %^YXX2YX: %^PALK: ;
+ g:j  <=> Vow: (%^1VOW:)  [ i [:ʹ|%{ʹØ%}:ʹ] |[:ʹ|%{ʹØ%}:ʹ] [l|r|d:]]  _ g: NeutrVowLenghtHeight (%^PALE:|^PALẸ:) (%^PAL:) %^YXX2YX: %^PALK: ;
+!2024-11-06 Vow: (%^1VOW:)  [ i [:ʹ|%{ʹØ%}:ʹ] |[:ʹ|%{ʹØ%}:ʹ] [l|r|d:]]  _ g: NeutrVowLenghtHeight (%^PAL:) %^YXX2YX: %^PALK: ;
 !! vueʹlǧǧed+V+Ind+Prt+Pl1
 !!€ vuâ0lgg^VOWRaise^PAL^XYY2XY>im
 !!€ vuõʹlj0000>im
@@ -2781,7 +2782,7 @@ e:  _ (%{ʹØ%}: h:|%{ʹØ%}: v:|i|u) [:ʹ|%{ʹØ%}:ʹ]  [Cns:+ (%{XC%}:)|Cns:+
 !! reäiʹǧǧ+N+Pl+Nom
 !!€ reäi0gg^PAL^XYY2XY
 !!€ reäiʹj000
-   Vow: (%^1VOW:)  [ i [:ʹ|%{ʹØ%}:ʹ] |[:ʹ|%{ʹØ%}:ʹ] [l|r|d:]]  _ g: Vow: Cns:* PenNeutrVowLenghtHeight (%^Pen: %^PAL:) %^Pen: %^YXX2YX: (%^Pen:) %^PALK: ;
+   Vow: (%^1VOW:)  [ i [:ʹ|%{ʹØ%}:ʹ] |[:ʹ|%{ʹØ%}:ʹ] [l|r|d:]]  _ g: Vow: Cns:* PenNeutrVowLenghtHeight (%^Pen: %^PALE:|%^Pen: ^PALẸ:) (%^Pen: %^PAL:) %^Pen: %^YXX2YX: (%^Pen:) %^PALK: ;