Work with 134134

giellalt · Dec 21, 2023 · fda1f6b · fda1f6b
1 parent 5df0fe6
commit fda1f6b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/src/fst/affixes/nouns.lexc b/src/fst/affixes/nouns.lexc
@@ -18,6 +18,13 @@ LEXICON N_with_PL_RED2
 : SG-SUF ;
 : 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 ;
+
+
 LEXICON N_with_Distr_12323_RED5 !Der/Red5_12323
 !%^Red12323
 !: DIM_CV1toCV2C ;

diff --git a/src/fst/phonology.twolc b/src/fst/phonology.twolc
@@ -176,6 +176,16 @@ x̌ʷ
 %{p1%}:y̓
 %{p1%}:ʔ
 
+%{pØ%}:a
+%{pØ%}:i
+!%{pØ%}:o
+%{pØ%}:u
+!%{pØ%}:á
+!%{pØ%}:ú
+!%{pØ%}:í
+!%{pØ%}:ə́
+%{pØ%}:ə
+
 
 
 ! 3-segment reduplication
@@ -184,6 +194,7 @@ R31:b R31:l
 R32:l
 E3:ə
 !! place holders
+%{pØ%}:0
 %{p1%}:0
 %{p2%}:0
 %{p3%}:0
@@ -205,6 +216,7 @@ E3:ə
 
 %^RedPL123123:0 !!= * @CODE@ 3-segment reduplication 
 
+%^RedPL130130:0 !!= * @CODE@ ƛ̕xʷay: ƛ̕xʷaƛ̕xʷay 
 
 %^Pen:0 !!= * @CODE@ this combines with subsequent RmVow or perhaps RmCns
 %^RmVOW:0 !!= * @CODE@ this removes previous vowel or with Pen the penultimate vowel
@@ -369,6 +381,13 @@ Rules
 !         [ # | %^√:0 | %< ] Cns _ 0: [ Cns | Vow ] Lts:* %^Red1i13: ;
 !         [ # | %^√:0 | %< ] 0: 0: Cns _ 0: [ Cns | Vow ] Lts:* %^RedPL1i1i13: ;
 
+"%{pØ%}:a in reduplication"
+!! **@RULENAME@**
+ %{pØ%}:a <=> %{p3%}: %{p2%}: %{p1%}: _ Cns: Cns: [a|á] Lts:* [%^RedPL130130:] ;
+
+
+
+
 "%{p2%}:ə in reduplication"
 !! **@RULENAME@**
  %{p2%}:ə <=> %{p3%}: _ %{p1%}: Cns: ə Cns: Lts:* [%^RedPL123123:|%^Red12323:|%^Red12123:|%^Red12q13:|%^Red1213:] ;
@@ -409,26 +428,31 @@ Rules
 !! **@RULENAME@**
  %{p2%}:á <=> %{p3%}: _ %{p1%}: Cns:  á:  Cns: Lts:* [%^RedPL123123:|%^Red12323:|%^Red12123:|%^Red12q13:|%^Red1213:] ;
 
+"%{pØ%}:0"
+!! **@RULENAME@**
+ %{pØ%}:0 <=> %{p1%}: _ Lts:* \[ %^RedPL130130:] [ # | %>: ] ;
+
+
 "%{p1%}:0"
 !! **@RULENAME@**
- %{p1%}:0 <=> _ Lts:* [ %^RedPL1i1i13: | %^Red1i13: |%^Red1213:| # | %>: ] ;
+ %{p1%}:0 <=> _ (%{pØ%}:) Lts:* [ %^RedPL1i1i13: | %^Red1i13: |%^Red1213:| # | %>: ] ;
 
 "%{p2%}:0"
 !! **@RULENAME@**
  %{p2%}:0 <=> _ %{p1%}: Lts:* \[ %^RedPL1i1i13: | %^Red1i13: | %^RedPL123123: | %^Red12323: | %^Red1i123: |%^Red12123:| %^Red1iq13:|%^Red1iq123:] [ # | %>: ] ;
-
+            _ %{p1%}: %{pØ%}: Cns: Cns: Vow: Lts:* %^RedPL130130: ;   
 
 "%{p3%}:0"
 !! **@RULENAME@**
- %{p3%}:0 <=> _ %{p2%}:  %{p1%}: Lts:* \[ %^RedPL1i1i13: | %^Red1i13: | %^RedPL123123: | %^Red12323: | %^Red1i123: |%^Red1iq13:|%^Red1iq123:|%^Red12123:] [ # | %>: ] ;
+ %{p3%}:0 <=> _ %{p2%}:  %{p1%}: (%{pØ%}:) Lts:* \[ %^RedPL1i1i13: | %^Red1i13: | %^RedPL123123: | %^Red12323: | %^Red1i123: |%^Red1iq13:|%^Red1iq123:|%^Red12123:|%^RedPL130130:] [ # | %>: ] ;
 
 "%{p4%}:0"
 !! **@RULENAME@**
- %{p4%}:0 <=> _ %{p3%}:  %{p2%}:  %{p1%}: Lts:*  [ %^RedPL123123: | %^Red12323: | %^Red1i13: | %^Red1iq13:|%^Red1iq123:|%^Red12123:|%^Red12q13:|%^Red1213:| # | %>: ] ;
+ %{p4%}:0 <=> _ %{p3%}:  %{p2%}:  %{p1%}: (%{pØ%}:) Lts:*  [ %^RedPL123123: | %^Red12323: | %^Red1i13: | %^Red1iq13:|%^Red1iq123:|%^Red12123:|%^Red12q13:|%^Red1213:|%^RedPL130130:| # | %>: ] ;
 
 "%{p5%}:0"
 !! **@RULENAME@**
- %{p5%}:0 <=> _ %{p4%}: %{p3%}:  %{p2%}:  %{p1%}: Lts:* [ %^RedPL123123: | %^Red12323: | %^Red1i13: |%^Red1iq13:|%^Red1iq123:|%^Red12123:|%^Red12q13:|%^Red1213:| # | %>: ];
+ %{p5%}:0 <=> _ %{p4%}: %{p3%}:  %{p2%}:  %{p1%}: (%{pØ%}:) Lts:* [ %^RedPL123123: | %^Red12323: | %^Red1i13: |%^Red1iq13:|%^Red1iq123:|%^Red12123:|%^Red12q13:|%^Red1213:|%^RedPL130130:| # | %>: ];
 
 
 !!! ### CONSONANTS
@@ -461,13 +485,13 @@ d:t <=>	[ə:|»|i:|a:|u:] _ %^Pen: %^RmVOW: %^d2t: %> ə b  ;
 
 "%{p1%}:Cx in reduplication"
 !! **@RULENAME@**
- %{p1%}:Cx <=> %{p3%}: %{p2%}: _ Cns: Vow: Cx [ Cns | Vow ]* [%^RedPL123123:|%^Red12323:] ;
+ %{p1%}:Cx <=> %{p3%}: %{p2%}: _ (%{pØ%}:) Cns: (Vow:) Cx [ Cns | Vow ]* [%^RedPL123123:|%^Red12323:|%^RedPL130130:] ;
            where Cx in (kʷ b̓ ǰ n̓ m̓ p p̓ b t t̕ d dᶻ c c̓ č č̓ s š  ɬ ƛ̕  k k̓ k̓ʷ gʷ h xʷ q q̓ qʷ  x̌ x̌ʷ ) ;
 !!2017-11-27where Cx in (p b t t̕ d dᶻ č š l l̕ ɬ ƛ̕ w w̓ y̓ k̓ʷ gʷ q q̓ qʷ q̓ʷ x̌ x̌ʷ ʔ) ;
 
 "%{p3%}:Cx in reduplication"
 !! **@RULENAME@**
- %{p3%}:Cx <=> _ %{p2%}: %{p1%}: Cx Vow: Cns [ Cns | Vow ]* %^RedPL123123: ;
+ %{p3%}:Cx <=> _ %{p2%}: %{p1%}: (%{pØ%}:) Cx (Vow:) Cns [ Cns | Vow ]* [%^RedPL123123:|%^RedPL130130:] ;
                 _ %{p2%}: %{p1%}: Cx: Vow: Cns [ Cns | Vow ]* %^Red12323: ;
                _ %{p2%}: %{p1%}: Cx Vow: Cns [ Cns | Vow ]* [ %^Red1i13:|%^RedPL1i1i13:|%^Red1iq13:|%^Red1iq123:] ;
                _ %{p2%}: %{p1%}: Cx Vow Cns [ Cns | Vow ]* [ %^Red1i123:|%^Red12123:] ;

diff --git a/src/fst/root.lexc b/src/fst/root.lexc
@@ -307,6 +307,7 @@ y̓   !!= @CODE@
  {aä} {oö} {uü} !!= * @CODE@ 
 
 !! place holders
+%{pØ%} !!= * @CODE@ 
 %{p1%} !!= * @CODE@ 
 %{p2%} !!= * @CODE@ 
 %{p3%} !!= * @CODE@ 
@@ -327,6 +328,7 @@ y̓   !!= @CODE@
 %^RedPL1i1i13 !!= * @CODE@ 2-segment to 3-segments with vowel change Distr sčətxʷəd:sčičičtxʷəd Der/Red1_1i13_Distr_1212 
 %^RedPL123123 !!= * @CODE@ 3-segment preposed reduplication CVC-to-CVCCVC bəlups:bəlbəlups 
 %^Red12323 !!= * @CODE@ should work for Red3 and Red5
+%^RedPL130130 !!= * @CODE@ ƛ̕xʷay: ƛ̕xʷaƛ̕xʷay 
 
 %^Pen !!= * @CODE@ this combines with subsequent RmVow or perhaps RmCns
 %^RmVOW !!= * @CODE@ this removes previous vowel or with Pen the penultimate vowel

diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc
@@ -279,11 +279,12 @@ yəx̌ʷəlaʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}yəx̌ʷulaʔ N_with_PL_RED2 "eag
 ƛ̕ax̌ʷdup+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕ax̌ʷdup N_with_PL_RED2 "plants" ;
 ƛ̕iq̓s+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕iq̓s N_with_PL_RED2 "" ;
 ƛ̕ux̌ʷƛ̕ux̌ʷ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕ux̌ʷƛ̕ux̌ʷ N_with_PL_RED2 "" ;
-ƛ̕xʷayʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕xʷayʔ N_with_PL_RED2 "dogsalmon" ;
+ƛ̕xʷayʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ƛ̕xʷáyʔ N_with_PL_RED2 "dog salmon" ;
+ƛ̕xʷayʔ+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}%{pØ%}ƛ̕xʷáyʔ N_with_PL_RED130 "dog salmon" ;
 ǰəšəd+N:ǰə%^√%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}šəd N_with_PL_RED2 "" ;
 ɬalap+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬalap N_with_PL_RED2 "" ;
 ɬaləp̓+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaləp̓ N_with_PL_RED2 "" ;
-ɬaʔx̌+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaʔx̌ N_with_PL_RED2 "" ;
+ɬaʔx+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ɬaʔx̌ N_with_PL_RED2 "" ;
 ʔaləšək+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔaləšək N_with_PL_RED2 "" ;
 ʔalʔal+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔálʔal N_with_PL_RED2 "house" ;
 ʔiišəd+N:%{p5%}%{p4%}%{p3%}%{p2%}%{p1%}ʔiišəd N_with_PL_RED2 "" ;