disam, func, dep og stems

giellalt · Nov 8, 2023 · ddaaaf8 · ddaaaf8
1 parent e931839
commit ddaaaf8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3
@@ -4006,6 +4006,15 @@ SETPARENT:OrObl0101 @CL-CIT> + CONT - ADV-LU - ("nipi" QAR) + &&CONT_V& IF
 TO (*1 OQARPOQ + &&CONT_V& BARRIER CON_CAU OR VFIN - ORATIOOBLVERB LINK NEGATE -*1 ("taama") OR ("nalinginnaq")) #oo ved oqarpoq aldrig simultan med taama
 ; #Er dette mon overkill eller skal det med
 
+SETPARENT:OrObl0102 @CL-CIT> + CONT - FossileredeCont + TRANSVERB - ADV-LU - ("nipi" QAR) IF
+(NOT p (*))
+(NEGATE *1 OQARPOQ LINK *-1 KOMMA LINK *-1 _TARGET_ LINK *-1 VFIN BARRIER VERB-NOTCONT)#Tamanna pisinnaavoq aningaaserivik SULEQATIGALUGU imaluunniit nammineq eqqarsaatersornikkut, Klaus Eskildsen oqarpoq.
+(NEGATE *1 OQARPOQ LINK 1 (":"))#Pakkuppara, UAATERUJOORLUGU oqarfigaara:
+(NEGATE *1 OQARPOQ LINK *1 Par BARRIER V)#piniartoq TIKKUARLUGU oqarpoq taanna tassaasoq »inuk«, imminullu taava tikkuarpoq oqarlunilu nammineq tassaalluni »inussuaq«.
+(NEGATE *-1W DIRTALESLUT BARRIER VERB-NOTCONT)#- Aa, silaannarik! Emilie malarluni silaannaq NAJOORTUUTIGALUGU oqarpoq. 
+TO (*1A OQARPOQ BARRIER CON_CAU OR VFIN - ORATIOOBLVERB LINK NEGATE -*1 ("taama") OR ("nalinginnaq") BARRIER V) #oo ved oqarpoq aldrig simultan med taama
+;
+
 #!! @RULENAME@
 
 SETPARENT:OrObl0110 @CL-CIT> + Par + &&IV_SUBJ& IF

diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
@@ -9284,11 +9284,12 @@ REMOVE:4913L (Adv) IF (-1 Ins) #Misiginneqataarrapput, najugaqartunngooq ajunngi
 (NEGATE 0 ADVERBIEL LINK 1 VFIN)#PL20230107 Ataqqinartuaraq issiavissarsioraluarpoq, ulloriaararli qallersaammik ukaliatsiap amianik sanaamik TAMAVIMMIK poorsimavoq.
 (NEGATE 0 ("asuli" Adv) LINK 0 ("asu") + CONJ-C LINK NOT -1 BOS OR KOMMA) #PL20230107 Ataatsimiititaliami IA-mit ilaasortaatitaq imaalillartoq aatsaat aamma akuliuppoq suliat naammassilersullu, suliamik ASULI kinguarsaaniarnermik, asulilu piffissaanngitsukkut oqallittoqarnissaanik kissaateqaannarluni, Enok Sandgreen, kommunimut qinersinermi kingullermi IA-mit tunuarluni attaviitsunngortoq, qanittukkullu Siumumut nuuttoq, tusagassiuutinut taama allappoq.
 (NEGATE 0 ("iluamik"))
+(NEGATE 0 ("illuttut"))
 ;
 SELECT:4913M ("aasiit") + Interj IF (0 MI OR AASIIT);
 SELECT:4913N ("qaa") IF (-1 BOS OR DIRTALESTART);
 REMOVE:4913O ("useq") + Lok IF (0 ("usi") + MI);
-
+SELECT:4913P ("illuttut"); #lav undtagelser når de kommer ("de sneblinde" eller "ligesom mine/dine fætre" eller "ligesom mit/dit hus")
 
 # Nomen eller numerale. Mulige Num, som ikke er adled, skal nok være N + KASUS frem for Num. Dette gælder dog ikke ved klokken
 REMOVE:4914X ("ata") + USIQ IF (0 ("ataaseq")) ; #Irriterende genkommende fejl
@@ -10185,7 +10186,7 @@ REMOVE:5639J HTR + ("ajor") IF (0 SI + ("ajor") OR ("ajorsi")) ;
 REMOVE:5639K TAR + UTE IF (0 TAQ - UTE) 
 (NEGATE 0 ("sinersor")); #sinersortaat
 SELECT:5639L SAAR + ("apeqqarip") OR ("apeqqarissaar") ;
-REMOVE:5639M U + TIP IF (0 (/\".*p\"/r) - TIP OR UTE) ;
+REMOVE:5639M U + TIP IF (0 (/\".*p\"/r) - TIP OR UTE);
 REMOVE:5639N (*) - Gram/Pass IF (0 (/Gram/Pass\ NIQ/l)) #Aasaanerani nalunaaquttap *siuartinnissaa piffissanngorpoq.
 (NEGATE 0 Gram/IV + NIQ OR Gram/HV + NIQ OR NIQAR)(NEGATE 0 Gram/Refl LINK -1 ("immi"))(NEGATE 0 Gram/Refl + (/\ NNGUR\ Der/nv\ Gram/IV\ TIP\ /l)) #qinigassanngortinnissamut
 (NEGATE 0 (/Gram/TV\ NIQ/l) + Gram/Comp LINK 1 TRANSVERB) #må ikke slette korrekte Gram/Comp .. angunni ASALIVINNEQ sapissavaa
@@ -12042,6 +12043,8 @@ REMOVE:9969BZ (/"aki"\ Gram/TV\ \(iSem/answer\ \)?TUSSAA/l) IF (0 (/"aki"\ Gram/
 
 REMOVE:9969CA ("pi") + TARIAQAR + TIP + Con + 1Sg + 3SgO IF (0 2Sg LINK *0 2Sg OR 2SgO OR 2SgPoss); #PISARIAQARTISSAGUKKU imminut toqunnissannut ikiorsinnaavakkit.”
 
+REMOVE:9969CB (/SIMA\ Der/vv\ Gram/Pass\ Gram/IV\ NAR\ Der/vv/l) IF (0 (/SIMA\ Der/vv\ NAR\ Der/vv/l)); #MISIGISIMANARSILLUNI igaffimmi arlaannik sunik kajungerinartoqartoq.
+
 
 ##################################################
 # Specifikke regler til disambiguering af Gram/TV vs. Gram/Db

diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc
@@ -13727,7 +13727,7 @@ kajummisaavissoq Z1Zmorf ;
 kajungerinerusaq Z1Zmorf ;
 kajungerisaq Z1Zmorf ;
 kajungerisaqarfik Z2-Zmorf ;
-kajungerisoq Z1Zmorf ;
+!kajungerisoq Z1Zmorf ; !KW08112023
 kajungernaqisoq Z1Zmorf ;
 kajungernartoq Z1Zmorf ;
 kajungerneq Z2Zmorf ;
@@ -25779,7 +25779,7 @@ qaartiterut tptmorf ;
 qaartiterutissaq Z1Zmorf ;
 qaartiuissoq Z1Zmorf ;
 qaartiuitsoq Z1Zmorf ;
-qaartooq Z1Zmorf ;
+!qaartooq Z1Zmorf ; !KW08112023
 qaartoorneq Z2Zmorf ;
 qaartoornersuaq Z2aqZmorf ;
 qaartorsuusoq Z1Zmorf ;

diff --git a/src/fst/stems/verbs.lexc b/src/fst/stems/verbs.lexc
@@ -6335,7 +6335,7 @@ kajummisaar IV_long_stem ;
 kajummisaartip HTR_C_TAQ_tsi ;
 kajummisaarutige:kajummisaarutig HTR_schwa_SAQ_nnip ;
 kajummisaavip XIiXmorf_stem ;
-kajungerinar IV_r_stem ;
+!kajungerinar IV_r_stem ; !KW08112023
 kajungerivallaar HTR_longi_GAQ_nnip ;
 kajungernar IV_r_stem ;
 kajungernaap XItsXmorf_stem ;
@@ -18638,8 +18638,8 @@ saveror HTR_r_GAQ_i ;
 saverortip HTR_C_TAQ_tsi ;
 saviarpalup IV_k_stem ;
 savikkaarpalup IV_k_stem ;
-savilersor HTR_r_GAQ_i ;
-savilersor IV_r_stem ;
+!savilersor HTR_r_GAQ_i ; !KW08112023
+!savilersor IV_r_stem ; !KW08112023
 saviminaarpalup IV_k_stem ;
 saviminerpalup IV_k_stem ;
 saviminiu IV_voq_stem ;