Skip to content

Commit

Permalink
Add nouns and verbs.
Browse files Browse the repository at this point in the history
  • Loading branch information
rueter committed Feb 24, 2024
1 parent 6a078f7 commit 0244cb6
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 38 deletions.
22 changes: 11 additions & 11 deletions src/fst/morphology/affixes/pronouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ LEXICON PRON-PERS-PL2
LEXICON PRON-PERS-PL3
+Pers+Pl3: # ;

LEXICON PRON-INTERR_
LEXICON PRON_INTERR
+Interr: K ;

!LEXICON PRON-DEM_
!+Dem: K ;
LEXICON PRON_DEM
+Dem: K ;

LEXICON PRON-DEM-MSC_
LEXICON PRON_DEM_MSC
+Dem+Msc: K ;
LEXICON PRON-DEM-MSC-PROX_
LEXICON PRON_DEM_MSC_PROX
+Dem+Msc+Prox: K ;
LEXICON PRON-DEM-MSC-DIST_
LEXICON PRON_DEM_MSC_DIST
+Dem+Msc+Dist: K ;
LEXICON PRON-DEM-MSC-REM_
LEXICON PRON_DEM_MSC_REM
+Dem+Msc+Rem: K ;

LEXICON PRON-DEM-FEM_
LEXICON PRON_DEM_FEM
+Dem+Fem: K ;
LEXICON PRON-DEM-FEM-PROX_
LEXICON PRON_DEM_FEM_PROX
+Dem+Fem+Prox: K ;
LEXICON PRON-DEM-FEM-DIST_
LEXICON PRON_DEM_FEM_DIST
+Dem+Fem+Dist: K ;
LEXICON PRON-DEM-FEM-REM_
LEXICON PRON_DEM_FEM_REM
+Dem+Fem+Rem: K ;

! vim: set ft=xfst-lexc:
Expand Down
3 changes: 3 additions & 0 deletions src/fst/morphology/affixes/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ LEXICON V_HUYTXW !CHECKME 2024-01-23
V_BECHDUB ;
:xʷ 0V_KWEDAD ;

LEXICON V_HUY !CHECKME 2024-02-24
: 0V_KWEDAD ;

LEXICON V_CUTEB !CHECKME 2024-01-24
: 0V_KWEDAD ;

Expand Down
9 changes: 7 additions & 2 deletions src/fst/morphology/stems/adjectives.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
!! Adjectives in the Lushootseed language describe things.

LEXICON Adjectives
šəq+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šəq A_with-PL_RED2 "high" ;
dᶻixʷ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻixʷ A_with-PL_RED2 "first" ;
x̌aʔx̌aʔ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌aʔx̌aʔ A_with-PL_RED2 "great|sacred" ;
x̌aʔx̌aʔ+v1+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌aʔx̌aʔ A_with-PL_RED2 "great|sacred" ;
x̌aʔx̌aʔ+v2+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ax̌aʔ A_with-PL_RED2 "great|sacred" ;
x̌əɬ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əɬ A_with-PL_RED2 "sick" ;
x̌əɬəɬx̌əč+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əɬəɬx̌əč A_with-PL_RED2 "sad" ;
wələx̌ʷ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}wələx̌ʷ A_with-PL_RED2 "strong" ;
Expand All @@ -29,9 +31,12 @@ wiʔx̌ʷ+v1+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}wiʔx̌ʷ A_with-PL_RED2 "lost" ;
wiʔx̌ʷ+v2+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}wix̌ʷ A_with-PL_RED2 "lost" ;
bəsad+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəsad A_with-PL_RED2 "dark" ;
xʷəxʷaʔxʷəʔ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷəxʷaʔxʷəʔ A_with-PL_RED2 "swift" ;
ɬaw̓t+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaw̓t A_with-PL_RED2 "new|latest" ;

ša+v1+Det:ša PRON_DEM "the|a|neutral demonstrative" ;
ša+v2+Det:šə PRON_DEM "the|a|neutral demonstrative" ;
tə+Det:tə DET-NEUTRAL-MSC_ "the|a|neutral demonstrative" ;
tə+Det:tsə DET-NEUTRAL-FEM_ "the|a|neutral demonstrative" ;


! A_with-PL_RED2 "" ;
! vim: set ft=xfst-lexc:
8 changes: 5 additions & 3 deletions src/fst/morphology/stems/adverbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ tiləb+v1+Adv:tiləb ADV_SPAT "right there, suddenly" ;
tiləb+v2+Adv:tiiləb ADV_SPAT "right there, suddenly" ;
dxʷt̕aq̓t+Adv:dxʷt̕aq̓t ADV_SPAT "on shore" ;
dxʷq̓ixʷ+Adv:dxʷq̓ixʷ ADV_SPAT "upstream (towards)" ;
til+Adv:til ADV_TEMP "after a while" ;

ʔaɬ+Adv:ʔáɬ ADV_ "fast; quickly" ;
ʔaɬaɬ+Adv:ʔáɬaɬ ADV_ "hurry up! (OC_12323)" ;
Expand Down Expand Up @@ -65,12 +66,13 @@ xʷuʔələʔ+Adv:xʷuʔələʔ ADV_PARENTHETIC "maybe, perhaps" ;
tux̌ʷ+Adv:tux̌ʷ ADV_PARENTHETIC "in contrast to the usual or expected" ;

ƛ̕ub+Aux:ƛ̕ub # "well; ought, should" ;
xʷiʔ+v1+Aux+Neg:xʷiʔ # "no; not" ;
xʷiʔ+v2+Aux+Neg:xʷiiʔ # "no; not" ;
xʷiʔ+v1+Aux+Neg:xʷiʔ K "no; not" ;
xʷiʔ+v2+Aux+Neg:xʷiiʔ K "no; not" ;
gʷəl+Aux+Top:gʷəl # "topic?" ;

ʔu+Pcle+Qst:ʔu PCLE_ "question";
əw̓ə+Pcle:əw̓ə PCLE_ ;
əw̓ə+v1+Pcle:əw̓ə PCLE_ ;
əw̓ə+v1+Pcle:həw̓ə PCLE_ ;
dᶻəɬ+Pcle:dᶻəɬ PCLE_ ;
uʔxʷ+Pcle:uʔxʷ PCLE_ ;

Expand Down
3 changes: 2 additions & 1 deletion src/fst/morphology/stems/interjections.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ LEXICON Interjections
hay+Interj:hay # "now, well" ;
huy̓+Interj:huy̓ # "good-bye" ;
wiʔaac+Interj:wiʔaac # "hello" ;
habuʔ+Interj:habuʔ # "(I'm listening)" ;
habuʔ+v1+Interj:habuʔ # "(I'm listening)" ;
habuʔ+v2+Interj:habu # "(I'm listening)" ;
həmuʔ+Interj:həmuʔ # "(I'm listening)" ;

! vim: set ft=xfst-lexc:
3 changes: 2 additions & 1 deletion src/fst/morphology/stems/nouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ sɬadəyʔ+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬadəyʔ N_with_PL_RED2 "wo
sɬadəyʔ+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬadayʔ N_with_PL_RED2 "woman" ;
sɬagʷidali+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬagʷidali N_with_PL_RED2 "bedroom" ;
sɬaɬədəyʔ+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaɬədəyʔ N_DIM_with_PL_12123 "girl" ;!Correct contlex!
sɬax̌il+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬax̌il N_with_PL_RED2 "evening; night" ;
sɬax̌il+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬax̌il N_with_PL_RED2 "evening; night" ;
sɬax̌il+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬax̌i N_with_PL_RED2 "evening; night" ;
sɬixʷəɬdatil+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬixʷəɬdatil N_with_PL_RED2 "Wednesday" ;
sɬixʷəɬdatil+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬixʷəɬdati N_with_PL_RED2 "Wednesday" ;
sp̓aƛ̕aƛ̕+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓aƛ̕aƛ̕ N_with_PL_RED2 "trash" ;
Expand Down
15 changes: 12 additions & 3 deletions src/fst/morphology/stems/nouns_newwords.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ səxʷgʷədil+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷədil N_with_PL_RED2 "ch
səxʷkacacutulč+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kacacutulč N_with_PL_RED2 "battery" ;
səxʷkʷatač+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷatač N_with_PL_RED2 "ladder" ;
səxʷɬič̓id+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬič̓id N_with_PL_RED2 "lawn mower" ;

sɬagʷid+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬagʷid N_with_PL_RED2 "bed" ;
sk̓ayiɬus+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ayiɬus N_with_PL_RED2 "mask" ;
sgʷədulč+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷədulč N_with_PL_RED2 "container" ;
Expand Down Expand Up @@ -112,12 +111,22 @@ səxʷƛ̕ux̌ʷilali+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕ux̌ʷilali N_wi
səxʷp̓ac̓+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓ac̓ N_with_PL_RED2 "sewing machine" ;
səxʷƛ̕aʔapəq̓+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕aʔapəq̓ N_with_PL_RED2 "smoke detector" ;
p̓ilic̓aʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓ilic̓aʔ N_with_PL_RED2 "fabric" ;

səxʷʔayilalikʷali+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔayilalikʷali N_with_PL_RED2 "website" ;
dxʷləšucidəladxʷ+N:dxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ləšucidəladxʷ N_with_PL_RED2 "calendar" ;
sʔəɬədali+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔəɬədali N_with_PL_RED2 "dinning room" ;
kawič+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kawič N_with_PL_RED2 "hunched back" ;
x̌ʷayux̌ʷaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷayux̌ʷaʔ N_with_PL_RED2 "fly" ;
x̌ačuʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ačuʔ N_with_PL_RED2 "lake" ;
č̓əƛ̕əʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}č̓əƛ̕əʔ N_with_PL_RED2 "rock" ;
bayac+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bayac N_with_PL_RED2 "meat" ;
sq̓ʷəlaɬad+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷəlaɬad N_with_PL_RED2 "berry|fruit" ;
st̕qəxʷ+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕qəxʷ N_with_PL_RED2 "beaver" ;

!Diminutives need different plural
bibədaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bibədaʔ N_DIM_with_PL_12123 "doll ()" ;
yiyəq̓ʷ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yiyəq̓ʷ N_DIM_with_PL_12123 "pocket knife" ;

kiʔkawič+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kiʔkawič N_with_PL_RED2 "little hunched back" ;
sxʷiuk̓ʷ+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷiuk̓ʷ N_DIM_with_PL_12123 "basket ogress" ;

! N_with_PL_RED2 "" ;
! N_with_PL_RED2 "" ;
Expand Down
34 changes: 18 additions & 16 deletions src/fst/morphology/stems/pronouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ bək̓ʷaʔkʷbixʷ+Pron:bək̓ʷaʔkʷbixʷ K "everyone" ;
LEXICON PRON-PERS
čəd+Pron:čəd PRON-PERS-SG1 ;
čəxʷ+Pron:čəxʷ PRON-PERS-SG2 ;
čəxʷə+Pron:čəxʷə PRON-PERS-SG2 ;!pron and conj?
čəɬ+Pron:čəɬ PRON-PERS-PL1 ;
čəɬə+Pron:čəɬə PRON-PERS-PL1 ;!pron and conj?
čələp+Pron:čələp PRON-PERS-PL2 ;
əlgʷəʔ+v1+Pron:əlgʷəʔ PRON-PERS-PL3 ;
əlgʷəʔ+v2+Pron:həlgʷəʔ PRON-PERS-PL3 ;
Expand All @@ -26,24 +28,24 @@ cədiɬ+Pron:cədiɬ PRON-PERS-SG3 "(independent and emphatic)" ;
caadiɬ+Pron:caadiɬ PRON-PERS-PL3 "(independent and emphatic)" ;

LEXICON PRON-DEM
tiʔiɬ+v1+Pron:tiʔiɬ PRON-DEM-MSC-DIST_ ;
tiʔiɬ+v2+Pron:tiiɬ PRON-DEM-MSC-DIST_ ;
tiʔiɬ+v1+Pron:tsiʔiɬ PRON-DEM-FEM-DIST_ ;
tiʔiɬ+v2+Pron:tsiiɬ PRON-DEM-FEM-DIST_ ;
kʷi+v1+Pron:kʷi PRON-DEM-MSC-REM_ ;
kʷi+v2+Pron:kʷə PRON-DEM-MSC-REM_ ;!paradigmatic
kʷi+v1+Pron:kʷsi PRON-DEM-FEM-REM_ ;
kʷi+v2+Pron:kʷsə PRON-DEM-FEM-REM_ ;!paradigmatic
ti+Pron:ti PRON-DEM-MSC_ ;
ti+Pron:tsi PRON-DEM-FEM_ ;
tiʔəʔ+v1+Pron:tiʔəʔ PRON-DEM-MSC-PROX_ ;
tiʔəʔ+v2+Pron:tiəʔ PRON-DEM-MSC-PROX_ ;
tiʔəʔ+v1+Pron:tsiʔəʔ PRON-DEM-FEM-PROX_ ;
tiʔəʔ+v2+Pron:tsiəʔ PRON-DEM-FEM-PROX_ ;
tiʔiɬ+v1+Pron:tiʔiɬ PRON_DEM_MSC_DIST ;
tiʔiɬ+v2+Pron:tiiɬ PRON_DEM_MSC_DIST ;
tiʔiɬ+v1+Pron:tsiʔiɬ PRON_DEM_FEM_DIST ;
tiʔiɬ+v2+Pron:tsiiɬ PRON_DEM_FEM_DIST ;
kʷi+v1+Pron:kʷi PRON_DEM_MSC_REM ;
kʷi+v2+Pron:kʷə PRON_DEM_MSC_REM ;!paradigmatic
kʷi+v1+Pron:kʷsi PRON_DEM_FEM_REM ;
kʷi+v2+Pron:kʷsə PRON_DEM_FEM_REM ;!paradigmatic
ti+Pron:ti PRON_DEM_MSC ;
ti+Pron:tsi PRON_DEM_FEM ;
tiʔəʔ+v1+Pron:tiʔəʔ PRON_DEM_MSC_PROX ;
tiʔəʔ+v2+Pron:tiəʔ PRON_DEM_MSC_PROX ;
tiʔəʔ+v1+Pron:tsiʔəʔ PRON_DEM_FEM_PROX ;
tiʔəʔ+v2+Pron:tsiəʔ PRON_DEM_FEM_PROX ;
diɬ+Pron:diɬ K "the one who" ;

LEXICON PRON-INTERR
stab+Pron:stab PRON-INTERR_ ;
gʷat+Pron:gʷat PRON-INTERR_ ;
stab+Pron:stab PRON_INTERR ;
gʷat+Pron:gʷat PRON_INTERR ;

! vim: set ft=xfst-lexc:
12 changes: 11 additions & 1 deletion src/fst/morphology/stems/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ bəčdub+V:bəčd V_BECHDUB "knock sm down" ;
labdub+V:labd V_BECHDUB "see sm" ;

bəq̓əd+V:bəq̓əd TV_SELPED "swallow" ;
cuud+V:cuud V_KWEDAD "tell" ;
ɬuq̓ʷud+V:ɬuq̓ʷud V_KWEDAD "peel sm" ;
x̌ək̓ʷud+V:x̌ək̓ʷud V_KWEDAD "flib sm" ;
šulud+V:šulud V_SELPED "crawl" ;
Expand Down Expand Up @@ -46,6 +47,7 @@ t̓ək̓ʷəb+V:t̓ək̓ʷəb V_CUTEB "" ;
qələb+V:qələb V_CUTEB "" ;
bəƛ̕əd+V:bəƛ̕əd TV_SELPED "touch" ;
k̓ʷit̕+V:k̓ʷit̕ V_KWEDAD "go down to the waters edge, but no further" ;
ʔatəbəd+V:ʔatəbəd V_SELPED "die" ;

bəƛ̕šadəb+V:bəƛ̕šadəb V_CUTEB "touch ones feet" ;
šəqšəqačib+V:šəqšəqačib V_CUTEB "raise hands" ;
Expand Down Expand Up @@ -91,6 +93,7 @@ q̓ʷibid+V:q̓ʷibid V_KWEDAD "empty" ;
ƛ̕iqid+V:ƛ̕iqid V_KWEDAD "take out" ;
c̓agʷad+V:c̓agʷad V_KWEDAD "wash sm" ;
x̌ədəd+V:x̌ədəd TV_SELPED "push sm" ;
c̓agʷačiʔb+V:c̓agʷačiʔb V_HELHED "wash hands" ;

tagʷš+V:tàgʷš V_KWEDAD "buy sm" ;
!cuyayus+V:cuyayus V_KWEDAD "busy oneself" ;
Expand Down Expand Up @@ -200,7 +203,8 @@ gʷədil+V:gʷədil V_HELHED "sit down" ;
gəqil+V:gəqil V_HELHED "shine brightly (comment:gʷ vs g)" ;
həliʔil+V:həliʔil V_HELHED "become well" ;
ləliʔil+V:ləliʔil V_HELHED "change" ;
ləx̌il+V:ləx̌il V_HELHED "become light" ;
ləx̌il+v1+V:ləx̌il V_HELHED "become light" ;
ləx̌il+v2+V:ləx̌i V_HELHED "become light" ;
luƛ̕il+V:luƛ̕il V_HELHED "grow up" ;
ɬax̌il+V:ɬax̌il V_HELHED "become dark" ;
ƛ̕iqagʷil+V:ƛ̕iqagʷil V_HELHED "come out of enclosure" ;
Expand All @@ -211,7 +215,13 @@ wəliʔil+v1+V:wəliʔil V_HELHED "showing, appearing" ;
wəliʔil+v2+V:wəliʔi V_HELHED "showing, appearing" ;
xʷəʔaʔxʷəʔil+V:xʷəʔaʔxʷəʔil V_HELHED "become swift" ;
x̌aƛ̕il+V:x̌áƛ̕il V_HELHED "argue" ;
ɬəčil+v1+V:ɬəčil V_HELHED "arrive" ;
ɬəčil+v2+V:ɬəči V_HELHED "arrive" ;
bəɬ+V:bəɬ V_HELHED "full (is this verb or adjective)" ;
x̌aƛ̕+V:x̌aƛ̕ V_HELHED "like" ;
t̓uk̓ʷ+V:t̓uk̓ʷ V_HELHED "go home" ;
q̓ax̌ʷ+V:q̓ax̌ʷ V_HELHED "freeze" ;


gʷəqilič+V:gʷəqilič V_HELHED "become enveloped in brightness" ;
ləx̌ilič+V:ləx̌ilič V_HELHED "become enveloped in light" ;
Expand Down

0 comments on commit 0244cb6

Please sign in to comment.