Add dxʷ prefix

@DMTurnipseed
@dsienko

src/fst/morphology/affixes/nouns.lexc

@@ -25,6 +25,9 @@ LEXICON N_with_PL_RED2_Dial/-NL
 LEXICON N_with_PL_RED2_PRF/s_Dial/-NL
  N_with_PL_RED2_PRF/s ;
 
+LEXICON N_with_PL_RED2_PRF/dxw
+@R.NPrefix.dxw@:@R.NPrefix.dxw@ N0_with_PL_RED2 ;
+
 LEXICON N_with_PL_RED2_PRF/dxws
 @R.NPrefix.dxws@:@R.NPrefix.dxws@ N0_with_PL_RED2 ;
 

src/fst/morphology/affixes/prefixes.lexc

@@ -137,6 +137,7 @@ LEXICON VERBS_OR_NOUNS
 :%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}  Verbs ;
 
 @U.NPrefix.ZERO@:@U.NPrefix.ZERO@%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} NOUNS_PREFIX_PREP ;
+@U.NPrefix.dxw@:@U.NPrefix.dxw@dxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} NOUNS_PREFIX_PREP ;
 @U.NPrefix.dxws@:@U.NPrefix.dxws@dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} NOUNS_PREFIX_PREP ;
 @U.NPrefix.s@:@U.NPrefix.s@s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} NOUNS_PREFIX_PREP ;
 @U.NPrefix.sexw@:@U.NPrefix.sexw@səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} NOUNS_PREFIX_PREP ;

src/fst/morphology/root.lexc

@@ -1,4 +1,4 @@
-! Divvun & Giellatekno - open source grammars for LUSHOOTSEED language
+ Divvun & Giellatekno - open source grammars for LUSHOOTSEED language
 ! Copyright © 2015 The University of Tromsø & the Norwegian Sámi Parliament
 ! http://giellatekno.uit.no & http://divvun.no
 !
@@ -397,10 +397,12 @@ y̓   !!= @CODE@
 @C.PossPx@	   !!= * @CODE@ 
 
 @U.NPrefix.ZERO@ !!= * @CODE@
+@U.NPrefix.dxw@ !!= * @CODE@
 @U.NPrefix.dxws@ !!= * @CODE@
 @U.NPrefix.s@ !!= * @CODE@
 @U.NPrefix.sexw@ !!= * @CODE@
 @R.NPrefix.ZERO@ !!= * @CODE@
+@R.NPrefix.dxw@ !!= * @CODE@
 @R.NPrefix.dxws@ !!= * @CODE@
 @R.NPrefix.s@ !!= * @CODE@
 @R.NPrefix.sexw@ !!= * @CODE@

src/fst/morphology/stems/nouns.lexc

@@ -4,49 +4,49 @@
 
 LEXICON Nouns
 
-tubšədad+N:túbšədàd SG-SUF "(tribe members, what is plural?)" ;
-bəqəlšuɬ+N:bəqəlšuɬ SG-SUF "(tribe members, what is plural?)" ;
+tubšədad+N:túbšədàd N_with_PL_RED2 "(tribe members, what is plural?)" ;
+bəqəlšuɬ+N:bəqəlšuɬ N_with_PL_RED2 "(tribe members, what is plural?)" ;
 dxʷsƛ̕alb+N:ƛ̕alb  N_with_PL_RED2_PRF/dxws "(tribe members, what is plural?)" ;
-qayuqʷatx̌+N:qayuqʷatx̌ SG-SUF "(tribe members, what is plural?)" ;
+qayuqʷatx̌+N:qayuqʷatx̌ N_with_PL_RED2 "(tribe members, what is plural?)" ;
 sqaǰət+N:qaǰət N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
 sq̓ixʷəbš+N:q̓ixʷəbš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-bəsq̓ayxʷayxʷ+N:bəsq̓ayxʷayxʷ SG-SUF "(tribe members, what is plural?)" ;
+bəsq̓ayxʷayxʷ+N:bəsq̓ayxʷayxʷ N_with_PL_RED2 "(tribe members, what is plural?)" ;
 ssqʷaliqabš+N:sqʷaliqabš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
 sqʷax̌səd+N:qʷax̌səd N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
 sqʷədabš+N:qʷədabš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-q̓ʷuʔəlƛ̕əl+N:q̓ʷuʔəlƛ̕əl SG-SUF "(tribe members, what is plural?)" ;
+q̓ʷuʔəlƛ̕əl+N:q̓ʷuʔəlƛ̕əl N_with_PL_RED2 "(tribe members, what is plural?)" ;
 spuyaləpabš+N:puyaləpabš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-dxʷʔaha+N:dxʷʔaha SG-SUF "(tribe members, what is plural?)" ;
+dxʷʔaha+N:dxʷʔaha N_with_PL_RED2 "(tribe members, what is plural?)" ;
 sbalqʷuʔabš+N:balqʷuʔabš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-bəshikʷigʷilc+N:bəshikʷigʷilc SG-SUF "(tribe members, what is plural?)" ;
-bəsq̓ixʷixʷ+N:bəsq̓ixʷixʷ SG-SUF "(tribe members, what is plural?)" ;
-c̓awqʷ+N:c̓awqʷ SG-SUF "(tribe members, what is plural?)" ;
-čubəabš+N:čubəabš SG-SUF "(tribe members, what is plural?)" ;
-č̓t̕ilqʷəbš+N:č̓t̕ilqʷəbš SG-SUF "(tribe members, what is plural?)" ;
-dxʷduʔabš+N:dxʷduʔabš SG-SUF "(tribe members, what is plural?)" ;
+bəshikʷigʷilc+N:bəshikʷigʷilc N_with_PL_RED2 "(tribe members, what is plural?)" ;
+bəsq̓ixʷixʷ+N:bəsq̓ixʷixʷ N_with_PL_RED2 "(tribe members, what is plural?)" ;
+c̓awqʷ+N:c̓awqʷ N_with_PL_RED2 "(tribe members, what is plural?)" ;
+čubəabš+N:čubəabš N_with_PL_RED2 "(tribe members, what is plural?)" ;
+č̓t̕ilqʷəbš+N:č̓t̕ilqʷəbš N_with_PL_RED2 "(tribe members, what is plural?)" ;
+dxʷduʔabš+N:duʔabš N_with_PL_RED2_PRF/dxw "(tribe members, what is plural?)" ;
 sdukʷalbixʷ+N:dukʷalbixʷ N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-duqʷəčabš+N:duqʷəčabš SG-SUF "(tribe members, what is plural?)" ;
+duqʷəčabš+N:duqʷəčabš N_with_PL_RED2 "(tribe members, what is plural?)" ;
 shiʔwəbš+N:hiʔwəbš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-kikiyalus+N:kikiyalus SG-SUF "(tribe members, what is plural?)" ;
-dxʷləbiʔ+N:dxʷləbiʔ SG-SUF "(tribe members, what is plural?)" ;
+kikiyalus+N:kikiyalus N_with_PL_RED2 "(tribe members, what is plural?)" ;
+dxʷləbiʔ+N:ləbiʔ N_with_PL_RED2_PRF/dxw "(tribe members, what is plural?)" ;
 sxʷq̓ʷupabš+N:xʷq̓ʷupabš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
-saʔkʷbixʷ+N:saʔkʷbixʷ SG-SUF "(tribe members, what is plural?)" ;
+saʔkʷbixʷ+N:saʔkʷbixʷ N_with_PL_RED2 "(tribe members, what is plural?)" ;
 st̕əč̓asəbš+N:t̕əč̓asəbš N_with_PL_RED2_PRF/s "(tribe members, what is plural?)" ;
 
-dᶻəɬigʷəd+N:dᶻəɬigʷəd SG-SUF "Everett (place name)" ;
-ʔəw̓alus+N:ʔəw̓alus SG-SUF "(place name)" ;
+dᶻəɬigʷəd+N:dᶻəɬigʷəd N_with_PL_RED2 "Everett (place name)" ;
+ʔəw̓alus+N:ʔəw̓alus N_with_PL_RED2 "(place name)" ;
 
-xʷyatacut+N:xʷyátacut SG-SUF "man's name" ;
-č̓adəsqidəb+N:č̓adəsqidəb SG-SUF "man's name" ;
+xʷyatacut+N:xʷyátacut N_with_PL_RED2 "man's name" ;
+č̓adəsqidəb+N:č̓adəsqidəb N_with_PL_RED2 "man's name" ;
 scacəlqid+N:cacəlqid N_with_PL_RED2_PRF/s "man's name" ;
-dayəsqidəb+N:dayəsqidəb SG-SUF "man's name" ;
+dayəsqidəb+N:dayəsqidəb N_with_PL_RED2 "man's name" ;
 
-tsibudᶻaɬ+N:tsi%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}budᶻaɬ SG-SUF "woman's name" ;
+tsibudᶻaɬ+N:tsi%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}budᶻaɬ N_with_PL_RED2 "woman's name" ;
 
-dxʷləšucid+N:dxʷləšucid SG-SUF "Lushootseed (language)" ;
-txʷəlšucid+N:txʷəlšucid SG-SUF "Lushootseed (language)" ;
-wiw̓suʔ+v1+N:wiw̓suʔ SG-SUF "Children (only plural)" ;!Correct contlex?
-wiw̓suʔ+v+N:wiw̓su SG-SUF "Children (only plural)" ;
+dxʷləšucid+N:dxʷləšucid N_with_PL_RED2 "Lushootseed (language)" ;
+txʷəlšucid+N:txʷəlšucid N_with_PL_RED2 "Lushootseed (language)" ;
+wiw̓suʔ+v1+N:wiw̓suʔ N_with_PL_RED2 "Children (only plural)" ;!Correct contlex?
+wiw̓suʔ+v+N:wiw̓su N_with_PL_RED2 "Children (only plural)" ;
 ʔaciɬtalbixʷ+N:ʔaciɬtalbixʷ N_with_PL_RED2_Dial/-SL "" ;
 ʔaciɬtalbixʷ+N:ʔaciɬtalbixʷ N_with_Distr_12323_RED5 "" ;
 
@@ -104,10 +104,10 @@ cubəd+N:cubəd N_with_PL_RED2 "eyebrow" ;
 c̓uk̓ʷəb+N:c̓uk̓ʷəb N_with_PL_RED2 "skin" ;
 dəxʷp̓aʔ+N:dəxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓aʔ N_with_PL_RED2 "taste" ;
 dəxʷtulalikʷ+N:dəxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}tulalikʷ N_with_PL_RED2 "book" ;
-dxʷdaʔəb+N:daʔəb  N_with_PL_RED2_PRF/dxws "medicine man" ;
-dxʷləšucidəladxʷ+N:dxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ləšucidəladxʷ N_with_PL_RED2 "calendar" ;
+dxʷdaʔəb+N:daʔəb  N_with_PL_RED2_PRF/dxw "medicine man" ;
+dxʷləšucidəladxʷ+N:ləšucidəladxʷ N_with_PL_RED2_PRF/dxw "calendar" ;
 dxʷsdᶻixʷqs+N:dᶻixʷqs  N_with_PL_RED2_PRF/dxws "leader" ;
-dxʷšiʔšɬbəd+N:dxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šiʔšɬbəd N_with_PL_RED2 "window|mirror" ;
+dxʷšiʔšɬbəd+N:šiʔšɬbəd N_with_PL_RED2_PRF/dxw "window|mirror" ;
 dxʷskʷaxʷad+N:kʷaxʷad  N_with_PL_RED2_PRF/dxws "counselor" ;
 dxʷskʷukʷcut+N:kʷukʷcut  N_with_PL_RED2_PRF/dxws "cook" ;
 dxʷsɬač̓alikʷ+N:ɬač̓alikʷ  N_with_PL_RED2_PRF/dxws "firefighter" ;
@@ -117,7 +117,7 @@ dxʷsqiq̓alikʷ+N:qiq̓alikʷ  N_with_PL_RED2_PRF/dxws "police officer" ;
 dxʷssp̓ayəq+N:sp̓ayəq  N_with_PL_RED2_PRF/dxws "carver" ;
 dxʷstəlawiltxʷ+N:təlawiltxʷ  N_with_PL_RED2_PRF/dxws "bus driver" ;
 dxʷst̕ilib+N:t̕ilib  N_with_PL_RED2_PRF/dxws "singer" ;
-dxʷstsulčalikʷ+N:tsulčalikʷ  N_with_PL_RED2_PRF/dxws_PRF/dxws "drummer" ;
+dxʷstsulčalikʷ+N:tsulčalikʷ  N_with_PL_RED2_PRF/dxws "drummer" ;
 dxʷsx̌əƛ̕alap+N:x̌əƛ̕alap  N_with_PL_RED2_PRF/dxws "skipper" ;
 dxʷsx̌ʷiw̓xʷiw̓əd+N:x̌ʷiw̓xʷiw̓əd  N_with_PL_RED2_PRF/dxws "flutist" ;
 dxʷsxʷiʔxʷiʔ+N:xʷiʔxʷiʔ  N_with_PL_RED2_PRF/dxws "hunter" ;
@@ -178,7 +178,7 @@ luƛ̕+N:luƛ̕ N_with_PL_RED2 "elder" ;
 ƛ̕əlayʔ+N:ƛ̕əlayʔ N_with_PL_RED2 "canoe" ;
 ƛ̕iq̓s+N:ƛ̕iq̓s N_with_PL_RED2 "January" ;
 ƛ̕ux̌ʷƛ̕ux̌ʷ+N:ƛ̕ux̌ʷƛ̕ux̌ʷ N_with_PL_RED2 "oyster" ;
-ƛ̕xʷayʔ+N:%{pØ%}ƛ̕xʷáyʔ N_with_PL_RED130 "dog salmon|chum salmon" ;
+ƛ̕xʷayʔ+N:ƛ̕xʷáyʔ N_with_PL_RED130 "dog salmon|chum salmon" ;
 ƛ̕xʷayʔ+N:ƛ̕xʷáyʔ N_with_PL_RED2 "dog salmon" ;
 p̓ayəqəd+N:p̓ayəqəd N_with_PL_RED2 "adze" ;
 pədč̓aʔab+v1+N:pədč̓aʔab N_with_PL_RED2 "May" ;
@@ -480,15 +480,15 @@ sčiy̓uʔ+N:čiy̓uʔ N_with_PL_RED2_PRF/s "strawberry" ;
 ʔapəl+N:ʔapəl N_with_PL_RED2 "apple" ;
 səxʷqʷuʔqʷaʔtəd+N:qʷuʔqʷaʔtəd N_with_PL_RED2_PRF/sexw "glass" ;
 ʔik̓ʷaʔdəl+N:ʔik̓ʷaʔdəl N_with_PL_RED2 "napkin|paper towel" ;
-skʷədʔulč+N:kʷədʔulč N_with_PL_RED2 "bowl" ;
+skʷədʔulč+N:kʷədʔulč N_with_PL_RED2_PRF/s "bowl" ;
 kupi+N:kupi N_with_PL_RED2 "coffee" ;
 qʷagʷəbalqʷuʔ+N:qʷagʷəbalqʷuʔ N_with_PL_RED2 "pop|juice|sweet drink" ;
 dxʷshədalqʷuʔ+N:hədalqʷuʔ N_with_PL_RED2_PRF/dxws "tea" ;
-sq̓axʷalqʷuʔ+N:q̓axʷalqʷuʔ N_with_PL_RED2 "smoothie" ;
-sʔəɬədalʔtxʷ+N:ʔəɬədalʔtxʷ N_with_PL_RED2 "restaurant|store" ;
+sq̓axʷalqʷuʔ+N:q̓axʷalqʷuʔ N_with_PL_RED2_PRF/s "smoothie" ;
+sʔəɬədalʔtxʷ+N:ʔəɬədalʔtxʷ N_with_PL_RED2_PRF/s "restaurant|store" ;
 č̓əɬabalʔtxʷ+N:č̓əɬabalʔtxʷ N_with_PL_RED2 "movie theater" ;
 taw̓d+N:taw̓d N_with_PL_RED2 "town" ;
-sʔukʷukʷ+N:ʔukʷukʷ N_with_PL_RED2 "game" ;
+sʔukʷukʷ+N:ʔukʷukʷ N_with_PL_RED2_PRF/s "game" ;
 cəq̓disəbəd+N:cəq̓disəbəd N_with_PL_RED2 "fork" ;
 
 ! vim: set ft=xfst-lexc: