Added alternative locative forms to the .lexc source and implemented …

…these forms in the .yaml file for misko; Added dialectal tags

src/fst/morphology/affixes/noun_affixes.lexc

@@ -278,23 +278,34 @@ NI_POSS_LOC_COMBO_SUFFIXES ;
 LEXICON NI_POSS_LOC_COMBO_SUFFIXES
 ! Singular possessors
 @U.person.NI@+Px1Sg+Loc:@U.person.NI@%>i2hk  NOUN_ENDLEX ;
+@U.person.NI@+Px1Sg+Loc:@U.person.NI@%>i2h  NOUN_ENDLEX ;
 @U.person.KI@+Px2Sg+Loc:@U.person.KI@%>i2hk NOUN_ENDLEX ;
+@U.person.KI@+Px2Sg+Loc:@U.person.KI@%>i2h NOUN_ENDLEX ;
 @U.person.O@+Px3Sg+Loc:@U.person.O@%>i2hk   NOUN_ENDLEX ;
+@U.person.O@+Px3Sg+Loc:@U.person.O@%>i2h   NOUN_ENDLEX ;
 ! @U.person.NULL@                    NI_NUMBER_LOC_SUFFIXES ;
 ! Plural possessors
 @U.person.NI@+Px1Pl+Loc:@U.person.NI@%>i2nâhk  NOUN_ENDLEX ;
+@U.person.NI@+Px1Pl+Loc:@U.person.NI@%>i2nâh  NOUN_ENDLEX ;
 @U.person.KI@+Px12Pl+Loc:@U.person.KI@%>i2nâhk NOUN_ENDLEX ;
+@U.person.KI@+Px12Pl+Loc:@U.person.KI@%>i2nâh NOUN_ENDLEX ;
 @U.person.KI@+Px2Pl+Loc:@U.person.KI@%>i2wâhk  NOUN_ENDLEX ;
+@U.person.KI@+Px2Pl+Loc:@U.person.KI@%>i2wâh  NOUN_ENDLEX ;
 @U.person.O@+Px3Pl+Loc:@U.person.O@0%>i2wâhk   NOUN_ENDLEX ;
+@U.person.O@+Px3Pl+Loc:@U.person.O@0%>i2wâh   NOUN_ENDLEX ;
 ! Obviative possessor
 @U.person.O@+Px4Sg/Pl+Loc:@U.person.O@%>i2thihk NOUN_ENDLEX ;
+@U.person.O@+Px4Sg/Pl+Loc:@U.person.O@%>i2thih NOUN_ENDLEX ;
 ! Unspecified possessor
 @U.person.MI@+PxX+Loc:@U.person.MI@%>i2hk NOUN_ENDLEX ;
+@U.person.MI@+PxX+Loc:@U.person.MI@%>i2h NOUN_ENDLEX ;
 
 LEXICON NI_NUMBER_LOC_SUFFIXES
 @D.number.PL@ NI_NUMBER_SUFFIXES_SG ; 
 @D.number.SG@+Pl:@D.number.SG@%>a NOUN_ENDLEX ;
 @R.person.NULL@+Loc:@R.person.NULL@%>i2hk NOUN_ENDLEX ;
+@R.person.NULL@+Loc:@R.person.NULL@%>i2h NOUN_ENDLEX ;
+! @R.person.NULL@+Loc+Dial/East:@R.person.NULL@%>i2h NOUN_ENDLEX ;
 
 LEXICON NI_NUMBER_SUFFIXES_SG
 @D.sg@+Sg:@D.sg@0 NOUN_ENDLEX ; ! Zero Sg morpheme for non NI-4w cases
@@ -317,13 +328,22 @@ LEXICON NOUN_IRREGULARS
 ôsi+N+I+Px4Sg/Pl:otôtithiw OSI_SUFFIXES ;
 ! Locative combos
 ôsi+N+I+Px1Sg+Loc:nitôtihk # ;
+ôsi+N+I+Px1Sg+Loc:nitôtih # ;
 ôsi+N+I+Px2Sg+Loc:kitôtihk # ;
+ôsi+N+I+Px2Sg+Loc:kitôtih # ;
 ôsi+N+I+Px3Sg+Loc:otôtihk # ;
+ôsi+N+I+Px3Sg+Loc:otôtih # ;
 ôsi+N+I+Px1Pl+Loc:nitôtinâhk # ;
+ôsi+N+I+Px1Pl+Loc:nitôtinâh # ;
 ôsi+N+I+Px12Pl+Loc:kitôtinâhk # ;
+ôsi+N+I+Px12Pl+Loc:kitôtinâh # ;
 ôsi+N+I+Px2Pl+Loc:kitôtiwâhk # ;
+ôsi+N+I+Px2Pl+Loc:kitôtiwâh # ;
 ôsi+N+I+Px3Pl+Loc:otôtiwâhk # ;
+ôsi+N+I+Px3Pl+Loc:otôtiwâh # ;
 ôsi+N+I+Px4Sg/Pl+Loc:otôtithihk # ;
+ôsi+N+I+Px4Sg/Pl+Loc:otôtithih # ;
+
 
 LEXICON OSI_SUFFIXES
 +Sg:0 # ;

src/fst/morphology/root.lexc

@@ -492,6 +492,8 @@ d2  !!=* @CODE@  Reduplication consonant marker
 +Err/Orth !!= * @CODE@ tag for substandard forms
 +Err/Frag !!= * @CODE@ tag for word-form fragments
 +Dial !!= * @CODE@ tag for dialectical forms that can't be called errors
++Dial/East !!= * @CODE@ tag for dialectical forms that can't be called errors
++Dial/West !!= * @CODE@ tag for dialectical forms that can't be called errors
 +Use/NG  !!= * @CODE@ not-generate, for ped generation isme-ped.fst
 +Eng !!≈ * @CODE@ indicates that this is an English form
 

test/src/gt-norm-yamls/N-I-4w-misko_gt-norm.yaml

@@ -22,8 +22,9 @@ Tests:
       # Nonposs
       misko+N+I+Sg: misko   #  a blood
       # misko+N+I+Pl: miskwa   #  bloods
-      misko+N+I+Loc: miskohk   #  in a blood
-
+      misko+N+I+Loc: [miskohk, miskoh]   #  in a blood
+      # misko+N+I+Loc+Dial/East: miskoh   #  in a blood
+
 
       # Der/Dim
       misko+N+I+Der/Dim+N+I+Sg: [miskos, miskosis]   #  a little blood
@@ -52,13 +53,13 @@ Tests:
 
 
       # Poss # Loc
-      misko+N+I+Px1Sg+Loc: nimiskomihk   #  in my blood
-      misko+N+I+Px2Sg+Loc: kimiskomihk   #  in your blood
-      misko+N+I+Px3Sg+Loc: omiskomihk   #  in his/her blood
-      misko+N+I+Px1Pl+Loc: nimiskominâhk   #  in our blood
-      misko+N+I+Px12Pl+Loc: kimiskominâhk   #  in your and our blood
-      misko+N+I+Px2Pl+Loc: kimiskomiwâhk   #  in your blood
-      misko+N+I+Px3Pl+Loc: omiskomiwâhk   #  in their blood
-      misko+N+I+Px4Sg/Pl+Loc: omiskomithihk   #  in another's/others' blood
+      misko+N+I+Px1Sg+Loc: [nimiskomihk, nimiskomih]   #  in my blood
+      misko+N+I+Px2Sg+Loc: [kimiskomihk, kimiskomih]   #  in your blood
+      misko+N+I+Px3Sg+Loc: [omiskomihk, omiskomih]   #  in his/her blood
+      misko+N+I+Px1Pl+Loc: [nimiskominâhk, nimiskominâh]   #  in our blood
+      misko+N+I+Px12Pl+Loc: [kimiskominâhk, kimiskominâh]   #  in your and our blood
+      misko+N+I+Px2Pl+Loc: [kimiskomiwâhk, kimiskomiwâh]   #  in your blood
+      misko+N+I+Px3Pl+Loc: [omiskomiwâhk, omiskomiwâh]   #  in their blood
+      misko+N+I+Px4Sg/Pl+Loc: [omiskomithihk, omiskomithih]   #  in another's/others' blood