From 302cb87ce72dc464df3d7a37d400a814123ccae7 Mon Sep 17 00:00:00 2001 From: VeronikaEngler Date: Wed, 16 Aug 2023 10:10:20 +0200 Subject: [PATCH 1/5] add borg to template --- 010_manannot/features/features_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/010_manannot/features/features_template.xml b/010_manannot/features/features_template.xml index c8e1019f5..9ac7ce39f 100644 --- a/010_manannot/features/features_template.xml +++ b/010_manannot/features/features_template.xml @@ -1970,7 +1970,7 @@ - + From da12ab7bec8799eb3ec5a9917e01e2aeb450b488 Mon Sep 17 00:00:00 2001 From: VeronikaEngler Date: Wed, 16 Aug 2023 10:43:05 +0200 Subject: [PATCH 2/5] add borg to files --- .../features/feature_AKL_3sgm_pfv_ipv.xml | 2 +- .../features/feature_IPFV_3pl_m_c.xml | 2 +- .../features/feature_IPFV_3sg_m_1w.xml | 2 +- 010_manannot/features/feature_JAA_3pl_mc.xml | 2 +- 010_manannot/features/feature_JAA_3sg_mf.xml | 2 +- 010_manannot/features/feature_PFV_3pl_m_c.xml | 2 +- .../features/feature_PFV_3pl_m_c_3wy.xml | 2 +- 010_manannot/features/feature_PFV_3sg_f.xml | 2 +- .../features/feature_PFV_3sg_f_3wy.xml | 2 +- .../features/feature_apophonic_passive.xml | 2 +- .../features/feature_gahawa1_CaGCvC.xml | 2 +- .../features/feature_gahawa1_aGCaC.xml | 2 +- .../features/feature_gahawa1_maGCuuC.xml | 2 +- .../features/feature_gahawa1_yaGCvC.xml | 2 +- 010_manannot/features/feature_gahawa2.xml | 2 +- .../feature_raising_a_pretonic_closed.xml | 2 +- .../feature_raising_a_pretonic_closed_i.xml | 2 +- .../feature_raising_a_pretonic_open.xml | 2 +- .../feature_raising_a_pretonic_open_i.xml | 2 +- .../feature_raising_a_stressed_closed_.xml | 2 +- .../feature_raising_a_stressed_open_.xml | 2 +- .../features/feature_t_form_passive.xml | 651 +++++++++++++----- 22 files changed, 504 insertions(+), 189 deletions(-) diff --git a/010_manannot/features/feature_AKL_3sgm_pfv_ipv.xml b/010_manannot/features/feature_AKL_3sgm_pfv_ipv.xml index 07959e842..9c789d5b6 100644 --- a/010_manannot/features/feature_AKL_3sgm_pfv_ipv.xml +++ b/010_manannot/features/feature_AKL_3sgm_pfv_ipv.xml @@ -2158,7 +2158,7 @@ - + diff --git a/010_manannot/features/feature_IPFV_3pl_m_c.xml b/010_manannot/features/feature_IPFV_3pl_m_c.xml index 6481e3df8..417b8ac40 100644 --- a/010_manannot/features/feature_IPFV_3pl_m_c.xml +++ b/010_manannot/features/feature_IPFV_3pl_m_c.xml @@ -2696,7 +2696,7 @@ - + diff --git a/010_manannot/features/feature_IPFV_3sg_m_1w.xml b/010_manannot/features/feature_IPFV_3sg_m_1w.xml index 4603ae88e..2f4cd8209 100644 --- a/010_manannot/features/feature_IPFV_3sg_m_1w.xml +++ b/010_manannot/features/feature_IPFV_3sg_m_1w.xml @@ -2150,7 +2150,7 @@ - + diff --git a/010_manannot/features/feature_JAA_3pl_mc.xml b/010_manannot/features/feature_JAA_3pl_mc.xml index 81d05e03d..5fb6d9715 100644 --- a/010_manannot/features/feature_JAA_3pl_mc.xml +++ b/010_manannot/features/feature_JAA_3pl_mc.xml @@ -1832,7 +1832,7 @@ - + diff --git a/010_manannot/features/feature_JAA_3sg_mf.xml b/010_manannot/features/feature_JAA_3sg_mf.xml index 624928a65..4a3841542 100644 --- a/010_manannot/features/feature_JAA_3sg_mf.xml +++ b/010_manannot/features/feature_JAA_3sg_mf.xml @@ -2028,7 +2028,7 @@ - + diff --git a/010_manannot/features/feature_PFV_3pl_m_c.xml b/010_manannot/features/feature_PFV_3pl_m_c.xml index bb28031f1..4146062ef 100644 --- a/010_manannot/features/feature_PFV_3pl_m_c.xml +++ b/010_manannot/features/feature_PFV_3pl_m_c.xml @@ -2543,7 +2543,7 @@ - + diff --git a/010_manannot/features/feature_PFV_3pl_m_c_3wy.xml b/010_manannot/features/feature_PFV_3pl_m_c_3wy.xml index 1fc01951a..6fc58a07f 100644 --- a/010_manannot/features/feature_PFV_3pl_m_c_3wy.xml +++ b/010_manannot/features/feature_PFV_3pl_m_c_3wy.xml @@ -2509,7 +2509,7 @@ - + diff --git a/010_manannot/features/feature_PFV_3sg_f.xml b/010_manannot/features/feature_PFV_3sg_f.xml index 7c256a241..9146c20db 100644 --- a/010_manannot/features/feature_PFV_3sg_f.xml +++ b/010_manannot/features/feature_PFV_3sg_f.xml @@ -2729,7 +2729,7 @@ - + diff --git a/010_manannot/features/feature_PFV_3sg_f_3wy.xml b/010_manannot/features/feature_PFV_3sg_f_3wy.xml index b3ba72d3e..9f14cd2dc 100644 --- a/010_manannot/features/feature_PFV_3sg_f_3wy.xml +++ b/010_manannot/features/feature_PFV_3sg_f_3wy.xml @@ -2407,7 +2407,7 @@ - + diff --git a/010_manannot/features/feature_apophonic_passive.xml b/010_manannot/features/feature_apophonic_passive.xml index 084c20500..81abb73e5 100644 --- a/010_manannot/features/feature_apophonic_passive.xml +++ b/010_manannot/features/feature_apophonic_passive.xml @@ -1704,7 +1704,7 @@ - + diff --git a/010_manannot/features/feature_gahawa1_CaGCvC.xml b/010_manannot/features/feature_gahawa1_CaGCvC.xml index 81845db16..c0d5b4ece 100644 --- a/010_manannot/features/feature_gahawa1_CaGCvC.xml +++ b/010_manannot/features/feature_gahawa1_CaGCvC.xml @@ -1955,7 +1955,7 @@ - + diff --git a/010_manannot/features/feature_gahawa1_aGCaC.xml b/010_manannot/features/feature_gahawa1_aGCaC.xml index e37914cd3..6a0840082 100644 --- a/010_manannot/features/feature_gahawa1_aGCaC.xml +++ b/010_manannot/features/feature_gahawa1_aGCaC.xml @@ -1879,7 +1879,7 @@ - + diff --git a/010_manannot/features/feature_gahawa1_maGCuuC.xml b/010_manannot/features/feature_gahawa1_maGCuuC.xml index 99ce4346c..3be4697a6 100644 --- a/010_manannot/features/feature_gahawa1_maGCuuC.xml +++ b/010_manannot/features/feature_gahawa1_maGCuuC.xml @@ -1955,7 +1955,7 @@ - + diff --git a/010_manannot/features/feature_gahawa1_yaGCvC.xml b/010_manannot/features/feature_gahawa1_yaGCvC.xml index 6e5d49a75..88ad939e4 100644 --- a/010_manannot/features/feature_gahawa1_yaGCvC.xml +++ b/010_manannot/features/feature_gahawa1_yaGCvC.xml @@ -1955,7 +1955,7 @@ - + diff --git a/010_manannot/features/feature_gahawa2.xml b/010_manannot/features/feature_gahawa2.xml index 8b11f017b..5a6a2ea56 100644 --- a/010_manannot/features/feature_gahawa2.xml +++ b/010_manannot/features/feature_gahawa2.xml @@ -1960,7 +1960,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_pretonic_closed.xml b/010_manannot/features/feature_raising_a_pretonic_closed.xml index 56053b89a..38b0e2078 100644 --- a/010_manannot/features/feature_raising_a_pretonic_closed.xml +++ b/010_manannot/features/feature_raising_a_pretonic_closed.xml @@ -2259,7 +2259,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_pretonic_closed_i.xml b/010_manannot/features/feature_raising_a_pretonic_closed_i.xml index d9af35dcc..5ec910c67 100644 --- a/010_manannot/features/feature_raising_a_pretonic_closed_i.xml +++ b/010_manannot/features/feature_raising_a_pretonic_closed_i.xml @@ -1544,7 +1544,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_pretonic_open.xml b/010_manannot/features/feature_raising_a_pretonic_open.xml index eabe3e243..0486424f5 100644 --- a/010_manannot/features/feature_raising_a_pretonic_open.xml +++ b/010_manannot/features/feature_raising_a_pretonic_open.xml @@ -2142,7 +2142,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_pretonic_open_i.xml b/010_manannot/features/feature_raising_a_pretonic_open_i.xml index 7c8850a73..7dde57347 100644 --- a/010_manannot/features/feature_raising_a_pretonic_open_i.xml +++ b/010_manannot/features/feature_raising_a_pretonic_open_i.xml @@ -2708,7 +2708,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_stressed_closed_.xml b/010_manannot/features/feature_raising_a_stressed_closed_.xml index 16a0505ae..82275bd16 100644 --- a/010_manannot/features/feature_raising_a_stressed_closed_.xml +++ b/010_manannot/features/feature_raising_a_stressed_closed_.xml @@ -2126,7 +2126,7 @@ - + diff --git a/010_manannot/features/feature_raising_a_stressed_open_.xml b/010_manannot/features/feature_raising_a_stressed_open_.xml index 1698f62c8..fdcdd6a69 100644 --- a/010_manannot/features/feature_raising_a_stressed_open_.xml +++ b/010_manannot/features/feature_raising_a_stressed_open_.xml @@ -2459,7 +2459,7 @@ - + diff --git a/010_manannot/features/feature_t_form_passive.xml b/010_manannot/features/feature_t_form_passive.xml index 3f7351b14..d1e43e8dd 100644 --- a/010_manannot/features/feature_t_form_passive.xml +++ b/010_manannot/features/feature_t_form_passive.xml @@ -36,7 +36,7 @@ c - + @@ -44,7 +44,7 @@ - +
Feature Values @@ -52,17 +52,18 @@ - + - +
+ @@ -274,6 +275,8 @@ + + @@ -305,6 +308,14 @@ + + + + + + + + @@ -367,14 +378,6 @@ - - - - - - - - @@ -492,6 +495,14 @@ + + + + + + + + @@ -575,14 +586,6 @@ - - - - - - - - @@ -864,42 +867,110 @@ - - + - - - + + + - - - + + + + + + - + - - - + + + - + - - - + + + - + + + + + + - + + + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -909,6 +980,23 @@ + + + + + + + + + + + + + + + + + @@ -916,22 +1004,33 @@ - + - - - + + + - - + - - - + + + - + + + + + + + + + + + + + @@ -940,147 +1039,142 @@ - - - - - - - - - - + - - - + + + - + - - - + + + - + - - - + + + + - + - - - + + + + - + - - - - + + + - + - - - + + + + - - +Ff + - - - + + + - + - - - + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + @@ -1183,13 +1277,6 @@ - - - - - - - @@ -1381,20 +1468,21 @@ - - - - - - - - + + + + + + + + + @@ -1413,7 +1501,7 @@ - + @@ -1691,7 +1779,7 @@ - + @@ -1717,6 +1805,13 @@ + + + + + + + @@ -1752,6 +1847,13 @@ + + + + + + + @@ -1953,6 +2055,13 @@ + + + + + + + @@ -1960,6 +2069,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1974,6 +2188,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1988,6 +2295,13 @@ + + + + + + + @@ -2016,13 +2330,6 @@ - - - - - - - @@ -2037,11 +2344,12 @@ - + - - - + + + + @@ -2051,6 +2359,13 @@ + + + + + + +
From 4495133e06b082a638b6aa29649b0acaa11c8b65 Mon Sep 17 00:00:00 2001 From: iriartedia89 Date: Wed, 16 Aug 2023 13:40:41 +0200 Subject: [PATCH 3/5] IPFV 2 sg.f. FINISHED --- 010_manannot/features/feature_IPFV_2sg_f.xml | 246 +++++++++---------- 1 file changed, 111 insertions(+), 135 deletions(-) diff --git a/010_manannot/features/feature_IPFV_2sg_f.xml b/010_manannot/features/feature_IPFV_2sg_f.xml index 8a7b173da..67cff11a5 100644 --- a/010_manannot/features/feature_IPFV_2sg_f.xml +++ b/010_manannot/features/feature_IPFV_2sg_f.xml @@ -55,6 +55,10 @@ + + + + @@ -102,17 +106,39 @@ - - - + + + + + tišrabi + + you (f.sg) drink + + + + + + + + + + + + + tāxḏīn + + you (f.sg) take + + + Observed only in some speakers from the elderly group (+70), and only in defective and concave verbs in pausal position. - - + + @@ -142,186 +168,136 @@ - - - + + + + + tikətbi + + you (f.sg) write + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + btəkətbi + + you (f.sg) write + + - - + + + + bteḥmle + + you (f.sg) carry + + - - + + + + btəkətbi + + you (f.sg) write + + + -ei when in pausal position. - - + + + + btəḍərbi + + you (f.sg) hit + + + -ai in pausal position. - - + + + + btinzli + + you (f.sg) go down + + + + btinəzli + + you (f.sg) go down + + - - + + - - + + + + tənzli + + you (f.sg) go down + + + + tənəzli + + you (f.sg) go down + + - - + + - - + + From 0990ba787563a8e3449425b3438a303a9a2986f7 Mon Sep 17 00:00:00 2001 From: iriartedia89 Date: Wed, 16 Aug 2023 14:09:14 +0200 Subject: [PATCH 4/5] SAME --- 010_manannot/features/feature_IPFV_2sg_f.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/010_manannot/features/feature_IPFV_2sg_f.xml b/010_manannot/features/feature_IPFV_2sg_f.xml index 67cff11a5..c4f72d34c 100644 --- a/010_manannot/features/feature_IPFV_2sg_f.xml +++ b/010_manannot/features/feature_IPFV_2sg_f.xml @@ -152,21 +152,6 @@ - - - - - - - - - - - - - - - From f4db48a24c7cf5ce18ace22edaf7f081cfa5bc1e Mon Sep 17 00:00:00 2001 From: VeronikaEngler Date: Wed, 16 Aug 2023 14:42:09 +0200 Subject: [PATCH 5/5] work on passive --- .../features/feature_apophonic_passive.xml | 53 +- .../features/feature_t_form_passive.xml | 750 +++++++----------- 2 files changed, 301 insertions(+), 502 deletions(-) diff --git a/010_manannot/features/feature_apophonic_passive.xml b/010_manannot/features/feature_apophonic_passive.xml index 81abb73e5..f5b3e2fe0 100644 --- a/010_manannot/features/feature_apophonic_passive.xml +++ b/010_manannot/features/feature_apophonic_passive.xml @@ -1939,18 +1939,12 @@ - - + + - - - - - - - + There are some remnants of the apophonic passive left. @@ -1958,18 +1952,11 @@ - Additional to the apophonic passive some verbs'stems V, VII and VIII have passive meaning - - - - - - - + Additional to the apophonic passive some verbs' stems V, VII and VIII have passive meaning - - + + @@ -1989,20 +1976,13 @@ - - + + - - - - - - - @@ -2010,22 +1990,15 @@ - - - - - - - - - + + - - - + + + diff --git a/010_manannot/features/feature_t_form_passive.xml b/010_manannot/features/feature_t_form_passive.xml index d1e43e8dd..9eb797c05 100644 --- a/010_manannot/features/feature_t_form_passive.xml +++ b/010_manannot/features/feature_t_form_passive.xml @@ -36,7 +36,7 @@ c - + @@ -44,7 +44,7 @@ - +
Feature Values @@ -52,18 +52,17 @@ - - + + - +
- @@ -275,8 +274,6 @@ - - @@ -308,14 +305,6 @@ - - - - - - - - @@ -378,6 +367,14 @@ + + + + + + + + @@ -495,14 +492,6 @@ - - - - - - - - @@ -586,6 +575,14 @@ + + + + + + + + @@ -867,67 +864,67 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + @@ -938,39 +935,49 @@ - + - - - + + + - + - - - + + + - + - - - + + + + - + - - - + + + + - + - - - + + + + + + + + + + + @@ -980,13 +987,6 @@ - - - - - - - @@ -1004,25 +1004,11 @@ - - - - - - - - - - - - - - - + - - - + + + @@ -1032,74 +1018,92 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - + + + - + - - - - + + + - + - - - + + + - - - - - - - -Ff - + - - - + + + - + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1134,6 +1138,13 @@ Ff + + + + + + + @@ -1177,6 +1188,112 @@ Ff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1277,6 +1394,13 @@ Ff + + + + + + + @@ -1468,21 +1592,20 @@ Ff + + + + + + + - - - - - - - - - + @@ -1777,13 +1900,6 @@ Ff - - - - - - - @@ -1805,13 +1921,6 @@ Ff - - - - - - - @@ -1847,13 +1956,6 @@ Ff - - - - - - - @@ -1903,6 +2005,13 @@ Ff + + + + + + + @@ -2055,13 +2164,6 @@ Ff - - - - - - - @@ -2069,246 +2171,6 @@ Ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2323,13 +2185,6 @@ Ff - - - - - - - @@ -2337,35 +2192,6 @@ Ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - -