From 111f84f1ad3c5a9f0b79d53fca01105d9deabce3 Mon Sep 17 00:00:00 2001 From: Jack Rueter Date: Thu, 25 Jan 2024 23:22:25 +0200 Subject: [PATCH] Adding new words, reverting to Sg/Pl --- src/fst/morphology/affixes/nouns.lexc | 30 +++---- src/fst/morphology/affixes/verbs.lexc | 3 +- src/fst/morphology/phonology.twolc | 10 +-- src/fst/morphology/stems/adjectives.lexc | 4 +- src/fst/morphology/stems/conjunctors.lexc | 1 + src/fst/morphology/stems/interjections.lexc | 2 + src/fst/morphology/stems/nouns.lexc | 88 ++++++++++---------- src/fst/morphology/stems/nouns_newwords.lexc | 33 +++++--- src/fst/morphology/stems/pronouns.lexc | 6 +- src/fst/morphology/stems/verbs.lexc | 26 +++--- 10 files changed, 111 insertions(+), 92 deletions(-) diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc index b6db196c..ba061e67 100644 --- a/src/fst/morphology/affixes/nouns.lexc +++ b/src/fst/morphology/affixes/nouns.lexc @@ -21,8 +21,8 @@ LEXICON N_with_PL_RED2 LEXICON N_with_PL_RED130 !%^RedPL130130 : SG-SUF ; -@D.PossPx@+Distr+Nom:@D.PossPx@%^RedPL130130 PRE-POSS_01 ; -+Distr+Nom:%^RedPL130130 PRE-POSS_01 ; +@D.PossPx@+Pl+Nom:@D.PossPx@%^RedPL130130 PRE-POSS_01 ; ++Pl+Nom:%^RedPL130130 PRE-POSS_01 ; LEXICON N_with_Distr_12323_RED5 !Der/Red5_12323 @@ -56,8 +56,8 @@ LEXICON DIM_CV1toCV2C @D.PossPx@+Err/Orth+Der+Der/Dimin_12123+N:@D.PossPx@%^Red12123 SG-SUF ; !+Der/Red1_12123 @R.PossPx@+Err/Orth+Der+Der/Dimin_12123+N:@R.PossPx@%^Red12123 SG-SUF ; !+Der/Red1_12123 -@D.PossPx@+Der+Der/Dimin_1i1i13+N+Distr+Nom:@D.PossPx@%^RedPL1i1i13 PRE-POSS_01 ;! +Der/Red1_1i13_Distr_1212 -@R.PossPx@+Der+Der/Dimin_1i1i13+N+Distr+Nom:@R.PossPx@%^RedPL1i1i13 PRE-POSS_01 ;! +Der/Red1_1i13_Distr_1212 +@D.PossPx@+Der+Der/Dimin_1i1i13+N+Pl+Nom:@D.PossPx@%^RedPL1i1i13 PRE-POSS_01 ;! +Der/Red1_1i13_Distr_1212 +@R.PossPx@+Der+Der/Dimin_1i1i13+N+Pl+Nom:@R.PossPx@%^RedPL1i1i13 PRE-POSS_01 ;! +Der/Red1_1i13_Distr_1212 ! Declension LEXICON SG-SUF @@ -66,30 +66,30 @@ LEXICON SG-SUF LEXICON PL_RED1_qelb -@D.PossPx@+Distr+Nom:@D.PossPx@%^Red1i123 # ; -+Distr+Nom:%^Red2CV2CiCV PRE-POSS_01 ; -!! qəlb+N+Distr+Nom: **rain showers** +@D.PossPx@+Pl+Nom:@D.PossPx@%^Red1i123 # ; ++Pl+Nom:%^Red2CV2CiCV PRE-POSS_01 ; +!! qəlb+N+Pl+Nom: **rain showers** !!€ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qəlb%^Red1i123 !!€ 00qi0qəlb0 LEXICON PL_RED2 -@D.PossPx@+Distr+Nom:@D.PossPx@%^RedPL123123 PRE-POSS_01 ; -!@D.PossPx@+Distr+Nom:@D.PossPx@%^RedPL123123 # ; -+Distr+Nom:%^RedPL123123 PRE-POSS_01 ; -!! bəlups+N+Distr+Nom +@D.PossPx@+Pl+Nom:@D.PossPx@%^RedPL123123 PRE-POSS_01 ; +!@D.PossPx@+Pl+Nom:@D.PossPx@%^RedPL123123 # ; ++Pl+Nom:%^RedPL123123 PRE-POSS_01 ; +!! bəlups+N+Pl+Nom !!€ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəlups%^RedPL123123 !!€ 00bəlbəlups0 !!$ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəlups%^RedPL123123 !!$ 00000bəlups0 -!! k̓ʷəčədiʔ+N+Distr+Nom: __rabbit/jänis__ +!! k̓ʷəčədiʔ+N+Pl+Nom: __rabbit/jänis__ !!€ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷəčədiʔ%^RedPL123123 !!€ 00k̓ʷəčk̓ʷəčədiʔ0 -!!$ k̓ʷəčədiʔ: k̓ʷəčədiʔ+N+Distr+Nom +!!$ k̓ʷəčədiʔ: k̓ʷəčədiʔ+N+Pl+Nom LEXICON PL_RED5 !ʔaciɬtalbixʷ:ʔacaciɬtalbixʷ -@D.PossPx@+Distr+Nom:@D.PossPx@%^Red12323 PRE-POSS_01 ; -@R.PossPx@+Distr+Nom:@R.PossPx@%^Red12323 PRE-POSS_01 ; +@D.PossPx@+Pl+Nom:@D.PossPx@%^Red12323 PRE-POSS_01 ; +@R.PossPx@+Pl+Nom:@R.PossPx@%^Red12323 PRE-POSS_01 ; LEXICON PRE-POSS_01 @R.TAM-SUBJ.SUBJ@+Mod/Subj:@R.TAM-SUBJ.SUBJ@ PRE-POSS_02 ; diff --git a/src/fst/morphology/affixes/verbs.lexc b/src/fst/morphology/affixes/verbs.lexc index 2d218837..98423c43 100644 --- a/src/fst/morphology/affixes/verbs.lexc +++ b/src/fst/morphology/affixes/verbs.lexc @@ -65,7 +65,8 @@ LEXICON 0V_BECHDUB_06 @D.NMZ@ OC1/2_š_OR_OCSP3_OR_DVN-POSS ; LEXICON V_HUYTXW !CHECKME 2024-01-23 -: 0V_KWEDAD ; + V_BECHDUB ; +:xʷ 0V_KWEDAD ; LEXICON V_CUTEB !CHECKME 2024-01-24 : 0V_KWEDAD ; diff --git a/src/fst/morphology/phonology.twolc b/src/fst/morphology/phonology.twolc index 0ca42870..7dccc5b7 100644 --- a/src/fst/morphology/phonology.twolc +++ b/src/fst/morphology/phonology.twolc @@ -347,7 +347,7 @@ Rules !!€ bəq̓0t000>əb %{p1%}: Cns _ [ Cns | Vow ] Lts:* [%^Red1i13:|%^RedPL1i1i13:|%^Red1iq13:|%^Red12q13:|%^Red1213:] ; -!! sčətxʷəd+N+Der/Dimin+N+Distr+Nom bear +!! sčətxʷəd+N+Der/Dimin+N+Pl+Nom bear !!€ s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}čətxʷəd%^RedPL1i1i13 !!€ s%^√čiči0č0txʷəd0 @@ -408,10 +408,10 @@ Rules %{p2%}:i <=> _ %{p1%}: Cns: i: Cns: Lts:* [%^RedPL123123:|%^Red12323:|%^RedPL1i1i13:|%^Red1i13:|%^Red1iq13:|%^Red1iq123:|%^Red12123:|%^Red12q13:|%^Red1213:] ; _ %{p1%}: Cns: ə: Cns: Lts:* [%^RedPL1i1i13:|%^Red1i13:|%^Red1iq13:|%^Red1iq123:] ; _ %{p1%}: Cns: ə Cns: Lts:* [%^Red1i123:|%^Red1iq13:|%^Red1iq123:] ; -!! qəlb+N+Distr+Nom: **rain showers** +!! qəlb+N+Pl+Nom: **rain showers** !!€ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qəlb%^Red1i123 !!€ 00qi0qəlb0 -!! pišpiš+N+Distr+Nom: **cat/kissa** +!! pišpiš+N+Pl+Nom: **cat/kissa** !!€ %{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pišpiš%^RedPL123123 !!€ 00pišpišpiš0 @@ -505,7 +505,7 @@ d:t <=> [ə:|»|i:|a:|u:] _ %^Pen: %^RmVOW: %^d2t: %> ə b ; _ %{p4%}: %{p3%}: %{p2%}: %{p1%}: Cx Vow: Cns [ Cns | Vow ]* %^RedPL1i1i13: ; where Cx in (kʷ b̓ ǰ n̓ m̓ p p̓ b t t̕ d dᶻ c c̓ č č̓ s š l l̕ ɬ ƛ̕ y w y̓ w̓ k k̓ k̓ʷ gʷ h xʷ q q̓ qʷ q̓ʷ x̌ x̌ʷ ʔ) ; !2019-03-04 where Cx in (p p̓ b t t̕ d dᶻ c c̓ č č̓ s š l l̕ ɬ ƛ̕ y w y̓ w̓ k k̓ k̓ʷ gʷ h xʷ q q̓ qʷ q̓ʷ x̌ x̌ʷ ʔ) ; -!! sčətxʷəd+N+Der/Dimin+N+Distr+Nom bear +!! sčətxʷəd+N+Der/Dimin+N+Pl+Nom bear !!€ s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}čətxʷəd%^RedPL1i1i13 !!€ s%^√čičič0txʷəd0 @@ -738,4 +738,4 @@ CnsNoGlotOrD:0 <=> %{p1%}: _ Vow: Cns: [ Cns | Vow ]* %^Red12323: ; !!TESTS !echo 's ^√:0 {p5}:č {p4}:i {p3}:č {p2}:i {p1}:0 č ə:0 t xʷ ə d ^Red1CV1toCV2CPL:0' | hfst-pair-test src/fst/phonology.compose.hfst -!echo 'sčətxʷəd+N+Msc+Der+Der/Dimin+N+Distr+Nom' | hfst-lookup src/fst/lexicon.hfst +!echo 'sčətxʷəd+N+Msc+Der+Der/Dimin+N+Pl+Nom' | hfst-lookup src/fst/lexicon.hfst diff --git a/src/fst/morphology/stems/adjectives.lexc b/src/fst/morphology/stems/adjectives.lexc index 65f3d953..60d4003e 100644 --- a/src/fst/morphology/stems/adjectives.lexc +++ b/src/fst/morphology/stems/adjectives.lexc @@ -3,7 +3,7 @@ !! Adjectives in the Lushootseed language describe things. LEXICON Adjectives -dᶻixʷ+A%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻixʷ A_with-PL_RED2 "first" ; +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:%{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" ; @@ -12,7 +12,7 @@ x̌icil+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌icil A_with-PL_RED2 "angry" ; cəwəɬ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}cəwəɬ A_with-PL_RED2 "hungry" ; cək̓ʷ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}cək̓ʷ A_with-PL_RED2 "straight|correct" ; bəɬ+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəɬ A_with-PL_RED2 "full from eating" ; -stabaɬ+A:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}tabaɬ A_with-PL_RED2 "what kind of" ; +stabaɬ+A:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}tabaɬ A_with-PL_RED2 "what kind of" ; x̌ičəc+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ičəc A_with-PL_RED2 "red" ; kay̓kay̓alus+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kay̓kay̓alus A_with-PL_RED2 "sky blue" ; č̓uɬəyʔalus+A:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}č̓uɬəyʔalus A_with-PL_RED2 "green" ; diff --git a/src/fst/morphology/stems/conjunctors.lexc b/src/fst/morphology/stems/conjunctors.lexc index 91accdf8..789b2e93 100644 --- a/src/fst/morphology/stems/conjunctors.lexc +++ b/src/fst/morphology/stems/conjunctors.lexc @@ -8,5 +8,6 @@ LEXICON Conjunctors gʷəl+CC:gʷəl # "and" ; gʷələ+CC:gʷələ # "and" ; yəxʷ+CC:yəxʷ # "and" ; +ʔabil̕+CS:ʔabil̕ # "if" ; ! vim: set ft=xfst-lexc: diff --git a/src/fst/morphology/stems/interjections.lexc b/src/fst/morphology/stems/interjections.lexc index 98eb0575..d8d6381d 100644 --- a/src/fst/morphology/stems/interjections.lexc +++ b/src/fst/morphology/stems/interjections.lexc @@ -8,5 +8,7 @@ LEXICON Interjections hay+Interj:hay # "now, well" ; huy̓+Interj:huy̓ # "good-bye" ; wiʔaac+Interj:wiʔaac # "hello" ; +habuʔ+Interj:habuʔ # "(I'm listening)" ; +həmuʔ+Interj:həmuʔ # "(I'm listening)" ; ! vim: set ft=xfst-lexc: diff --git a/src/fst/morphology/stems/nouns.lexc b/src/fst/morphology/stems/nouns.lexc index 4a72b7dd..69e9d89c 100644 --- a/src/fst/morphology/stems/nouns.lexc +++ b/src/fst/morphology/stems/nouns.lexc @@ -6,7 +6,7 @@ LEXICON Nouns tubšədad+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}túbšədàd SG-SUF "(tribe members, what is plural?)" ; bəqəlšuɬ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəqəlšuɬ SG-SUF "(tribe members, what is plural?)" ; -dxʷsƛ̕alb+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕alb SG-SUF "(tribe members, what is plural?)" ; +dxʷsƛ̕alb+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕alb SG-SUF "(tribe members, what is plural?)" ; qayuqʷatx̌+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qayuqʷatx̌ SG-SUF "(tribe members, what is plural?)" ; sqaǰət+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qaǰət SG-SUF "(tribe members, what is plural?)" ; sq̓ixʷəbš+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ixʷəbš SG-SUF "(tribe members, what is plural?)" ; @@ -31,7 +31,7 @@ kikiyalus+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kikiyalus SG-SUF "(tribe members, what dxʷləbiʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dxʷləbiʔ SG-SUF "(tribe members, what is plural?)" ; sxʷq̓ʷupabš+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷq̓ʷupabš SG-SUF "(tribe members, what is plural?)" ; saʔkʷbixʷ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}saʔkʷbixʷ SG-SUF "(tribe members, what is plural?)" ; -st̕əč̓asəbš+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕əč̓asəbš SG-SUF "(tribe members, what is plural?)" ; +st̕əč̓asəbš+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕əč̓asəbš SG-SUF "(tribe members, what is plural?)" ; dᶻəɬigʷəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻəɬigʷəd SG-SUF "Everett (place name)" ; ʔəw̓alus+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔəw̓alus SG-SUF "(place name)" ; @@ -89,25 +89,25 @@ c̓ubc̓ub+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓ubc̓ub N_with_PL_RED2 "barnacle" cubəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}cubəd N_with_PL_RED2 "eyebrow" ; c̓uk̓ʷəb+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓uk̓ʷəb N_with_PL_RED2 "skin" ; dəxʷtulalikʷ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dəxʷtulalikʷ N_with_PL_RED2 "book" ; -dxʷdaʔəb+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}daʔəb N_with_PL_RED2 "medicine man" ; -dxʷs+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} N_with_PL_RED2 "" ; -dxʷs+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} N_with_PL_RED2 "" ; -dxʷsdᶻixʷqs+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻixʷqs N_with_PL_RED2 "leader" ; +dxʷdaʔəb+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}daʔəb N_with_PL_RED2 "medicine man" ; +dxʷs+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} N_with_PL_RED2 "" ; +dxʷs+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%} N_with_PL_RED2 "" ; +dxʷsdᶻixʷqs+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻixʷqs N_with_PL_RED2 "leader" ; dxʷšiʔšɬbəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dxʷšiʔšɬbəd N_with_PL_RED2 "mirror" ; -dxʷskʷaxʷad+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷaxʷad N_with_PL_RED2 "counselor" ; -dxʷskʷukʷcut+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷukʷcut N_with_PL_RED2 "cook" ; -dxʷsɬač̓alikʷ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬač̓alikʷ N_with_PL_RED2 "firefighter" ; -dxʷsɬiʔɬdahəb+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬiʔɬdahəb N_with_PL_RED2 "fisher" ; -dxʷsƛ̕əladiʔəb+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕əladiʔəb N_with_PL_RED2 "musician" ; -dxʷsqiq̓alikʷ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qiq̓alikʷ N_with_PL_RED2 "police officer" ; -dxʷssp̓ayəq+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}sp̓ayəq N_with_PL_RED2 "carver" ; -dxʷstəlawiltxʷ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təlawiltxʷ N_with_PL_RED2 "bus driver" ; -dxʷst̕ilib+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕ilib N_with_PL_RED2 "singer" ; -dxʷstsulčalikʷ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}tsulčalikʷ N_with_PL_RED2 "drummer" ; -dxʷsx̌əƛ̕alap+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əƛ̕alap N_with_PL_RED2 "skipper" ; -dxʷsx̌ʷiw̓xʷiw̓əd+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷiw̓xʷiw̓əd N_with_PL_RED2 "flutist" ; -dxʷsxʷiʔxʷiʔ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷiʔxʷiʔ N_with_PL_RED2 "hunter" ; -dxʷsʔugʷusalikʷ+N:dxʷs%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔugʷusalikʷ N_with_PL_RED2 "teacher" ; +dxʷskʷaxʷad+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷaxʷad N_with_PL_RED2 "counselor" ; +dxʷskʷukʷcut+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷukʷcut N_with_PL_RED2 "cook" ; +dxʷsɬač̓alikʷ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬač̓alikʷ N_with_PL_RED2 "firefighter" ; +dxʷsɬiʔɬdahəb+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬiʔɬdahəb N_with_PL_RED2 "fisher" ; +dxʷsƛ̕əladiʔəb+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕əladiʔəb N_with_PL_RED2 "musician" ; +dxʷsqiq̓alikʷ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qiq̓alikʷ N_with_PL_RED2 "police officer" ; +dxʷssp̓ayəq+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}sp̓ayəq N_with_PL_RED2 "carver" ; +dxʷstəlawiltxʷ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təlawiltxʷ N_with_PL_RED2 "bus driver" ; +dxʷst̕ilib+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕ilib N_with_PL_RED2 "singer" ; +dxʷstsulčalikʷ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}tsulčalikʷ N_with_PL_RED2 "drummer" ; +dxʷsx̌əƛ̕alap+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əƛ̕alap N_with_PL_RED2 "skipper" ; +dxʷsx̌ʷiw̓xʷiw̓əd+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷiw̓xʷiw̓əd N_with_PL_RED2 "flutist" ; +dxʷsxʷiʔxʷiʔ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷiʔxʷiʔ N_with_PL_RED2 "hunter" ; +dxʷsʔugʷusalikʷ+N:dxʷs%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔugʷusalikʷ N_with_PL_RED2 "teacher" ; dᶻədis+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻədis N_with_PL_RED2 "tooth" ; dᶻəgʷaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻəgʷaʔ N_with_PL_RED2 "expert (at)" ; dᶻəgʷəʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dᶻəgʷəʔ N_with_PL_RED2 "" ; @@ -134,7 +134,7 @@ kəšu+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kəšu N_with_PL_RED2 "pig" ; kiyuuqʷs+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kiyuuqʷs N_with_PL_RED2 "seagull" ; kʷagʷičəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷágʷičəd N_with_PL_RED2 "elk" ; k̓ʷat̕ad+v1+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷat̕ad N_with_PL_RED2 "mouse" ;!sk̓ʷat̕ad? -k̓ʷat̕ad+v2+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷat̕ad N_with_PL_RED2 "mouse" ;!sk̓ʷat̕ad? +k̓ʷat̕ad+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷat̕ad N_with_PL_RED2 "mouse" ;!sk̓ʷat̕ad? k̓ʷat̕aq+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷat̕aq N_with_PL_RED2 "mat for making temporary summer dwellings" ; k̓ʷəčədiʔ+v1+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷəčədiʔ N-MSC_with-PL_RED2 "rabbit" ; k̓ʷəčədiʔ+v2+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷəčəldiʔ N-MSC_with-PL_RED2 "rabbit" ; @@ -194,8 +194,8 @@ q̓ʷəlastəb+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷəlastəb N_with_PL_RED2 "se qʷəq̓ʷal̕+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qʷəq̓ʷal̕ N_with_PL_RED2 "porcupine" ; qʷist+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qʷist N_with_PL_RED2 "cow" ; sbadil+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}badil N_with_PL_RED2 "mountain" ; -sbalucid+v1+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bálucid N_with_PL_RED2 "" ; -sbalucid+v2+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəlúcid N_with_PL_RED2 "" ; +sbalucid+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bálucid N_with_PL_RED2 "" ; +sbalucid+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}bəlúcid N_with_PL_RED2 "" ; sbiaw+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}biáw N_with_PL_RED2 "coyote" ;!plur 2019-03-05 sbuusəɬdatil+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}buusəɬdatil N_with_PL_RED2 "Thursday" ; sč̓abiqʷ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}č̓abiqʷ N_with_PL_RED2 "great grandparent" ; @@ -215,28 +215,28 @@ sč̓iyuyaʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}č̓iyuyaʔ N_with_PL_RED2 "t sčiʔyu+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}čiʔyu N_with_PL_RED2 "strawberry" ; sdaʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}daʔ N_with_PL_RED2 "name" ; sduukʷ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}duukʷ N_with_PL_RED2 "knife" ; -səxʷƛ̕uqʷilali+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕uqʷilali N_with_PL_RED2 "refrigerator" ; +səxʷƛ̕uqʷilali+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕uqʷilali N_with_PL_RED2 "refrigerator" ; šəgʷaʔac+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šəgʷaʔac N-MSC_with-PL_RED2 "salmonberry sprout" ; -səxʷc̓agʷabacəd+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓agʷabacəd N_with_PL_RED2 "bathtub" ; -səxʷc̓aʔkʷ+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓aʔkʷ N_with_PL_RED2 "sink" ; -səxʷc̓aʔkʷ+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓aʔkʷ N_with_PL_RED2 "sink" ; -səxʷc̓əgʷulč+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓əgʷulč N_with_PL_RED2 "dish washer" ; -səxʷc̓ix̌alikʷ+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓ix̌alikʷ N_with_PL_RED2 "frying pan" ; -səxʷgʷigʷədil+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədil N_with_PL_RED2 "toilet" ; -səxʷpupuhigʷəd+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pupuhigʷəd N_with_PL_RED2 "February" ; -səxʷq̓ʷuʔgʷəsəd+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷuʔgʷəsəd N_with_PL_RED2 "blender" ; -səxʷšəɬkupi+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šəɬkupi N_with_PL_RED2 "coffee maker" ; -səxʷšic̓əlwaʔs+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šic̓əlwaʔs N_with_PL_RED2 "December" ; -səxʷʔuq̓ʷud+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔuq̓ʷud N_with_PL_RED2 "plunger" ; +səxʷc̓agʷabacəd+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓agʷabacəd N_with_PL_RED2 "bathtub" ; +səxʷc̓aʔkʷ+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓aʔkʷ N_with_PL_RED2 "sink" ; +səxʷc̓aʔkʷ+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓aʔkʷ N_with_PL_RED2 "sink" ; +səxʷc̓əgʷulč+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓əgʷulč N_with_PL_RED2 "dish washer" ; +səxʷc̓ix̌alikʷ+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}c̓ix̌alikʷ N_with_PL_RED2 "frying pan" ; +səxʷgʷigʷədil+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədil N_with_PL_RED2 "toilet" ; +səxʷpupuhigʷəd+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pupuhigʷəd N_with_PL_RED2 "February" ; +səxʷq̓ʷuʔgʷəsəd+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷuʔgʷəsəd N_with_PL_RED2 "blender" ; +səxʷšəɬkupi+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šəɬkupi N_with_PL_RED2 "coffee maker" ; +səxʷšic̓əlwaʔs+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šic̓əlwaʔs N_with_PL_RED2 "December" ; +səxʷʔuq̓ʷud+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔuq̓ʷud N_with_PL_RED2 "plunger" ; sgʷədayucid+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷədayucid N_with_PL_RED2 "chin" ; sgʷəlub+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷəlub N_with_PL_RED2 "chicken|pheasant" ; -sgʷigʷədilali+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədilali N_with_PL_RED2 "bathroom" ; -sgʷigʷədiltəd+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədiltəd N_with_PL_RED2 "toilet seat" ; +sgʷigʷədilali+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədilali N_with_PL_RED2 "bathroom" ; +sgʷigʷədiltəd+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}gʷigʷədiltəd N_with_PL_RED2 "toilet seat" ; silulč+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}silulč N_with_PL_RED2 "cup" ; siʔab+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}siʔab N_with_PL_RED2 "nobleman" ; skaykay+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kaykay N_with_PL_RED2 "" ; sk̓ʷaqʷ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}sk̓ʷaqʷ N_with_PL_RED2 "raven" ; -skʷəbšəd+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷə́bšəd N_with_PL_RED2 "animal hide" ; +skʷəbšəd+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷə́bšəd N_with_PL_RED2 "animal hide" ; skʷədulč+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷədulč N_with_PL_RED2 "bowl" ; sk̓ʷətɬ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}k̓ʷətɬ N_with_PL_RED2 "chipmunk" ; skʷəxʷic+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}kʷəxʷic N_with_PL_RED2 "silver salmon" ; @@ -251,8 +251,8 @@ sɬaɬədəyʔ+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaɬədəyʔ N_with_PL_ sɬax̌il+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬax̌il 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" ; -spədalikʷ+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pədalikʷ N_with_PL_RED2 "plant" ; +sp̓aƛ̕aƛ̕+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓aƛ̕aƛ̕ N_with_PL_RED2 "trash" ; +spədalikʷ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pədalikʷ N_with_PL_RED2 "plant" ; spiqʷuc+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}piqʷuc N_with_PL_RED2 "potato" ; spud+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}pud N_with_PL_RED2 "spoon" ; spuyaləpabš+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}puyaləpabš N_with_PL_RED2 "" ; @@ -264,7 +264,7 @@ sq̓əbayʔ+v3+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓əbiyuʔ N_with_PL_RED2 sq̓əbyaʔ+v4+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓əbyaʔ N_with_PL_RED2 "skunk" ; sqədᶻuʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qədᶻuʔ N_with_PL_RED2 "squirrel" ; sq̓ədᶻuʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ədᶻuʔ N_with_PL_RED2 "hair" ; -sqəlubs+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qəlubs N_with_PL_RED2 "" ; +sqəlubs+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qəlubs N_with_PL_RED2 "" ; sqibk̓ʷ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qibk̓ʷ N_with_PL_RED2 "octopus" ; sqigʷəc+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qigʷəc N_with_PL_RED2 "deer" ; sq̓ʷəlaɬəd+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷəláɬəd N_with_PL_RED2 "berry; fruit" ; @@ -294,11 +294,11 @@ swəwaʔdis+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}wəwaʔdis N_with_PL_RED2 "dan sx̌ayus+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ayus N_with_PL_RED2 "head" ; sx̌aʔaʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌aʔaʔ N_with_PL_RED2 "little neck steamer clams" ; sx̌əp̓ab+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əp̓ab N_with_PL_RED2 "cockle clam" ; -sxʷalacut+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷalacut N_with_PL_RED2 "picture" ; +sxʷalacut+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷalacut N_with_PL_RED2 "picture" ; sx̌ʷiƛ̕ayʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷiƛ̕ayʔ N_with_PL_RED2 "mountain goat" ; sx̌ʷiʔab+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷiʔab N_with_PL_RED2 "story" ; sx̌ʷuʔx̌ʷuʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷuʔx̌ʷuʔ N_with_PL_RED2 "fox" ; -syalt+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yalt N_with_PL_RED2 "" ; +syalt+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yalt N_with_PL_RED2 "" ; syaʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yaʔ N_with_PL_RED2 "friend" ; syaʔyaʔ+v1+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yáʔyaʔ N_with_PL_RED2 "friend, relative" ; syaʔyaʔ+v2+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yáyaʔ N_with_PL_RED2 "friend, relative" ; @@ -335,7 +335,7 @@ x̌qp̓ucid+N:x̌%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qp̓ucid N_with_PL_RED2 "kne xʷč̓iɬqs+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷč̓iɬqs N_with_PL_RED2 "large native oyster" ;! x̌ʷəlč+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ʷəlč N_with_PL_RED2 "bay|ocean" ; xʷƛ̕alap+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷƛ̕alap N_with_PL_RED2 "pot" ; -xʷt̕agʷtəd+N:xʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕agʷtəd N_with_PL_RED2 "shelf" ; +xʷt̕agʷtəd+N:xʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕agʷtəd N_with_PL_RED2 "shelf" ; yəlab+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəláb N_with_PL_RED2 "uncle|either parent's sibling of either sex when parent is deceased" ; yəl̕yəlab+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəl̕yəláb N_with_PL_RED2 "ancestors|parents" ;!correct contlex yəw̓yəɬdaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəw̓yəɬdaʔ N_with_PL_RED2 "fawn" ; diff --git a/src/fst/morphology/stems/nouns_newwords.lexc b/src/fst/morphology/stems/nouns_newwords.lexc index f3ed3f17..2ef3a4fd 100644 --- a/src/fst/morphology/stems/nouns_newwords.lexc +++ b/src/fst/morphology/stems/nouns_newwords.lexc @@ -23,24 +23,33 @@ səpləl+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}səpləl N_with_PL_RED2 "bread" ; səbəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}səbəd N_with_PL_RED2 "bee" ; qətqtač+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qətqtač N_with_PL_RED2 "woodpecker" ; q̓iq̓ax̌ad+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓iq̓ax̌ad N_with_PL_RED2 "goose" ; -sqigʷəc+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qigʷəc N_with_PL_RED2 "deer" ; -sq̓ʷalaš+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷalaš N_with_PL_RED2 "mallard duck" ; -səli+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}həli N_with_PL_RED2 "spirit" ; -səxʷtəč̓alikʷ+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təč̓alikʷ N_with_PL_RED2 "pointer" ; -səxʷp̓aʔad+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓aʔad N_with_PL_RED2 "what you taste with" ; -səxʷluudxʷ+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}luudxʷ N_with_PL_RED2 "what you hear with" ; -səxʷsubud+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}subud N_with_PL_RED2 "what you smell with" ; -səxʷyayus+N:səxʷ%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yayus N_with_PL_RED2 "what you do work with" ; +sqigʷəc+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qigʷəc N_with_PL_RED2 "deer" ; +sq̓ʷalaš+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}q̓ʷalaš N_with_PL_RED2 "mallard duck" ; +səli+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}həli N_with_PL_RED2 "spirit" ; +səxʷtəč̓alikʷ+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təč̓alikʷ N_with_PL_RED2 "pointer" ; +səxʷp̓aʔad+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}p̓aʔad N_with_PL_RED2 "what you taste with" ; +səxʷluudxʷ+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}luudxʷ N_with_PL_RED2 "what you hear with" ; +səxʷsubud+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}subud N_with_PL_RED2 "what you smell with" ; +səxʷyayus+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yayus N_with_PL_RED2 "what you do work with" ; +səxʷč̓əɬab+N:səxʷ%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}č̓əɬab N_with_PL_RED2 "video" ; +sus+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}sus N_with_PL_RED2 "sauce" ; təklus+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təklus N_with_PL_RED2 "owl" ; -stəq̓əxʷ+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təq̓əxʷ N_with_PL_RED2 "beaver" ; +stəq̓əxʷ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}təq̓əxʷ N_with_PL_RED2 "beaver" ; t̕it̕x̌əlaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}t̕it̕x̌əlaʔ N_with_PL_RED2 "grasshopper" ; x̌əč+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌əč N_with_PL_RED2 "mind, inner thoughts" ; x̌ibx̌ib+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}x̌ibx̌ib N_with_PL_RED2 "bird of prey" ; -syayus+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yayus N_with_PL_RED2 "work" ; -syəcəb+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəcəb N_with_PL_RED2 "information" ; +syayus+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yayus N_with_PL_RED2 "work" ; +syəcəb+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəcəb N_with_PL_RED2 "information" ; yuʔyubəč+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yuʔyubəč N_with_PL_RED2 "butterfly" ; ɬəčəb+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬəčəb N_with_PL_RED2 "weasel" ; -sdəx̌alqsačiʔ+N:s%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dəx̌alqsačiʔ N_with_PL_RED2 "fingers" ; +sdəx̌alqsačiʔ+N:s%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}dəx̌alqsačiʔ N_with_PL_RED2 "fingers" ; +xʷəlšucid+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}xʷəlšucid N_with_PL_RED2 "" ; +gʷədᶻadad+N:gʷədᶻadad N_with_PL_RED2 "teachings" ; +qʷuʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}qʷuʔ N_with_PL_RED2 "water" ; + + +! N_with_PL_RED2 "" ; +! N_with_PL_RED2 "" ; ! vim: set ft=xfst-lexc: diff --git a/src/fst/morphology/stems/pronouns.lexc b/src/fst/morphology/stems/pronouns.lexc index bf128309..1c4f4472 100644 --- a/src/fst/morphology/stems/pronouns.lexc +++ b/src/fst/morphology/stems/pronouns.lexc @@ -30,8 +30,10 @@ 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+Pron:kʷi PRON-DEM-MSC-REM_ ; -kʷi+Pron:kʷsi PRON-DEM-FEM-REM_ ; +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_ ; diff --git a/src/fst/morphology/stems/verbs.lexc b/src/fst/morphology/stems/verbs.lexc index 185a4163..dfddfa84 100644 --- a/src/fst/morphology/stems/verbs.lexc +++ b/src/fst/morphology/stems/verbs.lexc @@ -28,11 +28,11 @@ q̓ʷəld+V:q̓ʷəld V_KWEDAD "bake" ; q̓ʷəl+V:q̓ʷəl V_KWEDAD "bake; ripe" ; k̓ʷasəb+V:k̓ʷasəb V_CUTEB "roast" ; -labdxʷ+V:labdxʷ V_HUYTXW "manage to see" ; +labdxʷ+V:labd V_HUYTXW "manage to see" ; laʔbəd+V:laʔbəd V_KWEDAD "look" ; ʔiʔɬəd+V:ʔiʔɬəd V_KWEDAD "eat a little, nibblə" ; ʔiʔɬadəb+V:ʔìʔɬádəb V_CUTEB "eat berries as you pick them" ; -qʷalctxʷ+V:qʷalctxʷ V_KWEDAD "boil" ; +qʷalctxʷ+V:qʷalct V_HUYTXW "boil" ; c̓ix̌id+V:c̓ix̌id V_KWEDAD "fry sm" ; x̌ayəb+V:x̌áyəb V_CUTEB "laugh" ; t̓ək̓ʷəb+V:t̓ək̓ʷəb V_CUTEB "" ; @@ -53,6 +53,7 @@ tuləkʷ+V:tuləkʷ V_KWEDAD "" ; ʔabšədəb+V:ʔabšədəb V_CUTEB "extend ones foot" ; laqusəb+V:laqusəb V_CUTEB "look behind ones self (by turning head)" ; x̌ahab+V:x̌ahab V_CUTEB "" ; +č̓əɬab+V:č̓əɬab V_CUTEB "view" ; ʔistəb+V:ʔistəb V_CUTEB "" ; cutəb+v1+V:cutəb V_CUTEB "" ; cutəb+v2+V:cutab V_CUTEB "" ; @@ -87,14 +88,14 @@ kʷukʷcut+V:kʷukʷcut V_HELHED "cook" ; ʔəƛ̕+V:ʔəƛ̕ V_KWEDAD "" ; ƛ̕ax̌ʷ+V:ƛ̕ax̌ʷ V_KWEDAD "grow" ; -huytxʷ+V:huytxʷ V_HUYTXW "" ; -ʔux̌ʷtxʷ+V:ʔux̌ʷtxʷ V_HUYTXW "take" ; -yəhaw̓txʷ+V:yəhaw̓txʷ V_HUYTXW "proceed" ; -x̌aƛ̕txʷ+V:x̌aƛ̕txʷ V_HUYTXW "like, want" ; -ʔəƛɬtxʷ+V:ʔəƛɬtxʷ V_HUYTXW "feed" ; -haydxʷ+V:haydxʷ V_HUYTXW "know" ; -ləhaydxʷ+V:ləhaydxʷ V_HUYTXW "learn" ; -tix̌ix̌dxʷ+V:tix̌ix̌dxʷ V_HUYTXW "take care of it" ; +huytxʷ+V:huyt V_HUYTXW "" ; +ʔux̌ʷtxʷ+V:ʔux̌ʷt V_HUYTXW "take" ; +yəhaw̓txʷ+V:yəhaw̓t V_HUYTXW "proceed" ; +x̌aƛ̕txʷ+V:x̌aƛ̕t V_HUYTXW "like, want" ; +ʔəƛɬtxʷ+V:ʔəƛɬt V_HUYTXW "feed" ; +haydxʷ+V:hayd V_HUYTXW "know" ; +ləhaydxʷ+V:ləhayd V_HUYTXW "learn" ; +tix̌ix̌dxʷ+V:tix̌ix̌d V_HUYTXW "take care of it" ; tix̌ix̌dubut+V:tix̌ix̌dubut V_HUYTXW "take care of ones self" ; @@ -116,9 +117,11 @@ səx̌əb+V:səx̌əb V_CUTEB "dance" ; yəcəb+V:yəcəb V_CUTEB "give news" ; ɬiʔɬdahəb+V:ɬiʔɬdahəb V_CUTEB "troll for fish" ; ɬič̓itəb+V:ɬič̓itəb V_CUTEB "cut (passive)" ; +ɬič̓txʷ+V:ɬič̓t V_HUYTXW "" ; wiliq̓ʷitəb+V:wíliq̓ʷitəb V_CUTEB "ask (passive)" ; t̕uk̓ʷtub+V:t̕uk̓ʷtub V_HELHED "take home (passive? t̕uk̓ʷtxʷ)" ; q̓ʷuʔtəb+V:q̓ʷuʔtəb V_CUTEB "get gathered" ; +q̓ʷuʔtxʷ+V:q̓ʷuʔt V_HUYTXW "" ; bəq̓təb+V:bəq̓təb V_CUTEB "get swallowed" ; xʷak̓ʷisəb+V:xʷak̓ʷisəb V_CUTEB "to tire sm" ; kʷədayitəb+V:kʷədayitəb V_CUTEB "" ; @@ -128,7 +131,7 @@ kʷədayitəb+V:kʷədayitəb V_CUTEB "" ; lək̓ʷyitəb+V:lək̓ʷyitəb V_CUTEB "" ; lək̓ʷyid+V:lək̓ʷyid V_KWEDAD "" ; - +cilid+V:cilid V_KWEDAD "" ; p̓ayəq+V:p̓áyəq V_HELHED "hew" ; @@ -137,6 +140,7 @@ k̓ʷil+V:k̓ʷil V_HELHED "peek" ; təlawil+V:təlawil V_HELHED "run" ; tətəlawil+V:tətəlawil V_HELHED "jog" ; həliʔil+V:həliʔil V_HELHED "getting well|getting healthy" ; +pədixʷalusil+V:pədixʷalusil V_HELHED "get brown" ; ʔitut+V:ʔítut V_HELHED "sleep" ; gʷəč̓əb+V:gʷəč̓əb V_CUTEB "search for (agOr)" ;