From fb7f4b72d4c41ebc2ca9d21cbfd6de9ba875a893 Mon Sep 17 00:00:00 2001 From: Christopher Cox Date: Mon, 27 May 2024 15:57:31 -0400 Subject: [PATCH] Fixes to 3PL/4SG outer prefix allomorphs in yi-PROG and yi-POT --- .../affixes/verb_inner_affixes.lexc | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/fst/morphology/affixes/verb_inner_affixes.lexc b/src/fst/morphology/affixes/verb_inner_affixes.lexc index 59c4316..2d11222 100644 --- a/src/fst/morphology/affixes/verb_inner_affixes.lexc +++ b/src/fst/morphology/affixes/verb_inner_affixes.lexc @@ -1233,8 +1233,8 @@ LEXICON yi-PROG-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@á #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@á #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yi #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yi #; LEXICON yis-PROG-AFF-NoPrefix @@ -1274,8 +1274,8 @@ LEXICON yis-PROG-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ás #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ás #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yis #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yis #; LEXICON yii-PROG-AFF-NoPrefix @@ -1313,8 +1313,8 @@ LEXICON yii-PROG-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@áá #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@áá #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yii #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yii #; ! @@ -1380,8 +1380,8 @@ LEXICON yi-POT-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@í #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@í #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yi #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yi #; LEXICON yis-POT-AFF-NoPrefix @@ -1425,8 +1425,8 @@ LEXICON yis-POT-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ís #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ís #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yis #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yis #; LEXICON yii-POT-AFF-NoPrefix @@ -1448,19 +1448,19 @@ LEXICON yii-POT-AFF-InnerPrefix ! gudìyisnát "I might speak", not *gudisnát). @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@@R.LOWTONE.ON@yis #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@@D.LOWTONE@ís #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@yíí #; -! The same restriction applies in 3SG, 3PL, and 4SG forms, where only yis- -! appears, not ís-. -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@@R.LOWTONE.ON@yii #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@@D.LOWTONE@íí #; +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@yíí #; +! The same restriction applies in 3SG, 3PL, and 4SG forms, where only yii- +! appears, not íí-. +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@@R.LOWTONE.ON@yii #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@@D.LOWTONE@íí #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@yaà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@@R.LOWTONE.ON@yii #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@@D.LOWTONE@íí #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@@R.LOWTONE.ON@yii #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@@D.LOWTONE@íí #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@@R.LOWTONE.ON@yii #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@@D.LOWTONE@íí #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@@R.LOWTONE.ON@yii #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@@D.LOWTONE@íí #; LEXICON yii-POT-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@yis #; @@ -1470,8 +1470,8 @@ LEXICON yii-POT-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@yiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@yiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@yas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@íí #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@íí #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@yii #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@yii #; ! @@ -1567,36 +1567,36 @@ LEXICON is-IPFV-AFF-OuterPrefix LEXICON ii-IPFV-AFF-NoPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìs #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ii #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ii #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@às2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; LEXICON ii-IPFV-AFF-InnerPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìs #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ii #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ii #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@às2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; LEXICON ii-IPFV-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@is #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@íí #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ii #; ! CHECK: morphophonology OK? +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@íí #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ii #; ! CHECK: morphophonology OK? @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@i2saà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@i2siì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@i2siì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@as2 #; ! CHECK: morphophonology OK? -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; ! @@ -1703,37 +1703,37 @@ LEXICON isis-AFF-OuterPrefix LEXICON isii-AFF-NoPrefix ! Two 3P, 4 forms are attested (e.g., gììdùn, gìsdùn '3P got a swelling') @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìs #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìs #; LEXICON isii-AFF-InnerPrefix ! Note 3SG/3PL/4SG ìì- in this paradigm, compared to si-(I)PFV 3SG/4PL/4SG ìs-. @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@as #; -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsí #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì #; @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #; @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; LEXICON isii-AFF-OuterPrefix @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis #; ! CHECK: morphophonology OK? -@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí #; -@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; ! CHECK: morphophonology OK? +@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí #; +@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìì #; ! CHECK: morphophonology OK? @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #; ! CHECK: morphophonology O? @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì #; ! CHECK: morphophonology OK? @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #; ! CHECK: morphophonology ? @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; ! CHECK: morphophonology OK? -@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; -@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #; +@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìì #; +@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìì #;