Adding new words, reverting to Sg/Pl

giellalt · Jan 25, 2024 · 111f84f · 111f84f
1 parent 187e3d2
commit 111f84f
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 92 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: