This should take care of ǩ and ǧ nouns

@trondtynnol
giellalt · Dec 18, 2024 · f69450d · f69450d
1 parent a1b13ef
commit f69450d
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 56 deletions.
diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
@@ -4244,6 +4244,58 @@ LEXICON NMN_PUIQCC
 !:%^PAL%^YXX2YX%^PALK E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) kuʹvǯ-
 !:%^PAL%^PALK  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) kuʹvǯǯ Ess+Px..
 
+LEXICON N_1E_UQVKK !!= * @CODE@ juʹvjj:ju%^1VOW%{ʹØ%}v%{ʹØ%}jj
+!!! inflection_type="?"
+!! N_1E_UQVCC
+! vowel: monophthong
+: NMN_1E_UQVKK ;
+LEXICON NMN_1E_UQVKK
+!! Sg_Nom: vow_mono:vow_short:vow_high_u:pal_yes:cns_vyy
+! gradation: yes
+!! ## 1. WORDS WITH SINGLE-SYLLABLE NOMINATIVE SINGULARS (2009: 180)
+!! ## 1.3 Sg.Loc in -est (vowel shift)
+!!  Raised: Sg.Com, Pl.Obl
+!!  Lowered: ELSE
+!!  e-stems (Sg.Loc, Ess, Par).
+!! ## 1.3.2 Sg.Ill vowel -a
+!! ## 1.3.2.1 Has Palatalization
+!!  Palatalized: ELSE
+!!  Not Palatalized: Sg.Ill
+!! ## 1.3.2.1.1 Lacks Specifically Pedagogical Gradation
+!! ## 1.3.2.1.1.1 Has Orthographic Gradation
+!! ## 1.3.2.1.1.1[] (Monophthong + Consonant Cluster)
+!!  Strong grade: Sg.Nom, Ess, Par
+!!  Strong grade: Sg.Ill
+!!  Weak grade: Pl.Nom, Sg.Loc, Sg.Com
+!! ## FORMS
+!! ## (1) Sg.Nom: juʹvjj
+!! ## (2) Pl.Nom: juuʹj
+!! ## (3) Sg.Ill: joujja
+!! ## (4) Sg.Loc: juuʹjest
+!! ## (5) Sg.Com: juuʹjin
+!! ## (6) Ess: juʹvjjen
+!! ## (7) Par: juʹvjjed
+!! ## (8) Pl.Acc: juuʹjid
+!! ## (9) Der/Dimin.N.Sg.Nom: jooujaž
+!! NumContLex="1.113"
+!! Is for nouns with *-est* Loc, Extra long vowel
+!! * Yaml: **N-juvjj**
+:%^PAL E-STEM_SG-NOM ;
+:%^PAL%^YXX2VX E-STEM_SG-ABE/ACC/GEN ;
+!+Use/NGminip+Use/NG:%^V2VV%^PAL%^YXX2YX E-STEM_SG-ABE/ACC/GEN ;
+:%^YXX2VX A_DER/LAZH ;
+:%^PAL%^YXX2VX PL-NOM ;
+:%^VOWLower%^YXX2VXX E-STEM_SG-ILL ; !joujja
+:%^PAL%^YXX2VX%>e SG-LOC ;
+!+Use/NGminip+Use/NG:%^V2VV%^PAL%^YXX2YX%>e SG-LOC ;
+:%^PAL%^YXX2VX SG-COM_IN ;
+:%^PAL%>e ESS/PAR ; ! ess and prt without
+:%^PAL%^YXX2VX%> E-STEM_PL-OBL ;
+:%^V2VV%^VOWLower%^YXX2VX E-STEM_N_KUYLAZH ; !!= * @CODE@ jooujaž
+ E-STEM-PX-RETAIN-WITHOUT-PAL ;   !!= * @CODE@ (10) juvjj-
+:%^Allegro%^PAL%^YXX2VX E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) juʹj-
+:%^PAL  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) juʹvjj Ess+Px..
+
 LEXICON N_JUQVJJ !!= * @CODE@ juʹvjj:ju%^1VOW%{ʹØ%}v%{ʹØ%}jj
 !!! inflection_type="?"
 !! N_1E_UQVCC
@@ -6405,6 +6457,39 @@ LEXICON NMN_NEIQBB
 :%^VV2V%^PAL%^YXX2YX E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) neiʹb 
 :%^PAL  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) neiʹbb Ess+Px..
 
+LEXICON N_1E_EUQKK !!= * @CODE@ peiʹvv:pẹ%^1VOWi%{ʹØ%}vv
+ NMN_1E_EUQKK ;
+LEXICON NMN_1E_EUQKK
+! gradation: yes
+!! ## 1. WORDS WITH SINGLE-SYLLABLE NOMINATIVE SINGULARS (2009: 180)
+!! ## 1.3 Sg.Loc in -est (no vowel shift, all lowered)
+!!  e-stems (Sg.Loc, Ess, Par).
+!! ## 1.3.2 Sg.Ill vowel -a
+!! ## 1.3.2.1 Has Palatalization
+!!  Palatalized: ELSE
+!!  Not Palatalized: Sg.Ill
+!! ## 1.3.2.1.1 Lacks Specifically Pedagogical Gradation
+!! ## 1.3.2.1.1.1 Has Orthographic Gradation
+!! ## 1.3.2.1.1.1[] (Monophthong + Consonant Cluster variation)
+!!  Strong grade: Sg.Nom, Ess, Par
+!!  Strong grade: Sg.Ill
+!!  Weak grade: Pl.Nom, Sg.Loc, Sg.Com
+!! ## FORMS
+!! * Yaml: **N-peivv**
+:%^PAL%^PALK E-STEM_SG-NOM ;	    !!= * @CODE@ (1) Sg.Nom: peiʹvv
+:%^V2VV%^PAL%^YXX2YX%^PALK E-STEM_SG-ABE/ACC/GEN ; !!= * @CODE@ (2) Pl.Nom: peeiʼv
+:%^YXX2YX A_DER/LAZH ;
+:%^V2VV%^PAL%^YXX2YX%^PALK PL-NOM ; !!= * @CODE@ (2) Pl.Nom: peeiʼv
+: E-STEM_SG-ILL ;		      !!= * @CODE@ (3) Sg.Ill: pẹivva
+:%^V2VV%^PAL%^YXX2YX%^PALK%>e SG-LOC ;	      !!= * @CODE@ (4) Sg.Loc: peeiʹvest
+:%^V2VV%^PAL%^YXX2YX%^PALK SG-COM_IN ;	      !!= * @CODE@ (5) Sg.Com: peeiʹvin
+:%^PAL%>e ESS/PAR ; 		  !!= * @CODE@ (6) Ess: peiʹvven
+:%^V2VV%^PAL%^YXX2YX%^PALK E-STEM_PL-OBL ; !!= * @CODE@ (8) Pl.Acc: peeiʹvid
+:%^V2VV%^YXX2YX E-STEM_N_KUYLAZH ; !!= * @CODE@ (9) Der/Dimin.N.Sg.Nom: pẹẹivaž
+ E-STEM-PX-RETAIN-WITHOUT-PAL ;   !!= * @CODE@ (10) pẹivv-
+:%^PAL%^YXX2YX%^PALK E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) peiʹv-
+:%^PAL%^PALK  E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) peiʹvv Ess+Px..
+
 LEXICON N_1E_EUQCC !!= * @CODE@ peiʹvv:pẹ%^1VOWi%{ʹØ%}vv
  NMN_1E_EUQCC ;
 LEXICON N_PEIQVV !!= * @CODE@ peiʹvv:pẹ%^1VOWi%{ʹØ%}vv

diff --git a/src/fst/morphology/affixes/propernouns.lexc b/src/fst/morphology/affixes/propernouns.lexc
@@ -72,6 +72,9 @@ LEXICON PROP_TOP_TAQHTT
 :%^PAL ATTESTED-TOPONYM-STEM ;
  PROP_TAQHTT ;
 
+LEXICON PROP_TOP_1E_EAQYKK
+:%^PAL ATTESTED-TOPONYM-STEM ;
+: NMN_1E_EAQYKK ;
 LEXICON PROP_TOP_JEAQRMM
 :%^PAL ATTESTED-TOPONYM-STEM ;
 PROP_JEAQRMM ;
@@ -380,6 +383,8 @@ LEXICON PROP_LOAQDD
 
 !LEXICON PROP_SEM/PLC_JAEUQRR
 !+Sem/Plc: NMN_JAEUQRR ;
+LEXICON PROP_TOP_1E_VUQKK  !!= * @CODE@ päiʹǩǩ:pä%^1VOWi%{ʹØ%}kk
+ NMN_1E_VUQKK ;
 LEXICON PROP_1E_VUQCC  !!= * @CODE@ jäuʹrr:jä%^1VOWu%{ʹØ%}rr
  NMN_1E_VUQCC ;
 LEXICON PROP_JAEUQRR
@@ -630,9 +635,12 @@ LEXICON PROP_JUEQLGHGH_mal
 +Sem/Mal+Cmp/SgNom:%^PALE%^PAL ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_JUEQLGHGH ;
 
-LEXICON PROP_SAIQMM_mal
+!LEXICON PROP_SAIQMM_mal
+!+Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
+!+Sem/Mal: NMN_SAIQMM ;
+LEXICON PROP_1E_EUQKK_mal
 +Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
-+Sem/Mal: NMN_SAIQMM ;
++Sem/Mal: NMN_1E_EUQKK ;
 LEXICON PROP_KRIQLCC_mal
 +Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_KRIQLCC ;
@@ -642,6 +650,10 @@ LEXICON PROP_KUYLAZH_mal
 LEXICON PROP_KOALVAK_mal
 +Sem/Mal+Cmp/SgNom: ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_KOALVAK ;
+
+LEXICON PROP_1E_UQKK_mal
++Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
++Sem/Mal: NMN_1E_UQKK ;
 LEXICON PROP_1E_VQYKK_mal
 +Sem/Mal+Cmp/SgNom:%^PAL ATTESTED-MALE-STEM ;
 +Sem/Mal: NMN_1E_VQYKK ;

diff --git a/src/fst/morphology/stems/N_Prop_Toponyms_sms2x.lexc b/src/fst/morphology/stems/N_Prop_Toponyms_sms2x.lexc
@@ -120,7 +120,7 @@ Lått+N+Prop+Sem/Plc:Lå%^1VOWtt PROP_TOP_PESS  "Lutto" ;
 Låttjokk+N+Prop+Sem/Plc:Lått#jo%^1VOW%{ʹØ%}kk PROP_TOP_1Y_VKK_VVGG  "Luttojoki" ;
 Maadd-Lääʹddjânnam+N+Prop+Sem/Plc:Maadd-Lääʹdd#jânnam PROP_TOP_AANAR  "Manner-Suomi" ;
 Maaddvuõnn+N+Prop+Sem/Plc:Maadd#vuõ%{ʹØ%}nn PROP_TOP_MUORR  "Maattivuono" ;
-Maaseäʹlǧǧ+N+Prop+Sem/Plc:Maa#seä%{ʹØ%}lgg PROP_TOP_JEAQRMM  "Maaselkä" ;
+Maaseäʹlǧǧ+N+Prop+Sem/Plc:Maa#seä%{ʹØ%}lgg PROP_TOP_1E_EAQYKK  "Maaselkä" ;
 Maaʒʒsâžjäuʹrr+N+Prop+Sem/Plc:Maaʒʒsâž#jä%^1VOWu%{ʹØ%}rr PROP_TOP_JAEUQRR  "Maatsasjärvi" ;
 Maiddeǩkuõškk+N+Prop+Sem/Plc:Maiddeǩ#kuõ%{ʹØ%}škk PROP_TOP_CHUOSHKK  "Maitokoski" ;
 Maʹrnnjäuʹrr+N+Prop+Sem/Plc:Maʹrnn#jä%^1VOWu%{ʹØ%}rr PROP_TOP_JAEUQRR  "Marinajärvi" ;
@@ -332,7 +332,7 @@ Veäʹsǩǩviõrr+N+Prop+Sem/Plc:Veäʹsǩǩ#viõ%{ʹØ%}rr PROP_TOP_MUORR  "Vas
 Veʹrddnjargg+N+Prop+Sem/Plc:Veʹrddnja%^1VOW%{ʹØ%}rgg PROP_TOP_ALGG  "Virtaniemi" ;
 Veʹrddčuäʹlmm+N+Prop+Sem/Plc:Veʹrdd#čuä%{ʹØ%}lmm PROP_TOP_JEAQRMM  "Virtasalmi" ;
 Viõʹlǧǧesmiârr+N+Prop+Sem/Plc:Viõʹlǧǧes#miâ%{ʹØ%}rr PROP_TOP_PUOAVV  "Vienanmeri" ;
-Vueiʹvvkäällpäiʹǩǩ+N+Prop:Vueiʹvvkäällpäiʹǩǩ PROP_TOP_  "Pääkallopaikka" ;
+Vueiʹvvkäällpäiʹǩǩ+N+Prop:Vueiʹvv#kääll#pä%^1VOWi%{ʹØ%}kk PROP_TOP_1E_VUQKK  "Pääkallopaikka" ;
 Vueʹrjem+N+Prop+Sem/Plc:Vueʹrjem PROP_TOP_AANAR  "Vuoremi" ;
 Vueʹrnsjäuʹrr+N+Prop+Sem/Plc:Vueʹrns#jä%^1VOWu%{ʹØ%}rr PROP_TOP_JAEUQRR  "Vuernisjärvi" ;
 Vuâskjäuʹrr+N+Prop+Sem/Plc:Vuâsk#jä%^1VOWu%{ʹØ%}rr PROP_TOP_JAEUQRR  "Ahvenjärvi" ;

diff --git a/src/fst/morphology/stems/N_Prop_Toponyms_sms2x.xml b/src/fst/morphology/stems/N_Prop_Toponyms_sms2x.xml
@@ -3295,7 +3295,7 @@
    <lg>
      <l pos="N" sem_type="Plc" type="Prop">Maaseäʹlǧǧ</l>
      <stg>
-       <st Contlex="PROP_TOP_JEAQRMM">Maa#seä%{ʹØ%}lgg</st>
+       <st Contlex="PROP_TOP_1E_EAQYKK">Maa#seä%{ʹØ%}lgg</st>
      <mini_paradigm exclude="NDS">
        <analysis ms="Sg_Gen">
            <wordform>-sieʹlj</wordform>
@@ -9160,7 +9160,7 @@
    <lg>
      <l pos="N" sem_type="Plc" type="Prop">Vueiʹvvkäällpäiʹǩǩ</l>
      <stg>
-       <st Contlex="PROP_TOP_">Vueiʹvvkäällpäiʹǩǩ</st>
+       <st Contlex="PROP_TOP_1E_VUQKK">Vueiʹvv#kääll#pä%^1VOWi%{ʹØ%}kk</st>
      <mini_paradigm exclude="NDS">
        <analysis ms="Sg_Gen">
            <wordform>-pääiʹǩ</wordform>

diff --git a/src/fst/morphology/stems/N_Prop_sms2x.lexc b/src/fst/morphology/stems/N_Prop_sms2x.lexc
@@ -89,12 +89,12 @@ Kõõskâž+N+Prop+Sem/Mal:Kõõskâž PROP_mal  "Keskinen" ;
 Laaʹrkaž+N+Prop+Sem/Mal:Laaʹrk PROP_KUYLAZH_mal  "Laurukainen" ;
 Laaʹrvan+N+Prop+Sem/Mal:Laaʹrvan PROP_mal  "Hilarion" ;
 Leeukaž+N+Prop+Sem/Mal:Leeuk PROP_KUYLAZH_mal  "Leo" ;
-Leuʹǩǩ+N+Prop+Sem/Mal:Le%^1VOWu%{ʹØ%}kk PROP_SAIQMM_mal  "Leo" ;
+Leuʹǩǩ+N+Prop+Sem/Mal:Le%^1VOWu%{ʹØ%}kk PROP_1E_EUQKK_mal  "Leo" ;
 Leâukaž+N+Prop+Sem/Mal:Leâuk PROP_KUYLAZH_mal  "Leo" ;
 Liizz+N+Prop+Sem/Fem:Liizz PROP_fem  "Liisa" ;
 Loopptõs+N+Prop+Sem/Mal:Loopptõ%^1VOW%{ʹØ%}s PROP_5Y_VS_VVZZ_mal  "Loppunen" ;
 Lukkri+N+Prop+Sem/Fem:Lukkri PROP_fem  "Glikeria" ;
-Luʹǩǩ+N+Prop+Sem/Mal:Luʹǩǩ PROP_mal  "Luukas" ;
+Luʹǩǩ+N+Prop+Sem/Mal:Luʹǩǩ PROP_1E_UQKK_mal  "Luukas" ;
 Lääda+N+Prop+Sem/Mal:Lääd PROP_OAQLGA_mal  "Vladimir" ;
 Lääddaž+N+Prop+Sem/Mal:Läädd PROP_KUYLAZH_mal  "Vladimir" ;
 Läärvam+N+Prop+Sem/Mal:Läärvam PROP_AANAR_mal  "Lauri" ;

diff --git a/src/fst/morphology/stems/N_Prop_sms2x.xml b/src/fst/morphology/stems/N_Prop_sms2x.xml
@@ -4113,7 +4113,7 @@
    <lg>
      <l pos="N" sem_type="Mal" type="Prop">Leuʹǩǩ</l>
      <stg>
-       <st Contlex="PROP_SAIQMM_mal" inflexId="::::1.113">Le%^1VOWu%{ʹØ%}kk</st>
+       <st Contlex="PROP_1E_EUQKK_mal" inflexId="::::1.113">Le%^1VOWu%{ʹØ%}kk</st>
      </stg>
      <inc-audio>
        <c name="ID_Audio">3171</c>
@@ -4323,7 +4323,7 @@
    <lg>
      <l pos="N" sem_type="Mal" type="Prop">Luʹǩǩ</l>
      <stg>
-       <st Contlex="PROP_mal" inflexId="::::1.114">Luʹǩǩ</st>
+       <st Contlex="PROP_1E_UQKK_mal" inflexId="::::1.114">Luʹǩǩ</st>
      </stg>
      <inc-audio>
        <c name="ID_Audio">3173</c>