Reorganized continuation lexica so that all suffixation contlex's for…

… animate nouns follows each another; similar reorg for inanimate nouns as well.
giellalt · Jan 29, 2024 · 93194fd · 93194fd
1 parent 0412683
commit 93194fd
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/src/fst/morphology/affixes/noun_affixes.lexc b/src/fst/morphology/affixes/noun_affixes.lexc
@@ -177,6 +177,8 @@ LEXICON NI
 LEXICON NID
 @P.dep.DEP@+N+I+D:@P.dep.DEP@0 NI_POSS_IM_0_SUFFIX ;
 
+!! Suffixation for animate nouns
+
 LEXICON NA_POSS_IM_0_SUFFIX
 @D.person.NULL@@R.im.IM@@C.sg@:@D.person.NULL@@R.im.IM@@C.sg@%>i2m                       NA_DIM_SUFFIXES ;
 @D.person.NULL@@R.im.IM@@P.err.Thm@:@D.person.NULL@@R.im.IM@@P.err.Thm@0                 NA_DIM_SUFFIXES ; ! Incorrectly using 0-poss rather than im-poss
@@ -197,26 +199,6 @@ NA_POSS_SUFFIXES ;
 @R.dep.DEP@@D.dim@@R.isis.ISIS@@C.sg@@P.err2.Dim@+Der/Dim+N+A+D:@R.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@@P.err2.Dim@%>i2%^DIMs NA_POSS_SUFFIXES ;
 @R.dep.DEP@@D.dim@@R.is.IS@@C.sg@@P.err2.Dim@+Der/Dim+N+A+D:@R.dep.DEP@@D.dim@@D.is.IS@@C.sg@@P.err2.Dim@%>i2%^DIMsis       NA_POSS_SUFFIXES ;
 
-LEXICON NI_POSS_IM_0_SUFFIX
-@D.person.NULL@@R.im.IM@@C.sg@:@D.person.NULL@@R.im.IM@@C.sg@%>i2m                       NI_DIM_SUFFIXES ;
-@D.person.NULL@@R.im.IM@@P.err.Thm@:@D.person.NULL@@R.im.IM@@P.err.Thm@0                 NI_DIM_SUFFIXES ; ! Incorrectly using 0-poss rather than im-poss
-@D.person.NULL@@D.im.IM@                                                                 NI_DIM_SUFFIXES ;
-@D.person.NULL@@D.im.IM@@C.sg@@P.err.Thm@:@D.person.NULL@@D.im.IM@@C.sg@@P.err.Thm@%>i2m NI_DIM_SUFFIXES ; ! Incorrectly using im-poss rather than 0-poss
-@R.person.NULL@                                                              NI_DIM_SUFFIXES ;
-
-LEXICON NI_DIM_SUFFIXES
-NI_POSS_SUFFIXES ;
-! Independent NIs
-@D.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@%>i2%^DIMs                         NI_POSS_SUFFIXES ;
-@D.dep.DEP@@D.dim@@D.is.IS@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@D.is.IS@@C.sg@%>i2%^DIMsis                               NI_POSS_SUFFIXES ;
-@D.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@%>i2%^DIMs NI_POSS_SUFFIXES ;
-@D.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@%>i2%^DIMsis       NI_POSS_SUFFIXES ;
-! Dependent NIs
-@R.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@%>i2%^DIMs                         NI_POSS_SUFFIXES ;
-@R.dep.DEP@@D.dim@@D.is.IS@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@D.is.IS@@C.sg@%>i2%^DIMsis                               NI_POSS_SUFFIXES ;
-@R.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@%>i2%^DIMs NI_POSS_SUFFIXES ;
-@R.dep.DEP@@D.dim@@R.is.IS@@@[email protected]@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@%>i2%^DIMsis       NI_POSS_SUFFIXES ;
-
 LEXICON NA_POSS_SUFFIXES
 ! Singular possessors
 @U.person.NI@+Px1Sg:@U.person.NI@0 NA_NUMBER_OBV_LOC_SUFFIXES ;
@@ -288,6 +270,28 @@ LEXICON NA_NUMBER_SUFFIXES_SG
 ! @D.person.NULL@@D.person.O@@R.im.IM@@R.err.Thm@@R.sg.A@+Sg:@D.person.NULL@@D.person.O@@R.im.IM@@R.err.Thm@@R.sg.A@%>a NOUN_ENDLEX ; ! Non-3rd possession, incorrect 0-poss, single-syllabic a-singular
 ! @D.person.NULL@@D.person.O@@R.im.IM@@R.err.Thm@@R.sg.I@+Sg:@D.person.NULL@@D.person.O@@R.im.IM@@R.err.Thm@@R.sg.I@%>i NOUN_ENDLEX ; ! Non-3rd possession, incorrect 0-poss, single-syllabic i-singular
 
+!! Suffixation for inanimate nouns
+
+LEXICON NI_POSS_IM_0_SUFFIX
+@D.person.NULL@@R.im.IM@@C.sg@:@D.person.NULL@@R.im.IM@@C.sg@%>i2m                       NI_DIM_SUFFIXES ;
+@D.person.NULL@@R.im.IM@@P.err.Thm@:@D.person.NULL@@R.im.IM@@P.err.Thm@0                 NI_DIM_SUFFIXES ; ! Incorrectly using 0-poss rather than im-poss
+@D.person.NULL@@D.im.IM@                                                                 NI_DIM_SUFFIXES ;
+@D.person.NULL@@D.im.IM@@C.sg@@P.err.Thm@:@D.person.NULL@@D.im.IM@@C.sg@@P.err.Thm@%>i2m NI_DIM_SUFFIXES ; ! Incorrectly using im-poss rather than 0-poss
+@R.person.NULL@                                                              NI_DIM_SUFFIXES ;
+
+LEXICON NI_DIM_SUFFIXES
+NI_POSS_SUFFIXES ;
+! Independent NIs
+@D.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@%>i2%^DIMs                         NI_POSS_SUFFIXES ;
+@D.dep.DEP@@D.dim@@D.is.IS@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@D.is.IS@@C.sg@%>i2%^DIMsis                               NI_POSS_SUFFIXES ;
+@D.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@%>i2%^DIMs NI_POSS_SUFFIXES ;
+@D.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@+Der/Dim+N+I:@D.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@%>i2%^DIMsis       NI_POSS_SUFFIXES ;
+! Dependent NIs
+@R.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@D.isis.ISIS@@C.sg@%>i2%^DIMs                         NI_POSS_SUFFIXES ;
+@R.dep.DEP@@D.dim@@D.is.IS@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@D.is.IS@@C.sg@%>i2%^DIMsis                               NI_POSS_SUFFIXES ;
+@R.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@R.isis.ISIS@@P.err2.Dim@@C.sg@%>i2%^DIMs NI_POSS_SUFFIXES ;
+@R.dep.DEP@@D.dim@@R.is.IS@@@[email protected]@+Der/Dim+N+I+D:@R.dep.DEP@@D.dim@@R.is.IS@@P.err2.Dim@@C.sg@%>i2%^DIMsis       NI_POSS_SUFFIXES ;
+
 LEXICON NI_POSS_SUFFIXES
 ! Singular possessors
 @U.person.NI@+Px1Sg:@U.person.NI@0 NI_NUMBER_LOC_SUFFIXES ;
@@ -386,7 +390,7 @@ LEXICON OSI_SUFFIXES
 +Pl:a # ;
 
 
-!! NOUN_ENDLEX for wrapping up various things
+!! NOUN_ENDLEXs for wrapping up various things
 
 LEXICON NOUN_ENDLEX
 ! Adding diminutive trigger to lexicalized diminutives to palatalize potential poss. person prefixes
@@ -401,4 +405,4 @@ LEXICON NOUN_ENDLEX3
 @R.err2.Dim@+Err/Dim:@R.err2.Dim@0 # ;
 @D.err2.Dim@ # ;
 
-!! End of noun affixes code
+!! End of noun affixes LEXC code