conflict resolved inshallah

wibarab · Aug 22, 2024 · 7bf267b · 7bf267b
2 parents 3014f5a + 3577d27
commit 7bf267b
Show file tree

Hide file tree

Showing 75 changed files with 9,722 additions and 19,041 deletions.
diff --git a/010_manannot/features/feature_AKL_3sgm_ipfv.xml b/010_manannot/features/feature_AKL_3sgm_ipfv.xml
@@ -107,20 +107,22 @@
          </div>
 
          <div xmlns:tei="http://www.tei-c.org/ns/1.0" type="featureValueObservations">
-            <wib:featureValueObservation xml:id="ft_akl_3sgm_ipfv.fv_0050" status="draft" resp="dmp:AID">
-               <name type="featureValue" ref=""/>
+            <wib:featureValueObservation xml:id="ft_akl_3sgm_ipfv.fv_0050" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_ipfv_yaakil"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
                <placeName ref="geo:ed_dhayra"/>
                <lang corresp="..\profiles\vicav_profile_LBN-ARA.xml"/>
                <personGrp role="tribe" corresp="pgr:aramsha_lebanon"/>
+               <cit type="sourceRepresentation"><quote>yākul</quote></cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_akl_3sgm_ipfv.fv_0063" status="draft" resp="dmp:AID">
-               <name type="featureValue" ref=""/>
+            <wib:featureValueObservation xml:id="ft_akl_3sgm_ipfv.fv_0063" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_ipfv_yaakil"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
                <placeName ref="geo:khalde"/>
                <lang corresp="..\profiles\vicav_profile_LBN-KHA.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_xalde"/>
+               <cit type="sourceRepresentation"><quote>yākul</quote></cit>
             </wib:featureValueObservation>
 
             <wib:featureValueObservation xml:id="ft_akl_3sgm_ipfv.fv_0071" status="done" resp="dmp:AID">
@@ -131,6 +133,7 @@
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
                <personGrp role="ageGroup" corresp="pgr:old"/>
+               <cit type="sourceRepresentation"><quote>yākul</quote></cit>
                <note type="general">Very old speakers (70+) sometimes use kila-yākul and čila-yākul, in variation with ʔakal - yākul. Old speakers use all the aforementioned reflexes, except for čila - yākul.</note>
             </wib:featureValueObservation>
 
@@ -142,6 +145,7 @@
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
                <personGrp role="ageGroup" corresp="pgr:old"/>
+               <cit type="sourceRepresentation"><quote>yākul</quote></cit>
                <note type="general">Very old speakers (70+) sometimes use kila-yākul and čila-yākul, in variation with ʔakal - yākul. Old speakers use all the aforementioned reflexes, except for čila - yākul.</note>
             </wib:featureValueObservation>
 
@@ -152,7 +156,8 @@
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
                <personGrp role="ageGroup" corresp="pgr:old"/>
-               <note type="general">One 73 year old speaker from Karantina used kila-yōkil. In general very old speakers (70+) sometimes use kila-yākul and čila-yākul, in variation with ʔakal - yākul. Old speakers use all the aforementioned reflexes, except for čila - yākul.</note>
+               <cit type="sourceRepresentation"><quote>yōkil</quote></cit>
+               <note type="general">One 73 year old speaker from Karantina used occasionally kila-yōkil. In general very old speakers (70+) sometimes use kila-yākul and čila-yākul, in variation with ʔakal - yākul. Old speakers use all the aforementioned reflexes, except for čila - yākul.</note>
             </wib:featureValueObservation>
 
 

diff --git a/010_manannot/features/feature_AKL_3sgm_pfv.xml b/010_manannot/features/feature_AKL_3sgm_pfv.xml
@@ -135,26 +135,36 @@
          </div>
 
          <div xmlns:tei="http://www.tei-c.org/ns/1.0" type="featureValueObservations">
-            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0050" status="draft" resp="dmp:AID">
-               <name type="featureValue" ref=""/>
+            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0050" status="pre" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_pfv_kila"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
                <placeName ref="geo:ed_dhayra"/>
                <lang corresp="..\profiles\vicav_profile_LBN-ARA.xml"/>
                <personGrp role="tribe" corresp="pgr:aramsha_lebanon"/>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0063" status="draft" resp="dmp:AID">
-               <name type="featureValue" ref=""/>
+            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0063" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_pfv_kila"/>
+               <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
+               <placeName ref="geo:khalde"/>
+               <lang corresp="..\profiles\vicav_profile_LBN-KHA.xml"/>
+               <personGrp role="tribe" corresp="pgr:arab_xalde"/>
+               <cit type="sourceRepresentation"><quote>kila</quote></cit>
+            </wib:featureValueObservation>
+
+               <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0017" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_pfv_akal"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
                <placeName ref="geo:khalde"/>
                <lang corresp="..\profiles\vicav_profile_LBN-KHA.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_xalde"/>
+               <cit type="sourceRepresentation"><quote>ʔakal</quote></cit>
             </wib:featureValueObservation>
 
             <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0071" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#AKL_3sgm_pfv_kila"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
-               <placeName ref="geo:naameh"/>
+
                <placeName ref="geo:el_karantina"/>
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
@@ -165,7 +175,7 @@
             <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0059" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#AKL_3sgm_pfv_kila"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
-               <placeName ref="geo:naameh"/>
+
                <placeName ref="geo:el_karantina"/>
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
@@ -187,7 +197,7 @@
             <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0060" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#AKL_3sgm_pfv_akal"/>
                <bibl corresp="src:LEB_2022_AID" type="fieldwork"/>
-               <placeName ref="geo:naameh"/>
+
                <placeName ref="geo:el_karantina"/>
                <lang corresp="..\profiles\vicav_profile_LBN-MSX.xml"/>
                <personGrp role="tribe" corresp="pgr:arab_maslax"/>
@@ -536,8 +546,8 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0045" status="draft" resp="dmp:AID">
-               <name type="featureValue" ref=""/>
+            <wib:featureValueObservation xml:id="ft_akl_3sgm_pfv.fv_0045" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#AKL_3sgm_pfv_kala"/>
                <bibl corresp="zot:younes_2014_9863" type="publication"/>
                <placeName ref="geo:haouch_el_nabi"/>
                <lang corresp="..\profiles\vicav_profile_LBN-ABI.xml"/>

diff --git a/010_manannot/features/feature_IMP_2sg_m_3weak.xml b/010_manannot/features/feature_IMP_2sg_m_3weak.xml
@@ -2350,9 +2350,9 @@
                   </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_imp_2sg_m_3weak.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_imp_2sg_m_3weak.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#imp_2sgm_3w_iCvC"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
                <cit type="example" xml:id="ft_imp_2sg_m_3weak.fv_0131.ct_0103">

diff --git a/010_manannot/features/feature_IPFV_2sg_f.xml b/010_manannot/features/feature_IPFV_2sg_f.xml
@@ -2584,9 +2584,9 @@
                <lang corresp="..\profiles\vicav_profile_TUN-TSR.xml"/>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_2sg_f.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_ipfv_2sg_f.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#ipfv_2sgf_iin"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
             </wib:featureValueObservation>

diff --git a/010_manannot/features/feature_IPFV_3pl_m_c.xml b/010_manannot/features/feature_IPFV_3pl_m_c.xml
@@ -2967,9 +2967,9 @@
                <lang corresp="..\profiles\vicav_profile_TUN-TSR.xml"/>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_3pl_m_c.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_ipfv_3pl_m_c.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#ipfv_3plmc_uun"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
             </wib:featureValueObservation>

diff --git a/010_manannot/features/feature_IPFV_3sg_m_1w.xml b/010_manannot/features/feature_IPFV_3sg_m_1w.xml
@@ -1391,12 +1391,6 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0157" status="draft" resp="dmp:CL">
-               <name type="featureValue" ref=""/>
-               <bibl corresp="zot:" type="publication"/>
-               <placeName ref="geo:gaza"/>
-               <lang corresp="..\profiles\vicav_profile_PSE-GZA.xml"/>
-            </wib:featureValueObservation>
 
             <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0168" status="done" resp="dmp:CL">
                <name type="featureValue" ref="#ipfv_3sgm_1w_yuuCvC"/>
@@ -1413,11 +1407,17 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0113" status="draft" resp="dmp:CL">
-               <name type="featureValue" ref=""/>
-               <bibl corresp="zot:haidar_2006_8572" type="publication"/>
+            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0113" status="done" resp="dmp:CL">
+               <name type="featureValue" ref="#ipfv_3sgm_1w_yooCvC"/>
+               <bibl corresp="zot:blanc_1964_0001" type="publication"/>
                <placeName ref="geo:baghdad"/>
                <lang corresp="..\profiles\vicav_profile_IRQ-BGD.xml"/>
+               <cit type="example" xml:id="ft_ipfv_3sg_m_1w.fv_0113.ct_0000">
+                     <quote>yōgaʕ</quote>
+                     <cit type="translation">
+                        <quote>fall</quote>
+                     </cit>
+                  </cit>
             </wib:featureValueObservation>
 
             <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0119" status="done" resp="dmp:CL">
@@ -1551,12 +1551,6 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0167" status="draft" resp="dmp:CL">
-               <name type="featureValue" ref=""/>
-               <bibl corresp="zot:yoda_al_wer_2015_0000" type="publication"/>
-               <placeName ref="geo:isawiya"/>
-               <lang corresp="..\profiles\vicav_profile_PSE-ISW.xml"/>
-            </wib:featureValueObservation>
 
 
 
@@ -3028,9 +3022,9 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_ipfv_3sg_m_1w.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#ipfv_3sgm_1w_yiCvC"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
                <cit type="example" xml:id="ft_ipfv_3sg_m_1w.fv_0131.ct_0097">

diff --git a/010_manannot/features/feature_JAA_3pl_mc.xml b/010_manannot/features/feature_JAA_3pl_mc.xml
@@ -226,6 +226,22 @@
                <cit type="sourceRepresentation"><quote>ʔiju</quote>
                </cit>
             </wib:featureValueObservation>
+
+
+             <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0022" status="done" resp="dmp:AID">
+               <name type="featureValue" ref="#JAA_3plmc_pfv_iju"/>
+               <bibl corresp="zot:geva-kleinberger_2009_3208" type="publication"/>
+               <placeName ref="geo:tiberias"/>
+               <lang corresp="..\profiles\vicav_profile_ISR-TBR.xml"/>
+               <personGrp role="religion" corresp="pgr:jews"/>
+               <cit type="sourceRepresentation"><quote>ʔižu</quote></cit>
+               <cit xml:id="ft_jaa_3pl_mc.fv_0022.ct_0000" type="example" >
+                     <quote>ʔižu (p.40)</quote>
+                     <cit type="translation">
+                        <quote>they came</quote>
+                     </cit>
+                  </cit>
+            </wib:featureValueObservation>
 
             <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0027" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#JAA_3plmc_pfv_jam"/>
@@ -240,7 +256,7 @@
 
             <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0026" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#JAA_3plmc_pfv_aju"/>
-               <bibl corresp="zot:geva_kleinberger_2004_0000" type="publication" status="CHECKME"><!--potentially ambiguous references--></bibl>
+               <bibl corresp="zot:geva_kleinberger_2004_0000" type="publication"/>
                <placeName ref="geo:haifa"/>
                <lang corresp="..\profiles\vicav_profile_ISR-HAI.xml"/>
                <cit type="sourceRepresentation"><quote>ʔažu</quote>
@@ -738,19 +754,19 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0171" status="draft" resp="dmp:CL">
+            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0171" status="done" resp="dmp:CL">
                <name type="featureValue" ref="#JAA_3plmc_pfv_ajaw"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="zot:AbuNahleh_1985_6344" type="publication"/>
                <placeName ref="geo:ramallah"/>
                <lang corresp="..\profiles\vicav_profile_PSE-RML.xml"/>
                <cit type="sourceRepresentation">
                   <quote>aǧaw</quote>
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0055" status="draft" resp="dmp:CL">
+            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0055" status="done" resp="dmp:CL">
                <name type="featureValue" ref="#JAA_3plmc_pfv_aju"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="zot:AbuNahleh_1985_6344" type="publication"/>
                <placeName ref="geo:ramallah"/>
                <lang corresp="..\profiles\vicav_profile_PSE-RML.xml"/>
                <cit type="sourceRepresentation">
@@ -1496,9 +1512,9 @@
                <lang corresp="..\profiles\vicav_profile_TUN-TSR.xml"/>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_jaa_3pl_mc.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#JAA_3plmc_pfv_jaw"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
             </wib:featureValueObservation>

diff --git a/010_manannot/features/feature_JAA_3sg_f.xml b/010_manannot/features/feature_JAA_3sg_f.xml
@@ -242,18 +242,21 @@
 
             <wib:featureValueObservation xml:id="ft_jaa_3sg_f.fv_0026" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#JAA_3sgmf_pfv_ijat"/>
-               <bibl corresp="zot:behnstedt_2019_6122" type="publication"/>
+               <bibl corresp="zot:geva_kleinberger_2004_0000" type="publication"/>
                <placeName ref="geo:haifa"/>
                <lang corresp="..\profiles\vicav_profile_ISR-HAI.xml"/>
+               <personGrp role="religion" corresp="#jews"/>
                <cit type="sourceRepresentation"><quote>ʔiǧat / ʔižat</quote>
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_jaa_3sg_f.fv_0043" status="draft" resp="dmp:AID">
+            <wib:featureValueObservation xml:id="ft_jaa_3sg_f.fv_0043" status="done" resp="dmp:AID">
                <name type="featureValue" ref="#JAA_3sgmf_pfv_ajat"/>
-               <bibl corresp="zot:behnstedt_2019_6122" type="publication"/>
+               <bibl corresp="zot:geva_kleinberger_2004_0000" type="publication"/>
                <placeName ref="geo:haifa"/>
                <lang corresp="..\profiles\vicav_profile_ISR-HAI.xml"/>
+               <personGrp role="religion" corresp="#christians"/>
+               <personGrp role="religion" corresp="#muslims"/>
                <cit type="sourceRepresentation"><quote>ʔaǧat / ʔažat</quote>
                </cit>
             </wib:featureValueObservation>
@@ -1742,9 +1745,9 @@
                </cit>
             </wib:featureValueObservation>
 
-            <wib:featureValueObservation xml:id="ft_jaa_3sg_f.fv_0131" status="draft" resp="dmp:SP">
+            <wib:featureValueObservation xml:id="ft_jaa_3sg_f.fv_0131" status="done" resp="dmp:SP">
                <name type="featureValue" ref="#JAA_3sgmf_pfv_jat"/>
-               <bibl corresp="" type="publication"/>
+               <bibl corresp="src:TUR_2002-2022_SP" type="publication"/>
                <placeName ref="geo:shanliurfa"/>
                <lang corresp="..\profiles\vicav_profile_TUR-URF.xml"/>
             </wib:featureValueObservation>