Add a special type of contlex for dealing with Pl+Nom/Sg+Abe/Sg+Gen/S…

…g+Acc This is used in parallel with full paradigms, which will otherwise have the same forms. @trondtynnol can you update nds.
giellalt · Jun 28, 2024 · 21a60ea · 21a60ea
1 parent 882566f
commit 21a60ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
@@ -9297,6 +9297,11 @@ LEXICON NMN_KHEEQSTES !!= * @CODE@ ǩeeʹstes:ǩeâsttes
 :%^RmVow PL-OBL ;					! ǩeâsttsi
 :%^RmVow VOONYS-STEM-PX ; !!= * @CODE@ võnns-
 
+LEXICON N_SYYQRVES_PL_NOM/HOMONYM
+! this deals with an extra piece of paradigm
+:%^PenVow2a%^RmCns SG-ABE/ACC/GEN ;	 		! sârrva
+:%^PenVow2a%^RmCns PL-NOM ;	 		! sârrva
+
 LEXICON N_VIEQLPES !!= * @CODE@ vieʹlpes:ǩeâlppes
 !!! inflection_type="2"
 : NMN_VIEQLPES ;
@@ -9310,7 +9315,7 @@ LEXICON NMN_VIEQLPES !!= * @CODE@ vieʹlpes:ǩeâ%{ʹØ%}lppes
 ! Stem vowel: e
 !! * Yaml: **N-veelpes**
 :%^Pen%^PALE%^Pen%^PAL%^Pen%^XYY2XY SG-NOM ;	     	! vieʹlpes
-:%^PenVow2a%^RmCns SG-ABE/ACC/GEN ;	 		! viâlpta
+:%^PenVow2a%^RmCns SG-ABE/ACC/GEN ;	 		! viâlppa
 :%^RmVow%>a SG-ILL ;	  			! viâlppsa
 :%^RmVow%>e SG-LOC ;				! viâlppsest
 :%^RmVow SG-COM_IN ;				! viâlppsin

diff --git a/src/fst/morphology/stems/N_sms2x.lexc b/src/fst/morphology/stems/N_sms2x.lexc
@@ -15159,6 +15159,7 @@ sââʹrrsââidõs+N:sââʹrrsââidõ%^1VOW%{ʹØ%}s N_SAJOS  "mustikkapaikka
 sââʹrrsäʹpp+N:sââʹrr#sä%^1VOW%{ʹØ%}pp N_LOAQDD  "mustikkamehu" ;
 sââʹrrčâʹlmm+N:sââʹrr#čâ%^1VOW%{ʹØ%}lmm N_KAQLBB  "mustikka" ;
 sââʹrves+N+Sem/Ani:sâ%^1VOW%{ʹØ%}rvves N_KAAQRBES  "hirvas" ;
+sââʹrves+v2+N+Sem/Ani:sâ%^1VOW%{ʹØ%}rvves N_SYYQRVES_PL_NOM/HOMONYM  "hirvas" ;
 sââʹveǩ-kurr+N:sââʹveǩ#ku%^1VOW%{ʹØ%}rr N_TOLL  "olas" ;
 sââʹveǩjââlǥõk+N:sââʹveǩjââlǥõ%^1VOW%{ʹØ%}k N_SAJOS  "hanki" ;
 sââʹveǩmuõrr+N:sââʹveǩ#muõ%{ʹØ%}rr N_MUORR  "suksipuu" ;
@@ -20929,6 +20930,7 @@ zåårdâsttmõš+v2+N+Use/SpellNoSugg:zåårdâstt»mu%^1VOW%{ʹØ%}š N_SAJOS
 åålǥummuš+v2+N+Err/Orth:åålǥumu%^1VOW%{ʹØ%}š N_SAJOS  "loitontaminen" ;
 ååranj+N:ååranj N_AANAR  "hirvas" ;
 ååranjsââʹrves+N:ååranj#sâ%^1VOW%{ʹØ%}rvves N_KAAQRBES  "hirvas" ;
+ååranjsââʹrves+v2+N:ååranj#sâ%^1VOW%{ʹØ%}rvves N_SYYQRVES_PL_NOM/HOMONYM  "hirvas" ;
 åårkaž+N:åårk N_KUYLAZH  "urakka" ;
 åårkõtpiâckk+N:åårkõtpiâ%{ʹØ%}ckk N_MIYRKK  "peski" ;
 åårkõtt+N:åår#kõ%^1VOW%{ʹØ%}tt N_TOLL  "talja" ;

diff --git a/src/fst/morphology/stems/N_sms2x.xml b/src/fst/morphology/stems/N_sms2x.xml
@@ -314592,6 +314592,7 @@
      </etymology>
      <stg>
        <st Contlex="N_KAAQRBES" inflexId="1.2">sâ%^1VOW%{ʹØ%}rvves</st>
+       <st Contlex="N_SYYQRVES_PL_NOM/HOMONYM" varid="2">sâ%^1VOW%{ʹØ%}rvves</st>
      </stg>
      <inc-audio>
        <c name="ID_Audio">399</c>
@@ -428969,6 +428970,7 @@
      <l pos="N">ååranjsââʹrves</l>
      <stg>
        <st Contlex="N_KAAQRBES" NumContlex="1.2">ååranj#sâ%^1VOW%{ʹØ%}rvves</st>
+       <st Contlex="N_SYYQRVES_PL_NOM/HOMONYM" varid="2">ååranj#sâ%^1VOW%{ʹØ%}rvves</st>
      </stg>
    </lg>
      <sources>