From 85ca3f4c4ee5aed8978c76f40aea77792942a001 Mon Sep 17 00:00:00 2001
From: KennyMcFly <35669096+KennyMcFly@users.noreply.github.com>
Date: Fri, 22 Sep 2023 09:24:53 +0200
Subject: [PATCH] disam, func, dep og stems

---
 src/cg3/dep_KalEng.cg3    | 4 ++++
 src/cg3/disambiguator.cg3 | 7 ++++---
 src/cg3/functions.cg3     | 2 ++
 src/fst/stems/nouns.lexc  | 2 +-
 src/fst/stems/verbs.lexc  | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/cg3/dep_KalEng.cg3 b/src/cg3/dep_KalEng.cg3
index 020e42354..7da6a51c1 100644
--- a/src/cg3/dep_KalEng.cg3
+++ b/src/cg3/dep_KalEng.cg3
@@ -11062,6 +11062,10 @@ SETPARENT:M9970FD @N< + TUQ + $$KASUS + $$NUMERUS
 (NOT p (*))
 TO (*-1 N + $$KASUS + $$NUMERUS BARRIER (*) - CONT - OBLIQUE); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ.
 
+SETPARENT:M9970FE @ADVL> + (/INNAQ\ Der/vn\ N\ Abs\ Sg/l)
+(NOT p (*))
+TO (*1 V); #Igaffimmut aallarama TOQQAANNAQ kissaaviup tungaanut aallarpunga.
+
 #Farlige regler til at håndtere MIK-OBJ i Trm i stedet for Ins. Afhænger af LIST MUT-OBJ_SUBSTANDARD. NB Husk at tilføje reglerne som #SETPARENT i dep
 #SETPARENT:S9970B @i-MIK-OBJ> + Trm IF
 #(NEGATE *-1 (/@\(i-\)?MIK-OBJ>/r) BARRIER VFIN)
diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
index d45f46083..e09d40e35 100644
--- a/src/cg3/disambiguator.cg3
+++ b/src/cg3/disambiguator.cg3
@@ -14274,8 +14274,7 @@ SELECT:8534DC2 ("qiteq") + (/^i?Sem/L$/r) - Orth/Youth; #qeqqa er kun "midte"
 REMOVE:8599A TUQ + Aeq - Der/vn IF (0 TUQ + Aeq + Der/vn)(NEGATE 1 ("ip")); #De særlige former af TUQ + Aeq på transitiver fulgt af "ippaa" slettes hvis ikke fulgt af "ippaa"
 REMOVE:8599B (*) - LEX_FULLFORM_NOUN ; #Jude 20230908
 REMOVE:8599C (Sem/Location) (0 (Sem/an) + (/^[12][SP][gl]Poss$/r)) ; #Jude 20230915 qitinnut
-REMOVE:8599D (/"parnaarup"\ Gram/TV\ HTR\ Der/vv\ VIK\ Der/vn/l) IF (0 ("parnaarussivik")); 
-REMOVE:8599E ("niaqoq") + LAAQ IF (0 ("niaqulaar") LINK *0 ("parnaarup")) ; #Parnaarussammi najugaqatikka avatangiiseqannginnertik pissutigalugu, imminnut nakkutingaaramik NIAQULAALILERSUT isigaakka, amiilaarivakkalu.
+REMOVE:8599D ("niaqoq") + LAAQ IF (0 ("niaqulaar")) ; #Parnaarussammi najugaqatikka avatangiiseqannginnertik pissutigalugu, imminnut nakkutingaaramik NIAQULAALILERSUT isigaakka, amiilaarivakkalu.
 
 # Nomen eller pron
 REMOVE:8600A (/"sukku"\ N/l) IF (0 (/"suna"\ Gram/Int\ Pron\ Via/l) LINK 1 ("ma"));
@@ -16669,6 +16668,8 @@ REMOVE:9970FS (Via 1SgPoss) IF (0 Via - POSSESSUM LINK 0 ("toqu") OR ("kultur")
 REMOVE:9970FT ("timi" Lok) IF (0 4SgPoss + $$KASUS LINK 1 (/"ati"\ Gram/TV\ TAQ/l) + $$KASUS LINK *1 TRANSVERB + 3Sg BARRIER VERB-NOTCONT); #TIMINI atisaqanngitsoq tujuuluaqqamik takisuumik atisilluni asserpaa.
 REMOVE:9970FU Rel + Sg + MI IF (0 Abs + Pl + MI - HUMAN)(NEGATE *1 3SgPoss BARRIER Rel + Sg - Prop); #Arsugaq qissaserpoq ”...uangaana piga!” PINNGUAATIMMI paasisinnaanngilai. #Demokraatineersummi Nivi Olsenip nittartakkatigut oqallinnerit pissusilersuutillu kusanaatsut eqqumaffigineqarnerulernissaannut paasisitsiniaanissamullu siunnersuutaa Inatsisartut taperserpaat.
 
+REMOVE:9970FV Par IF (0 IP + TUQ + $$KASUS + $$NUMERUS LINK NOT *-1 $$KASUS + $$NUMERUS LINK *1 _TARGET_ LINK 1 N + $$KASUS + $$NUMERUS); #Uunnaaviup SANIANIITTOQ igalaaq qiverseriarlugu uunnaavik qamissallugu, eqqarsaammerujussuarpunga.
+
 #Ambiguøse 1SgPoss vs. 3SgPoss iflg. sandsynlighed 
 
 REMOVE:9970_3SgPossA (Abs 3SgPoss) IF (-1 CON_CAU + 1SgO LINK 1 (Abs 1SgPoss) + &&IV_SUBJ& LINK *1 V + &&IV_SUBJ& BARRIER V);#Nujuillisarsinnaagummali INUUNERA qaamanerulissagaluarpoq.
@@ -17623,7 +17624,7 @@ SELECT:Sem0415 ("timi") + (/^i?Sem/anmov.*/r) IF (0 POSSESSUM12 OR POSSESSUM4);
 SELECT:Sem0416 ("timi") + (/^i?Sem/anmov.*/r) IF (*0 BODY OR ANATOMIC OR ("nukik") OR (/^i?Sem/hurt.*/r)); #Aalakoorluni uppilluni avaarami aanaartuutalaarluni, TIMAATA affaa nukikinnerulerpoq.
 SELECT:Sem0417 ("timi") + (/^i?Sem/anmov.*/r) IF (0 POSSESSUM3 LINK -1 Rel + (/^i?Sem/H.*/r)); #Anaanama TIMAA mattaangasup uiga qallersimavaa.
 
-REMOVE:Sem0420 ("qasilip") + (/^i?Sem/stimulus_subj.*/r) IF (*-1 BODY + OBLIQUE OR ANATOMIC + OBLIQUE); #Pujoq toqqusaannut QASILITTUTUT misiginarpoq, ipianngunartumillu quersoqqajaavunga.
+REMOVE:Sem0420 ("qasilip") + (/^i?Sem/stimulus_subj.*/r) IF (*-1 BODY OR ANATOMIC); #Pujoq toqqusaannut QASILITTUTUT misiginarpoq, ipianngunartumillu quersoqqajaavunga.
 
 REMOVE:Sem0425 ("pujoq") + (/^i?Sem/wea-m.*/r) IF (*0 (/^i?Sem/pain/r) OR (/^i?Sem/kill_method/r)); #PUJOQ toqqusaannut qasilittutut misiginarpoq, ipianngunartumillu quersoqqajaavunga. #Tåge gør ikke ondt, der skal komme mange flere disambigueringsregler til.
 REMOVE:Sem0426 ("pujoq") + (/^i?Sem/wea-m.*/r) IF (*0 (/^i?Sem/Ldoor/r) OR (/^i?Sem/Lh/r)); #Altanip matuata eqqaanut ingippunga, niaqora ammooqqatinniarsaralugu PUTSUMIISIKKUSUNNAGU. #Der er sjældent tåge i huse.
diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
index 371688145..e5bc391e1 100644
--- a/src/cg3/functions.cg3
+++ b/src/cg3/functions.cg3
@@ -11003,6 +11003,8 @@ MAP:M9970FC @N< TARGET SUAR + Gram/Exclm; #Meerakasik atorfissaqanngitsoq SIANII
 
 MAP:M9970FD @N< TARGET TUQ + $$KASUS + $$NUMERUS (*-1 N + $$KASUS + $$NUMERUS BARRIER (*) - CONT - OBLIQUE); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ.
 
+MAP:M9970FE @ADVL> TARGET (/INNAQ\ Der/vn\ N\ Abs\ Sg/l) (*1 V); #Igaffimmut aallarama TOQQAANNAQ kissaaviup tungaanut aallarpunga.
+
 
 #Disambiguering og mapping af resterende partikler
 ##################################################
diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc
index 53156c044..850509715 100644
--- a/src/fst/stems/nouns.lexc
+++ b/src/fst/stems/nouns.lexc
@@ -23107,7 +23107,7 @@ parnaarsimmavik Z2-Zmorf ;
 parnaartoq Z1Zmorf ;
 paarnaarup+Gram/TV+NIQAR+Der/vv+Gram/IV+UTE+Der/vn:parnaarunneqaat tptmorf ;
 parnaarussiveerapalaaq Z1Zmorf ;
-parnaarussivik Z2-Zmorf ;
+!parnaarussivik Z2-Zmorf ; !KW22092023
 parnaarut tptmorf ;
 parnginnartoq Z1Zmorf ;
 parngutiinnartoq Z1Zmorf ;
diff --git a/src/fst/stems/verbs.lexc b/src/fst/stems/verbs.lexc
index 7d386bb76..90babe6af 100644
--- a/src/fst/stems/verbs.lexc
+++ b/src/fst/stems/verbs.lexc
@@ -8522,7 +8522,7 @@ majuaa@U.Num.Pl@ IV_voq ;
 majuaatip HTR_C_TAQ_tsi ;
 makeqqip XIiXmorf_stem ;
 make+OLang/ENG:maker HTR_longV_GAQ_addi ; !vores interne 'make'
-makeriar IV_r_stem ;
+!makeriar IV_r_stem ; !KW22092023
 makiala HTR_V_SAQ_nnip  ;
 makiala IV_voq_stem ;
 makialip XIiXmorf_stem ;
@@ -22332,7 +22332,7 @@ tulliusussaa IV_voq_stem ;
 tulliusaannar IV_r_stem ;
 tullivallaar IV_long_stem ;
 tulli XIi_voqXmorf_stem ;
-tulluar IV_r_stem ;
+!tulluar IV_r_stem ; !KW22092023
 tulluarsar HTR_r_GAQ_i ;
 tulluare:tulluar HTR_schwa_SAQ_nnip ;
 tulluavip XIiXmorf_stem ;