diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc index b377e57e9..e66a0f6e7 100644 --- a/src/fst/morphology/affixes/nouns.lexc +++ b/src/fst/morphology/affixes/nouns.lexc @@ -1948,7 +1948,7 @@ LEXICON 4KUNAGAS !!≈ * **@CODE@** 4KUNAGAS_PL ; -LEXICON X_KUNAGAS !!≈ * **@CODE@** +LEXICON X_KUNAGAS !!≈ * **@CODE@** stem: kunâgâss X_KUNAGAS_SG ; X_KUNAGAS_PL ; @@ -1967,6 +1967,7 @@ LEXICON 4KUNAGAS_SG !!≈ * **@CODE@** +N+Ess:^FCD%>n CPXsuff ; ! kunâgâsnâd +N:^FCD%> Nom_DER ; +N:^FCD%> Gen_DER ; !njuolgâduslâš ++N+Der1+Der/Dimin: 4KUNAGAS_SG_DIM ; LEXICON 4KUNAGAS_PL !!≈ * **@CODE@** > +N: X_KUNAGAS_PL ; @@ -1977,6 +1978,7 @@ LEXICON 4KUNAGAS_PL !!≈ * **@CODE@** > +N+Pl+Ill:^FCD%>âid CPXsuff ; ! +N+Pl+Loc:^FCD%>âin CPXsuff ; ! +N+Pl+Com:^FCD%>âid CPXsuffCOM ; ! ++N+Der1+Der/Dimin: 4KUNAGAS_PL_DIM ; LEXICON X_KUNAGAS_SG !!≈ * **@CODE@** this is for loanwords without stem change, 3-syll. cons end +Sg+Nom:^FCD K ; ! kunâgâs @@ -2146,8 +2148,8 @@ LEXICON 4PUHELIN !!≈ * **@CODE@** stem: puhelim +N+Pl+Ill:%>ijd CPXsuff ; ! +N+Pl+Loc:%>ijn CPXsuff ; ! +N+Pl+Com:%>ijd CPXsuffCOM ; ! -+N: 4JOTOLAH_SG_DIM ; -+N: 4JOTOLAH_PL_DIM ; ++N+Der1+Der/Dimin: 4JOTOLAH_SG_DIM ; ++N+Der1+Der/Dimin: 4JOTOLAH_PL_DIM ; !! ### 2KOLLIISTALLAM lexicon family @@ -2200,7 +2202,7 @@ JOHTOLAH_OBL ; +N+Cmp/SgGen:uv Rhash ; ! XXX +N+Cmp/PlGen:uvâ%>i Rhash ; ! XXX +N:âh Nom_DER ; -+N:uv 4JOTOLAH_SG_DIM ; ++N+Der1+Der/Dimin:uv 4JOTOLAH_SG_DIM ; LEXICON JOHTOLAH_OBL !!≈ * **@CODE@** common for N and A +N+Sg+Gen:uv K ; @@ -2237,7 +2239,7 @@ LEXICON 4JOTOLAH_PL !!≈ * **@CODE@** +N+Pl+Ill:%>uvid CPXsuff ; ! +N+Pl+Loc:%>uvin CPXsuff ; ! +N+Pl+Com:%>uvid CPXsuffCOM ; ! -+N:uv 4JOTOLAH_PL_DIM ; ++N+Der1+Der/Dimin:uv 4JOTOLAH_PL_DIM ; LEXICON 4KAPULUH !!≈ * **@CODE@** stem: kápul +N+Sg+Nom:uh K ; @@ -2253,7 +2255,7 @@ LEXICON 4KAPULUH !!≈ * **@CODE@** stem: kápul +N+Cmp/SgGen:uv Rhash ; ! XXX +N+Cmp/PlGen:uvâ%>i Rhash ; ! XXX +N:âh Nom_DER ; -+N:uv 4JOTOLAH_SG_DIM ; ++N+Der1+Der/Dimin:uv 4JOTOLAH_SG_DIM ; JOHTOLAH_OBL ; 4JOTOLAH_PL ; @@ -2264,7 +2266,7 @@ LEXICON 4KUBALOH !!≈ * **@CODE@** stem: kubál +N+Cmp/SgGen:uv Rhash ; ! XXX +N+Cmp/PlGen:uvâ%>i Rhash ; ! XXX +N:âh Nom_DER ; -+N:uv 4JOTOLAH_SG_DIM ; ++N+Der1+Der/Dimin:uv 4JOTOLAH_SG_DIM ; JOHTOLAH_OBL ; 4JOTOLAH_PL ; @@ -2497,7 +2499,7 @@ LEXICON 3EEMEED !!≈ * **@CODE@** 3EEMEED_SG ; 3EEMEED_PL ; -LEXICON X_EEMEED !!≈ * **@CODE@** +LEXICON X_EEMEED !!≈ * **@CODE@** stem: eemeed X_EEMEED_SG ; :^CSH^SVSH X_eh_PL ; @@ -2517,7 +2519,7 @@ LEXICON 3EEMEED_SG !!≈ * **@CODE@** +N+Sg+Com:^CSH^SVSH%>ijn CPXsuff ; ! emedijnân +N:%> Gen_DER ; ! +N:%> Nom_DER ; !eennâmlâš -+N+Der1+Der/Dimin:^CSH^SVSHá 4C_RASTAGAS_SG ; !njuámmilâš ++N+Der1+Der/Dimin:^CSH^SVSH 3EEMEED_SG_DIM ; !njuámmilâš LEXICON 3EEMEED_PL !!≈ * **@CODE@** @@ -2530,7 +2532,7 @@ LEXICON 3EEMEED_PL !!≈ * **@CODE@** +N+Pl+Ill:^CSH^SVSH%>ijd CPXsuff ; ! +N+Pl+Loc:^CSH^SVSH%>ijn CPXsuff ; ! emedijnis +N+Pl+Com:^CSH^SVSH%>ijd CPXsuff ; ! emedijdiskijn -+N+Der1+Der/Dimin:^CSH^SVSHá 4C_RASTAGAS_PL ; !njuámmilâš ++N+Der1+Der/Dimin:^CSH^SVSH 3EEMEED_PL_DIM ; !njuámmilâš LEXICON X_EEMEED_SG !!≈ * **@CODE@** +Sg+Nom: K ; ! eemeed @@ -3171,7 +3173,7 @@ LEXICON 3CEVE !!≈ * **@CODE@** only for this lemma. It could go to 3LYEME but +N+Der1+Der/Dimin:iäpáttá 4C_RASTAGAS_PL ; !njuámmilâš -LEXICON 3LYEME !!≈ * **@CODE@** +LEXICON 3LYEME !!≈ * **@CODE@** stem: luámmá^SVn^ÁE +N+Sg+Nom:^FCD^WG^RLEN^SVSH K ; ! lyeme savo +N+Cmp/SgNom:^FCD^WG^RLEN^SVSH%> Rhash ; ! lyemelitte +N+Cmp/SgGen: Rhash ; @@ -3189,8 +3191,8 @@ LEXICON 3LYEME !!≈ * **@CODE@** +N:^CSH^SVSH X_eh_PL ; +N:^FCD^WG^SVSH%> Nom_DER ; +N:%> Gen_DER ; -+N+Der1+Der/Dimin:^CSH^SVSHá 4C_RASTAGAS_SG ; !njuámmilâš -+N+Der1+Der/Dimin:^CSH^SVSHá 4C_RASTAGAS_PL ; !njuámmilâš ++N+Der1+Der/Dimin:^CSH^SVSH 3EEMEED_SG_DIM ; ! ++N+Der1+Der/Dimin:^CSH^SVSH 3EEMEED_PL_DIM ; ! @@ -3343,13 +3345,14 @@ LEXICON X_KAAMUV_COMMON !!≈ * **@CODE@** -LEXICON C_POOVIJC !!≈ * **@CODE@** +LEXICON C_POOVIJC !!≈ * **@CODE@** stem: puáhhá +N+v1+Sg+Nom:j^ÁI^WG K ; ! poovij puáhhá +N+v1+Sg+Nom:j^ÁI^WG K ; ! poovij +N+v1+Sg+Ill:%>i K ; ! kammui +N+v1+Sg+Loc:%>st K ; ! puáhhást +N+v1+Ess:n^CSH%>in K ; ! puáhánin +N+v1+Par:n^CSH%>id K ; ! puáhánid ++N+Der1+Der/Dimin: 3OPPUS ; ! dim as for oppuš +N+v1: X_KAAMUV_COMMON ; 3POOVIJ ; @@ -4083,7 +4086,7 @@ LEXICON X_RASTAGAS_SG !!≈ - *@CODE@* sg cases +Par:âžž%>âd K ; ! rástágâžžâd -LEXICON 3OPPUS !!≈ * **@CODE@** +LEXICON 3OPPUS !!≈ * **@CODE@** stem: oppu 3OPPUS_SG ; 3OPPUS_PL ; @@ -4091,12 +4094,12 @@ LEXICON 3OPPUS_SG +N+Sg+Nom:š K ; ! oppuš +N+Sg+Gen:^SVž^SLEN%>ii K ; ! oppuužii +N+Sg+Acc:^SVž^SLEN%>ii K ; ! oppuužii -+N+Sg+Ill:^SVž^SLEN%>ân K ; ! oppuužân ++N+Sg+Ill:^SVž^SLEN%>ân K ; ! oppuužân +N+Sg+Loc:^SVž^SLEN%>iist K ; ! oppuužiist +N+Sg+Com:^SVž^SLEN%>áin K ; ! oppuužáin +N+Sg+Abe:^SVž^SLEN%>iittáá K ; ! oppuužiittáá -+N+Ess:^SVž^SLEN%>in K ; ! oppuužin -+N+Par:^SVž^SLEN%>id K ; ! oppuužid ++N+Ess:^SVž^SLEN%>in K ; ! oppuužin ++N+Par:^SVž^SLEN%>id K ; ! oppuužid LEXICON 3OPPUS_PL +N+Pl+Nom:^SVž^SLEN%>iih K ; ! oppuužiih @@ -4110,9 +4113,9 @@ LEXICON 3OPPUS_PL +N+Cmp/PlGen:^SVž^SLEN%>ij Rhash ; LEXICON 3ALMAS !!≈ * **@CODE@** -+N+Sg+Ill:ž%>ân K ; ! almažân -+N+Ess:ž%>in K ; ! almažin -+N+Par:ž%>id K ; ! almažid ++N+Sg+Ill:ž%>ân K ; ! almažân ++N+Ess:ž%>in K ; ! almažin ++N+Par:ž%>id K ; ! almažid +N+Sg+Nom:š K ; ! oppuš +N+Sg+Gen:^SVž^SLEN%>ii K ; ! oppuužii +N+Sg+Acc:^SVž^SLEN%>ii K ; ! oppuužii @@ -4564,8 +4567,8 @@ LEXICON 2KIRKKO_PL_DIM +N+Pl+Acc:^WG^VHIGH%>id K ; ! kirhuid +N+Pl+Ill:^WG^VHIGH%>id K ; ! kirhuid +N+Pl+Loc:^WG^VHIGH%>in K ; ! kirhuin -+N+Pl+Com:^WG^VHIGH%>i GUIN ; ! kirhuiguin -+N+Pl+Abe:^WG^VHIGH%>ittáá K ; ! kirhuittáá ++N+Pl+Com:^WG^VHIGH%>i GUIN ; ! kirhuiguin ++N+Pl+Abe:^WG^VHIGH%>ittáá K ; ! kirhuittáá @@ -4685,8 +4688,57 @@ LEXICON 2AAIGA_DIM !!≈ * **@CODE@** !! 3LITTER --> 4C_RASTAGAS +LEXICON 3EEMEED_SG_DIM !!≈ - *@CODE@* the sg ones ++N: 3EEMEED_SG_DIM_CASE ; ! case paradigm ++N+Cmp/SgNom:%>âš Rhash ; ! compounds ++N+Cmp/SgGen:^SV^SLEN Rhash ; ! xxx check!! ++N+Cmp/PlGen:%>i Rhash ; ++N+Sg+Nom:%>á VPXsuff12nom ; ! px forms rástágáám ++N+Sg+Gen:%>á VPXsuff12 ; ! rástágáád ++N+Sg+Acc:%>á VPXsuff12 ; ! rástágáád ++N+Sg+Nom:%>á VPXsuff3 ; ! rástágáás ++N+Sg+Gen:%>á VPXsuff3 ; ! rástágáás ++N+Sg+Acc:%>á VPXsuff3 ; ! rástágáás ++N+Sg+Ill:%>ás CPXsuff ; ! rástágáásân ++N+Sg+Loc:%>ást CPXsuff ; ! rástágáástân ++N+Sg+Com:%>áin CPXsuff ; ! rástágáinân ++N+Ess:%>ná VPXsuff12 ; + +LEXICON 3EEMEED_PL_DIM !!≈ - *@CODE@* the pl ones ++N: 3EEMEED_PL_DIM_CASE ; ++N+Cmp/PlGen:%>id Rhash ; ++N+Pl+Gen:%>id CPXsuff ; ! ++N+Pl+Acc:%>id CPXsuff ; ! ++N+Pl+Ill:%>id CPXsuff ; ! ++N+Pl+Loc:%>in CPXsuff ; ! ++N+Pl+Com:%>id CPXsuffCOM ; ! + + +LEXICON 3EEMEED_SG_DIM_CASE !!≈ - *@CODE@* sg cases ++Sg+Nom:%>âš K ; ! emedâš ++Sg+Gen:%>áá K ; ! emedáá ++Sg+Acc:%>áá K ; ! ++Sg+Ill:%>âžân K ; ! ++Sg+Loc:%>áást K ; ! ++Sg+Com:%>ááin K ; ! ++Sg+Abe:%>ááttáá K ; ! ++Ess:%>âžžân K ; ! ++Par:%>âžžâd K ; ! + +LEXICON 3EEMEED_PL_DIM_CASE !!≈ - *@CODE@* pl cases ++Pl+Nom:%>ááh K ; ! emedááh ++Pl+Gen:%>ái K ; ! emedái ++Pl+Acc:%>áid K ; ! emedáid ++Pl+Ill:%>áid K ; ! emedáid ++Pl+Loc:%>ááin K ; ! emedáin ++Pl+Com:%>ái GUIN ; ! emedáiguin ++Pl+Abe:%>áittáá K ; ! emedáittáá + + !! ### 4-syllabic +!! #### -uv: -uvâš, -uvvii + LEXICON 4JOTOLAH_SG_DIM !!≈ * ''@CODE@'' stem kápul + uv +N+Sg+Nom:%>âš K ; +N+Sg+Gen:%>vii K ; @@ -4708,7 +4760,28 @@ LEXICON 4JOTOLAH_PL_DIM !!≈ * ''@CODE@'' stem kápul + uv +N+Pl+Com:%>vij GUIN ; +N+Pl+Abe:%>vijttáá K ; - +!! #### -âss: -âsâš, -âssii + +LEXICON 4KUNAGAS_SG_DIM !!≈ * ''@CODE@'' stem kápul + uv ++N+Sg+Nom:^FCD%>âš K ; ++N+Sg+Gen:%>ii K ; ++N+Sg+Acc:%>ii K ; ++N+Sg+Ill:^FCD%>âžân K ; ++N+Sg+Loc:%>iist K ; ++N+Sg+Com:%>ijn K ; ++N+Sg+Abe:%>iittáá K ; ++N+Ess:^FCD%>âžin K ; ++N+Par:^FCD%>âžid K ; + + +LEXICON 4KUNAGAS_PL_DIM !!≈ * ''@CODE@'' stem kápul + uv ++N+Pl+Nom:%>iih K ; ++N+Pl+Gen:%>ij K ; ++N+Pl+Acc:%>ijd K ; ++N+Pl+Ill:%>ijd K ; ++N+Pl+Loc:%>ijn K ; ++N+Pl+Com:%>ij GUIN ; ++N+Pl+Abe:%>ijttáá K ; !! ### Vowel-final loanwords