disam, func og dep

giellalt · Nov 20, 2023 · 2199df5 · 2199df5
1 parent 338e7f2
commit 2199df5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3
@@ -86,6 +86,10 @@ SETPARENT:M_faste0930 @i-ADVL> + ("kalaallisut") OR (/"kalaaleq"\ \(Sem/Hnat\ \)
 (NOT p (*))
 TO (1 ("oqaaseq" Pl));  
 
+SETPARENT:M_faste0935 @ADVL> + ("imeq") + Ins IF
+(NOT p (*))
+TO (*1 ("qatser")); #Qatserisartut sapinngisartik tamaat atorlugu qummut sakkortunerpaamik IMERMIK qatseripput.
+
 SETPARENT:D_tidlig0042B @ADVL>N + OTHERTIME OR SEASON IF
 (NOT p (*))
 (1 Num LINK 1 ("manna") + Rel )
@@ -10786,7 +10790,7 @@ SETPARENT:M1266Z @ADVL> + CONT IF
 (NEGATE *-1 VFIN BARRIER KOMMA)(NEGATE 0 4Pl LINK *1 Cau + 3Sg OR Cau + 4Sg LINK 1 EOS)
 TO (*1A Cau - @CL-<CIT BARRIER VFIN LINK 1 EOS);#
 #MAP:M1266H @i-<ADVL TARGET CONT + QQU + Gram/Db - CONJ-C IF (*-1 (TIP TAQ) + V) ;
-#MAP:M1266H @i-ADVL> TARGET CONT - ORATIOOBLVERB IF (1 CONT + QQU - CONJ-C OR Par + QQU - CONJ-C);
+#MAP:M1266H @i-ADVL> TARGET CONT - ORATIOOBLVERB - TIP IF (1 CONT + QQU - CONJ-C OR Par + QQU - CONJ-C);
 #@RULENAME@
 
 SETPARENT:M1266 @<ADVL + CONT - CONJ-LU - LI IF

diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
@@ -5373,6 +5373,7 @@ REMOVE:opremsning05 Abs + Pl - Num IF (0 Rel + Pl LINK *1 3PlPoss - ("Kalaallit
 (NEGATE 0 ("IP")) #Issuttuutingaarmanga kavaajara singissartuata eqqaatigut alippoq, ILUANIITTULLU oqorsaatit timmissat meqqui katagalerlutik.
 (NEGATE *1 OBLIQUE BARRIER V LINK *1 3PlPoss BARRIER V LINK *1 Abs + TAQ BARRIER V) #Assoroorlunga isiginiarsareruttorlugit, malugilerpara soorlu KIINNAT unnummut qitittut akornanni takusakka takoqqillugit.
 (NEGATE 0 Abs + Pl LINK 1 KOMMA LINK 1 3PlPoss) #Inuit uku anaanannut naggammik QANIUISUT, inuunerat qanormita oqitsigaa.
+(NEGATE 0 Abs + Pl LINK 1 Abs + Pl LINK 1 KOMMA LINK 1 3PlPoss) #Angigivaa, tulluarpallaarnanilu qarliinut koorpunut, ATUKUT qarsornikut, seeqquatigut illuttut alittornikut.
 ;
 
 REMOVE:opremsning06 (/"tassa"\ U/l) + Rel + Pl IF (*-1 (Abs Pl) LINK *1 3PlO BARRIER V LINK *1 _TARGET_ + Abs + Pl LINK NEGATE *1 V - Gram/Exclm BARRIER KOMMA); #Sisimiuni politiit sapaatip akunnerani kingullermi qamutit aqqanillit normuiarpaat, TASSAANERUSUT taxat, Sisimiut aviisiat Silleq nittartakkamini allappoq.
@@ -8983,7 +8984,9 @@ SELECT:SeHumHum HUMAN - V IF (-*1 HUMVERB)
 (NEGATE 0 ("ittu") OR ("ittoq") LINK 0 (/"ip"\ Gram/IV\ TUQ/l) LINK -1 ("immikkut") OR ("ima") OR ("taama") OR Lok)#Tamanna qinersinissap eqqarsaatigineqalerneranut aallartitsivoq, tamatumalu kingunerisaanik Inatsisartut immikkut ITTUMIK qinersisoqarnissaa isumaqatigiissutigaat.
 (NEGATE 0 ("inuiaqat") OR (/"inuiak"\ QATE/l))
 (NEGATE 0 (/"qallunaaq"\ \(iSem/Hnat\ \)?U\ Der/nv\ Orth/Arch\ Gram/IV\ TUUQ/l) LINK 0 ("qallunaatooq") )#QALLUNAATUUMUT
-(NEGATE 0 ("nakorsaat")); #Uannut misiginarpoq soorlu NAKORSAAMMIK nassaartunga, oqaasinngortissinnaanngisannut eqqarsaatigiuaannarsimasannulli puigorsaatissannik.
+(NEGATE 0 ("nakorsaat")) #Uannut misiginarpoq soorlu NAKORSAAMMIK nassaartunga, oqaasinngortissinnaanngisannut eqqarsaatigiuaannarsimasannulli puigorsaatissannik.
+(NEGATE 0 Par + CONJ-LU LINK -1 Par) #Nalunngilara Larsilu aappariittusi MEERARTAALERSUSILU.
+;
 SELECT:Se_illuNot_illoq ("illu") OR ("Illu") ; # "illu" mere sandsynlig end "illoq"
 SELECT:Se_ataata ("ataata") ; # mere sandsynlig end "ataataq"
 SELECT:Se_qaliaq ("q ORaliaq") ; # ad hoc for at forebygge 'hårbåndet' qaleq

diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
@@ -1646,6 +1646,8 @@ MAP:M_faste0925 @ADVL> TARGET ("toqqar") + CONT IF (*1 V); #Inuit allat utaqqisu
 
 MAP:M_faste0930 @i-ADVL> TARGET ("kalaallisut") OR (/"kalaaleq"\ \(Sem/Hnat\ \)?N\ Aeq\ Sg/l) IF (1 ("oqaaseq" Pl)); 
 
+MAP:M_faste0935 @ADVL> TARGET ("imeq") + Ins IF (*1 ("qatser")); #Qatserisartut sapinngisartik tamaat atorlugu qummut sakkortunerpaamik IMERMIK qatseripput.
+
 
 #######
 
@@ -8671,7 +8673,7 @@ MAP:M1266Y @ADVL> TARGET CONT IF (1* CONT + @PRED BARRIER VFIN) ;
 MAP:M1266Z @ADVL> TARGET CONT IF (*1 Cau - @CL-<CIT BARRIER VFIN LINK 1 EOS) (NEGATE *-1 VFIN BARRIER KOMMA)(NEGATE 0 4Pl LINK *1 Cau + 3Sg OR Cau + 4Sg LINK 1 EOS);
 
 MAP:M1266H @i-<ADVL TARGET CONT + QQU + Gram/Db - CONJ-C IF (*-1 (TIP TAQ) + V) ;
-MAP:M1266H @i-ADVL> TARGET CONT - ORATIOOBLVERB IF (1 CONT + QQU - CONJ-C OR Par + QQU - CONJ-C);
+MAP:M1266H @i-ADVL> TARGET CONT - ORATIOOBLVERB - TIP IF (1 CONT + QQU - CONJ-C OR Par + QQU - CONJ-C);
 
 #Forsøgt kørt helt uden KOMMA-begrænsning
 MAP:M1266 @<ADVL TARGET CONT - CONJ-LU - LI IF (*-1 VFIN - ORATIOOBLVERB)