Skip to content

Commit

Permalink
move dim to derivation chapter.
Browse files Browse the repository at this point in the history
  • Loading branch information
Trondtr committed Apr 3, 2024
1 parent 8712cc1 commit be213c1
Showing 1 changed file with 81 additions and 70 deletions.
151 changes: 81 additions & 70 deletions src/fst/morphology/affixes/nouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ LEXICON X_FADDA_PL !!≈ * **@CODE@**

!! ### 2KISSA lexicon family

LEXICON 2KISSA !!≈ * **@CODE@** No root vowel lengthening
LEXICON 2KISSA !!≈ * **@CODE@** ki^RVssá No root vowel lengthening
2KISSA_SG ;
2KISSA_PL ;

Expand Down Expand Up @@ -572,25 +572,6 @@ LEXICON 2CAANA_PL !!≈ * **@CODE@**
+N+Pl+Com:^WG%>id CPXsuffCOM ; !
+N+Der1+Der/Dimin: 2CAANA_PL_DIM ; ! temporarily so

LEXICON 2CAANA_SG_DIM
+N+Sg+Nom:^SV^WG^RLEN^SLEN%>š K ; ! má^RVn^RCá čáánááš
+N+Sg+Gen:^SV^WG^RLEN^SLEN K ; ! čáánáá
+N+Sg+Acc:^SV^WG^RLEN^SLEN K ; !
+N+Sg+Ill:^WG%>žân K ; ! čánážân
+N+Sg+Loc:^SV^WG^VHIGH^SLEN%>st K ; ! čáánáást
+N+Sg+Com:^WG^VHIGH%>in K ; ! čáánááin
+N+Sg+Abe:^SV^WG^VHIGH^SLEN%>ttáá K ; ! čánáttáá
+N+Ess:^WG%>žin K ; ! čánážin
+N+Par:^WG%>žid K ; ! čánážid

LEXICON 2CAANA_PL_DIM
+N+Pl+Nom:^SV^WG^VHIGH^SLEN%>h K ; ! kirhuuh
+N+Pl+Gen:^WG^VHIGH%>i K ; ! kirhui
+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áá


LEXICON X_CAANA_SG !!≈ * **@CODE@**
Expand Down Expand Up @@ -1110,26 +1091,6 @@ LEXICON X_CAACI_PL!!≈ * **@CODE@**
+Pl+Ill:^WG^CLEN%>id K ; ! čassijd
:^RLEN X_WG_RVSH_PL_notILL ;

LEXICON 2CAACI_SG_DIM !!≈ * ''@CODE@'' pe^RVi4vi, ä^RVi4gi
+N+Sg+Nom:^EA^WG^RLEN%>š K ; ! čääsáš 
+N+Sg+Gen:^EA^WG^CLEN%>á K ; ! čässáá
+N+Sg+Acc:^EA^WG^CLEN%>á K ;
+N+Sg+Ill:^EA^WG%>žân K ; !
+N+Sg+Loc:^EA^WG^CLEN%>ást K ; !
+N+Sg+Com:^EA^WG^CLEN%>i5n K ; !
+N+Sg+Abe:^EA^WG^CLEN%>áttáá K ; !
+N+Ess:^EA^WG%>žin K ; !
+N+Par:^EA^WG%>žid K ; !

LEXICON 2CAACI_PL_DIM !!≈ * ''@CODE@''
+N+Pl+Nom:^EA^WG^CLEN%>áh K ; ! ruáhhááh *ruáhhiáh
+N+Pl+Gen:^EA^WG^CLEN%>i5 K ; ! ruáhhái *ruáhhiái
+N+Pl+Acc:^EA^WG^CLEN%>i5d K ;
+N+Pl+Ill:^EA^WG^CLEN%>i5d K ; ! ruáhháid *ruáhhijd
+N+Pl+Loc:^EA^WG^CLEN%>i5n K ; ! ruáhháin *ruáhhijn
+N+Pl+Com:^EA^WG^CLEN%>i5 GUIN ; ! ruáhháigijn *ruáhhijgijn
+N+Pl+Abe:^EA^WG^CLEN%>i5ttáá K ; ! ruáhháittáá *ruáhhijttáá


! ======= vyehi

Expand Down Expand Up @@ -1363,30 +1324,6 @@ KIRKKO_NJAMMA_SG ;
KIRKKO_NJAMMA_PL ;
+N+Der1+Der/Dimin: 2KIRKKO_DIM ; !kieđâš

LEXICON 2KIRKKO_DIM
2KIRKKO_SG_DIM ;
2KIRKKO_PL_DIM ;

LEXICON 2KIRKKO_SG_DIM
+N+Sg+Nom:^SV^WG^SLEN%>š K ; ! kirhooš
+N+Sg+Gen:^SV^WG^VHIGH^SLEN K ; ! kirhuu
+N+Sg+Acc:^SV^WG^VHIGH^SLEN K ; ! kirhuu
+N+Sg+Ill:^WG%>žân K ; ! kirhožân
+N+Sg+Loc:^SV^WG^VHIGH^SLEN%>st K ; ! kirhuust
+N+Sg+Com:^WG^VHIGH%>in K ; ! kirhuin, kirhuuin
+N+Sg+Abe:^SV^WG^VHIGH^SLEN%>ttáá K ; ! kirhuuttáá
+N+Ess:^WG%>žin K ; ! kirhožin
+N+Par:^WG%>žid K ; ! kirhožid

LEXICON 2KIRKKO_PL_DIM
+N+Pl+Nom:^SV^WG^VHIGH^SLEN%>h K ; ! kirhuuh
+N+Pl+Gen:^WG^VHIGH%>i K ; ! kirhui
+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áá


LEXICON 2KIRKKO_SG!!≈ * **@CODE@**
+N+Sg+Loc:^SV^WG^SLEN%>st K ; !kirhoost
Expand All @@ -1398,7 +1335,7 @@ KIRKKO_NJAMMA_SG ;
KIRKKO_NJAMMA_PL ;
+N+Der1+Der/Dimin: 2KISSA_DIM ; !kieđâš

LEXICON KIRKKO_NJAMMA_SG !!≈ * **@CODE@**
LEXICON KIRKKO_NJAMMA_SG !!≈ * **@CODE@** stem nja^RVmma
+N: X_KIRKKO_NJAMMA_SG ;
+N+Cmp/SgNom: Rhash ;
+N+Cmp/SgGen:^WG%> Rhash ;
Expand Down Expand Up @@ -3166,6 +3103,8 @@ LEXICON C_KAAMUV !!≈ * **@CODE@**
+N+Pl+Ill:^FCD%>id CPXsuff ; !
+N+Pl+Com:^FCD%>id CPXsuffCOM ; !
+N+Pl+Loc:^FCD%>in CPXsuff ; !
+N+Der1+Der/Dimin: 3OPPUS_SG ; !elleežijd elleežii
+N+Der1+Der/Dimin: 3OPPUS_PL ; !elleežijd elleežii

LEXICON X_KAAMUV !!≈ * **@CODE@**
+Sg+Nom:v^WG^RLEN K ; ! kaamuv
Expand Down Expand Up @@ -3278,6 +3217,7 @@ LEXICON C_KAARBIS_SG !!≈ * **@CODE@**
+N+Cmp/SgGen:^FCD%> Rhash ;
+N:^WG^RLEN%> Nom_DER ;
+N:^FCD%> Gen_DER ;
+N+NomAg+Der1+Der/Dimin: 3OPPUS_SG ;
+N+Sg+Com:^FCD%>in CPXsuff ; ! kárbáinis
+N+Sg+Nom:^FCD%> VPXsuff ; ! kárbás
+N+Sg+Gen:^FCD%> VPXsuff ; ! kárbás
Expand All @@ -3297,6 +3237,7 @@ LEXICON C_KAARBIS_PL !!≈ * **@CODE@**
+N+Pl+Ill:^FCD%>id CPXsuff ; !
+N+Pl+Com:^FCD%>id CPXsuffCOM ; !
+N+Pl+Loc:^FCD%>in CPXsuff ; !
+N+NomAg+Der1+Der/Dimin: 3OPPUS_PL ;


LEXICON X_KAARBIS_SG !!≈ * **@CODE@**
Expand Down Expand Up @@ -3348,7 +3289,7 @@ LEXICON X_PELES !!≈ * **@CODE@** piällás^ÁE
+Pl+Com:^FCD%>i GUIN ; ! piälláiguin
+Pl+Abe:^FCD%>ittáá K ; ! piälláittáá

LEXICON C_MORCES !!≈ * **@CODE@**
LEXICON C_MORCES !!≈ * **@CODE@** stem: morččás^ÁE
+N: X_MORCES ;
+N+Sg+Nom:^FCD VPXsuff12 ; ! XXX check!
+N+Sg+Gen:^FCD VPXsuff12 ; !
Expand Down Expand Up @@ -3977,7 +3918,7 @@ LEXICON 3ALMAS !!≈ * **@CODE@**



LEXICON C_SARVES !!≈ * **@CODE@** sarves, jalŋes
LEXICON C_SARVES !!≈ * **@CODE@** sarves, jalŋes stem: sarv, jalŋ
C_SARVES_SG ;
C_SARVES_PL ;

Expand All @@ -3991,7 +3932,8 @@ LEXICON C_SARVES_SG !!≈ * **@CODE@**
+N+Sg+Loc:ast CPXsuff ; !
+N+Sg+Com:ain CPXsuff ;
+N+Ess:esin CPXsuff ;

+N+Der1+Der/Dimin: 4C_RASTAGAS_SG ;

LEXICON C_SARVES_PL !!≈ * **@CODE@**
+N: X_SARVES_PL ;
+N+Cmp/PlGen:i Rhash ; !piäivááčuovâ
Expand All @@ -4000,6 +3942,7 @@ LEXICON C_SARVES_PL !!≈ * **@CODE@**
+N+Pl+Ill:id CPXsuff ; !
+N+Pl+Loc:in CPXsuff ; !
+N+Pl+Com:id CPXsuffCOM ; !
+N+Der1+Der/Dimin: 4C_RASTAGAS_PL ;

LEXICON X_SARVES_SG !!≈ * **@CODE@**
+Sg+Nom:es K ;
Expand Down Expand Up @@ -4438,6 +4381,26 @@ LEXICON 2KIELA_PL_DIM

!! #### final á

LEXICON 2CAANA_SG_DIM
+N+Sg+Nom:^SV^WG^RLEN^SLEN%>š K ; ! má^RVn^RCá čáánááš
+N+Sg+Gen:^SV^WG^RLEN^SLEN K ; ! čáánáá
+N+Sg+Acc:^SV^WG^RLEN^SLEN K ; !
+N+Sg+Ill:^WG%>žân K ; ! čánážân
+N+Sg+Loc:^SV^WG^VHIGH^SLEN%>st K ; ! čáánáást
+N+Sg+Com:^WG^VHIGH%>in K ; ! čáánááin
+N+Sg+Abe:^SV^WG^VHIGH^SLEN%>ttáá K ; ! čánáttáá
+N+Ess:^WG%>žin K ; ! čánážin
+N+Par:^WG%>žid K ; ! čánážid

LEXICON 2CAANA_PL_DIM
+N+Pl+Nom:^SV^WG^VHIGH^SLEN%>h K ; ! kirhuuh
+N+Pl+Gen:^WG^VHIGH%>i K ; ! kirhui
+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áá

LEXICON 2FADDA_DIM
+N: FADDA_SG_DIM ;
+N: 2FADDA_PL_DIM ;
Expand Down Expand Up @@ -4465,8 +4428,6 @@ LEXICON 2FADDA_PL_DIM !!≈ * **@CODE@**
+Pl+Com:^FVD%>ij GUIN ;
+Pl+Abe:ij%>ttáá K ;




LEXICON 2KISSA_DIM !!≈ * **@CODE@**

Expand Down Expand Up @@ -4526,6 +4487,27 @@ LEXICON 2ALGE_PL_DIM !!≈ * **@CODE@**

!! #### Final i

LEXICON 2CAACI_SG_DIM !!≈ * ''@CODE@'' pe^RVi4vi, ä^RVi4gi
+N+Sg+Nom:^EA^WG^RLEN%>š K ; ! čääsáš 
+N+Sg+Gen:^EA^WG^CLEN%>á K ; ! čässáá
+N+Sg+Acc:^EA^WG^CLEN%>á K ;
+N+Sg+Ill:^EA^WG%>žân K ; !
+N+Sg+Loc:^EA^WG^CLEN%>ást K ; !
+N+Sg+Com:^EA^WG^CLEN%>i5n K ; !
+N+Sg+Abe:^EA^WG^CLEN%>áttáá K ; !
+N+Ess:^EA^WG%>žin K ; !
+N+Par:^EA^WG%>žid K ; !

LEXICON 2CAACI_PL_DIM !!≈ * ''@CODE@''
+N+Pl+Nom:^EA^WG^CLEN%>áh K ; ! ruáhhááh *ruáhhiáh
+N+Pl+Gen:^EA^WG^CLEN%>i5 K ; ! ruáhhái *ruáhhiái
+N+Pl+Acc:^EA^WG^CLEN%>i5d K ;
+N+Pl+Ill:^EA^WG^CLEN%>i5d K ; ! ruáhháid *ruáhhijd
+N+Pl+Loc:^EA^WG^CLEN%>i5n K ; ! ruáhháin *ruáhhijn
+N+Pl+Com:^EA^WG^CLEN%>i5 GUIN ; ! ruáhháigijn *ruáhhijgijn
+N+Pl+Abe:^EA^WG^CLEN%>i5ttáá K ; ! ruáhháittáá *ruáhhijttáá


LEXICON 2AIGI_SG_DIM !!≈ * ''@CODE@'' pe^RVi4vi, ä^RVi4gi
+N+Sg+Nom:^EA^WG^RLEN%>š K ; ! ruáháš pááiháš
+N+Sg+Gen:^EA^WG^CLEN%>á K ; ! ruáhháá páiháá
Expand All @@ -4547,6 +4529,35 @@ LEXICON 2AIGI_PL_DIM !!≈ * ''@CODE@''
+N+Pl+Abe:^EA^WG^CLEN%>i5ttáá K ; ! ruáhháittáá *ruáhhijttáá



!! #### final o

LEXICON 2KIRKKO_DIM
2KIRKKO_SG_DIM ;
2KIRKKO_PL_DIM ;

LEXICON 2KIRKKO_SG_DIM
+N+Sg+Nom:^SV^WG^SLEN%>š K ; ! kirhooš
+N+Sg+Gen:^SV^WG^VHIGH^SLEN K ; ! kirhuu
+N+Sg+Acc:^SV^WG^VHIGH^SLEN K ; ! kirhuu
+N+Sg+Ill:^WG%>žân K ; ! kirhožân
+N+Sg+Loc:^SV^WG^VHIGH^SLEN%>st K ; ! kirhuust
+N+Sg+Com:^WG^VHIGH%>in K ; ! kirhuin, kirhuuin
+N+Sg+Abe:^SV^WG^VHIGH^SLEN%>ttáá K ; ! kirhuuttáá
+N+Ess:^WG%>žin K ; ! kirhožin
+N+Par:^WG%>žid K ; ! kirhožid

LEXICON 2KIRKKO_PL_DIM
+N+Pl+Nom:^SV^WG^VHIGH^SLEN%>h K ; ! kirhuuh
+N+Pl+Gen:^WG^VHIGH%>i K ; ! kirhui
+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áá



!! #### final u , tentative

LEXICON 2AIRU_DIM
Expand Down

0 comments on commit be213c1

Please sign in to comment.