From 99d4d5f0dc7ad65f81798a343a9c141efbbbf8c0 Mon Sep 17 00:00:00 2001
From: KennyMcFly <35669096+KennyMcFly@users.noreply.github.com>
Date: Mon, 4 Sep 2023 11:59:46 +0200
Subject: [PATCH] disam, func, dep og stems

---
 src/cg3/dep_KalEng.cg3    | 19 +++++++++++--------
 src/cg3/disambiguator.cg3 | 11 ++++++++---
 src/cg3/functions.cg3     |  1 +
 src/fst/stems/verbs.lexc  |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/cg3/dep_KalEng.cg3 b/src/cg3/dep_KalEng.cg3
index c2bf31251..c98a89f8b 100644
--- a/src/cg3/dep_KalEng.cg3
+++ b/src/cg3/dep_KalEng.cg3
@@ -3343,14 +3343,17 @@ TO (*-1 U + 3Pl BARRIER V OR KOMMA);
 #MAP:M0041 (@SUBJ>) TARGET N + Abs + CONJ-LU OR Prop + Abs + CONJ-LU IF (-1 VFIN + 3Sg)(1 Cont + 4Pl)(2 N + Pl LINK *1 V + 3Pl) ;
 #
 #MAP:M0041 @SUBJ> TARGET N + Abs IF (1 Gram/Exclm + Gram/IV + V)(NEGATE *-1 V BARRIER CONJ-C) ; #siunissaq pissanganaq!
-#MAP:M0044A @CL-ADVL> TARGET NIRMIT - UGEDAGE IF (*1 VFIN - HTR - LIK_QAR - INDERIVERENDE_SUBSTANTIV BARRIER HTR OR LIK_QAR)(NEGATE 0 Abl LINK 1 NIRU)(NEGATE 1 OBLIQUE - SPATIAL - NIRMIT)(NEGATE -1 POSSESSUM4)(NEGATE 0 Trm LINK *1 TRMVERB BARRIER VFIN)  #-nermit vist altid sætningsadverbial
-#(NEGATE 0 Trm LINK *1 Aeq BARRIER (*) - Trm)#Per Rosing NUTSERINERMUT oqaluttaanermullu bacheloritut allagartartaarpoq.
-#(NEGATE 1 INDERIVERENDE_SUBSTANTIV LINK -1 _TARGET_ + Trm + LU LINK -1 Trm)#nunanut allanut SILLIMANIARNERMULLU politiki eqqarsaatigaara.
-#(NEGATE 0 Trm LINK 1 KOMMA LINK *1 Trm - NIQ BARRIER (*) - OBLIQUE)#Ilinniakkamillu ingerlatsisut EFTERSKOLERNERMUT, inuusuttunut ilinniarfinnut ingerlariaqqiffiusumillu ilinniarnermut immikkoortiterneqarput.
-#(NEGATE 0 Trm LINK *-1 CONJ-C LINK -1 Trm - NIQ)# Ilinniakkamillu ingerlatsisut efterskolernermut, inuusuttunut ilinniarfinnut ingerlariaqqiffiusumillu ILINNIARNERMUT immikkoortiterneqarput. 
-#(NEGATE 0 Abl LINK 1 PASSIV)#Taamatuttaaq Tina Lynge Schmidt TAARSERSUINERNIT eqqugaanani ingerlaqqilluni.
 
-#;
+SETPARENT:M0044A @CL-ADVL> + NIRMIT - UGEDAGE IF
+(NOT p (*))
+(NEGATE 0 Abl LINK 1 NIRU)(NEGATE 1 OBLIQUE - SPATIAL - NIRMIT)(NEGATE -1 POSSESSUM4)(NEGATE 0 Trm LINK *1 TRMVERB BARRIER VFIN)  #-nermit vist altid sætningsadverbial
+(NEGATE 0 Trm LINK *1 Aeq BARRIER (*) - Trm)#Per Rosing NUTSERINERMUT oqaluttaanermullu bacheloritut allagartartaarpoq.
+(NEGATE 1 INDERIVERENDE_SUBSTANTIV LINK -1 _TARGET_ + Trm + LU LINK -1 Trm)#nunanut allanut SILLIMANIARNERMULLU politiki eqqarsaatigaara.
+(NEGATE 0 Trm LINK 1 KOMMA LINK *1 Trm - NIQ BARRIER (*) - OBLIQUE)#Ilinniakkamillu ingerlatsisut EFTERSKOLERNERMUT, inuusuttunut ilinniarfinnut ingerlariaqqiffiusumillu ilinniarnermut immikkoortiterneqarput.
+(NEGATE 0 Trm LINK *-1 CONJ-C LINK -1 Trm - NIQ)# Ilinniakkamillu ingerlatsisut efterskolernermut, inuusuttunut ilinniarfinnut ingerlariaqqiffiusumillu ILINNIARNERMUT immikkoortiterneqarput.
+(NEGATE 0 Abl LINK 1 PASSIV)#Taamatuttaaq Tina Lynge Schmidt TAARSERSUINERNIT eqqugaanani ingerlaqqilluni.
+TO (*1A VFIN - HTR - LIK_QAR - INDERIVERENDE_SUBSTANTIV BARRIER HTR OR LIK_QAR) #-nermit vist altid sætningsadverbial
+;
 #
 #MAP:M0044B @CL-ADVL> TARGET NIRMIT IF (*-1 @NIQ_SUBJ> OR @NIQ_OBJ>)(*1 V OR @PRED)(NEGATE *-1 @PRED BARRIER KOMMA OR (/"tassa"\ Adv\ LI/l))(NEGATE 0 Trm LINK *1 TRMVERB BARRIER VFIN OR @PRED) ;
 #
@@ -5285,7 +5288,7 @@ SETPARENT:M0410A_opremsningB @HNOUN + N IF
 (-1 KOMMA LINK -1 @HNOUN LINK NEGATE *0 V) 
 (NEGATE 0 OBLIQUE LINK 1 Der/vn)#Erngunneq, HASHIMIK atornerluineq, tarnikkut timikkullu nakuusernerit, kinguaassiutitigut atornerluinerit, qinngasaarinerit aammalu naammanngitsumik meeqqanik perorsaaneq.
 (NEGATE 0 $$OBLIQUE LINK 1 $$OBLIQUE + CONJ-C LINK 1 Der/vn)#Erngunneq, hashimik atornerluineq, TARNIKKUT timikkullu nakuusernerit, kinguaassiutitigut atornerluinerit, qinngasaarinerit aammalu naammanngitsumik meeqqanik perorsaaneq.
-
+(NEGATE 0 Rel + Sg LINK 1 3SgPoss) #Asanninnerup qalipaataanik qalipaasersukkat, KISSALAARTUP qalipaataanik taasartakkatsinnik qalipaatillit.
 TO (@0 (*));#Illup najornera, qaammaqqutit, KIASSARNEQ, imeq, qerititsivik, nillataartitsivik, telefoni, fjernsyni allallu.
 
 SETPARENT:0410B @N< + Der/vn + $$NUMERUS + $$KASUS IF 
diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
index 7dcaf1020..57d5c26f8 100644
--- a/src/cg3/disambiguator.cg3
+++ b/src/cg3/disambiguator.cg3
@@ -3545,7 +3545,8 @@ REMOVE:0005T (/TIP\ Der/vv\ Gram/TV__TIP\ Der/vv\ Gram/Db/l) IF (0 (/TIP\ Der/vv
 REMOVE:0005T1 (/TIP\ Der/vv\ Gram/Db\ TAR\ Der/vv\ Gram/TV\ Gram/Pass\ TUQ/l) IF (0 (/TIP\ Der/vv\ Gram/Db\ TAR\ Der/vv\ Gram/Refl\ TUQ/l) ); #akilersittartoq
 REMOVE:0005U (/LAAQ\ Der/nn\ LIR\ Der/nv/l) IF (0 (/LAAR\ Der/vv\ LIR\ Der/vv/l));
 REMOVE:0005V (/U\ Der/nv\ Gram/IV\ TIR\ Der/vv/l); #Kaagisoreeramik assatik asalluariarlugit PINNGUAATERSULERPUT.
-REMOVE:0005W (/RUJUK\ Der/nn\ U\ Der/nv\ Gram/IV\ UTIGE\ Der/vv/l) IF (0 (/RUJUUR\ Der/vv\ UTIGE\ Der/vv/l)); #Ataataata Arsugaq aalajangeriarlugu paarivaa, FJERNSZNERUJUUJUTIGALUNI.
+REMOVE:0005W (/RUJUK\ Der/nn\ U\ Der/nv\ Gram/IV\ UTIGE\ Der/vv/l) IF (0 (/RUJUUR\ Der/vv\ UTIGE\ Der/vv/l)); #Ataataata Arsugaq aalajangeriarlugu paarivaa, FJERNSYNERUJUUJUTIGALUNI.
+REMOVE:0005X (/NIAQ\ Der/vn\ PASIP\ Der/nv/l) IF (0 (/NIAR\ Der/vv\ PASIP\ Der/vv/l));
 SELECT:0005 ("ingip") + A + 3Pl IF (0 ("issaq") OR IP + SAR) ; #Totalt forvirrede ambiguiteter ved issaapput
 REMOVE:0006 ("qaap") IF (0 ("qaammat"));
 REMOVE:0006A (/"utaqqi"\ Gram/TV\ QQAAR\ Der/vv\ Gram/TV\ TUSSAA\ Der/vv\ Gram/Refl/l) IF (0 (/"utaqqi"\ Gram/IV\ QQAAR\ Der/vv\ Gram/IV\ TUQ\ Der/vn\ SSAQ\ Der/nn\ U\ Der/nv\ Gram/IV/l)); #UTAQQEQQAARTUSSAALLUNGA paasitinneqarpunga.
@@ -12101,7 +12102,7 @@ REMOVE:0426B TUQ IF (0 Par + ADV-LU)
 ;
 REMOVE:0427 Par + RUTTUR + 3Sg (-*1 Rel LINK NOT 1 POSSESSUM + Sg)(*1 3SgO); #20091115
 
-SELECT:0428 TUQ IF (0 Par LINK *-1 VFIN + TRANSVERB + ORATIOOBLVERB + 3SgO LINK -1 Abs + Sg); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ.
+SELECT:0428 ("IP") + TUQ IF (0 Par LINK *-1 VFIN + TRANSVERB + ORATIOOBLVERB + 3SgO LINK -1 Abs + Sg); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ.
 
 SELECT:0429 Par + RUTTUR OR Par + GALUAR IF
 (NEGATE -*1 VFIN)
@@ -13308,7 +13309,7 @@ REMOVE:Int0265 (Rel 4Sg) IF (0 Lok)(*1 LOKVERB);
     ## Illumi aappaluttumi najugaqarpugut.
 
 SELECT:7499 Abl IF (1 NIRU) ;
-REMOVE:7500 Abl + Tilhængspartikel IF (0 Ins)(1 V)(NEGATE 1 PASSIV);
+REMOVE:7500 Abl + Tilhængspartikel IF (0 Ins)(1 V)(NEGATE 1 PASSIV)(NEGATE 0 NIQ LINK 1 V - HTR);
 
 
 
@@ -14757,6 +14758,8 @@ REMOVE:5490FZ (/"tunillap"\ Gram/TV\ TIP/l) + Gram/Pass IF (0 (/"tunillap"\ Gram
 REMOVE:5490GA ("uffar") + Gram/TV + Gram/Pass IF (0 ("uffar") + Gram/IV);
 REMOVE:5490GB ("najor") + SI IF (0 ("najor") + HTR);
 REMOVE:5490GC (*) - (/"aasaq"\ GIP\ Der/nv\ SI\ Der/vv\ RUTTUR\ Der/vv\ Gram/TV\ V\ Par\ 3Sg\ 3SgO/l) (0 ("<aasarisseruttoraa>")) ; #Jude 20230831
+REMOVE:5490GD ("itip") IF (0 ("iter"))(NEGATE -1 Aeq);
+REMOVE:5490GE ("erser") OR ("ersi") IF (0 ("ersip") LINK -1 ("aki") + Trm); #Qalipaatit akimut ERSINNGITSUT, affaannarsunngitsullu.
 
 # Verbum eller partikel?
 SELECT:5491A ("aarit") IF (-1 BOS);
@@ -17745,6 +17748,8 @@ REMOVE:Sem825 ("tunniup") + (/^i?Sem/sell/r) IF (0 (/^i?Sem/give/r) + ("tunniup"
 
 REMOVE:Sem830 ("iner") + (/^i?Sem/end/r) If (0 ("iner") + (/^i?Sem/excrete/r) LINK *0 ("attor") BARRIER KOMMA) ;
 
+SELECT:Sem0835 ("aki") + (/^i?Sem/Ltop/r) IF (0 Trm); #Qalipaatit AKIMUT ersinngitsut, affaannarsunngitsullu.
+
 ##############
 AFTER-SECTIONS
 
diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
index 37771ffea..095ba5385 100644
--- a/src/cg3/functions.cg3
+++ b/src/cg3/functions.cg3
@@ -4833,6 +4833,7 @@ MAP:M0410A_opremsningA @HNOUN TARGET (NIQ N) + $$KASUS IF (*-1 (NIQ N @HNOUN) +
 MAP:M0410A_opremsningB @HNOUN TARGET N IF (-1 KOMMA LINK -1 @HNOUN LINK NEGATE *0 V) #Illup najornera, qaammaqqutit, KIASSARNEQ, imeq, qerititsivik, nillataartitsivik, telefoni, fjernsyni allallu.
 (NEGATE 0 OBLIQUE LINK 1 Der/vn)#Erngunneq, HASHIMIK atornerluineq, tarnikkut timikkullu nakuusernerit, kinguaassiutitigut atornerluinerit, qinngasaarinerit aammalu naammanngitsumik meeqqanik perorsaaneq.
 (NEGATE 0 $$OBLIQUE LINK 1 $$OBLIQUE + CONJ-C LINK 1 Der/vn)#Erngunneq, hashimik atornerluineq, TARNIKKUT timikkullu nakuusernerit, kinguaassiutitigut atornerluinerit, qinngasaarinerit aammalu naammanngitsumik meeqqanik perorsaaneq.
+(NEGATE 0 Rel + Sg LINK 1 3SgPoss) #Asanninnerup qalipaataanik qalipaasersukkat, KISSALAARTUP qalipaataanik taasartakkatsinnik qalipaatillit.
 ;
 
 MAP:0410B @N< TARGET Der/vn + $$NUMERUS + $$KASUS IF (*-1 $$NUMERUS + $$KASUS + @HNOUN BARRIER (*) - KOMMA - @N< LINK NEGATE *0 VFIN) #Ilagiittarnigut kinertut, PINAVEERSAARTITASSAT.
diff --git a/src/fst/stems/verbs.lexc b/src/fst/stems/verbs.lexc
index dd2c882d6..c178ca737 100644
--- a/src/fst/stems/verbs.lexc
+++ b/src/fst/stems/verbs.lexc
@@ -21182,7 +21182,7 @@ taarutsiup XIuteXmorf ;
 taarutaar IV_long_stem ;
 taarutaar UDEN_HTR_r_GAQ ;
 taasakuluge:taasakulug HTR_schwa_SAQ_nnip ;
-taasar UDEN_HTR_r_GAQ ;
+!taasar UDEN_HTR_r_GAQ ; !KW04092023
 taassi XIi_voqXmorf_stem ;
 taassutige:taassutig HTR_schwa_SAQ_nnip ;
 taassaa IV_voq_stem ;