fst-huller og oprydning ifm. GUP

src/cg3/dep_KalEng.cg3

@@ -1788,8 +1788,11 @@ TO (-1 @i-ADVL> + Trm); #Tassa meeqqanut, inuusuttunut inersimasunullu KIKKUNNUL
 #(NEGATE *1 POSSESSUM + 3PlPoss BARRIER (*) - Adv - OBLIQUE) #forbehold for mulig possessor
 #;
 #
-#MAP:0043_ImplicitSubjekt2 @OBJ> TARGET Abs + <temp> + Sg IF (*1 <fn:ModeOfMovement> + 3SgO) ;#SIUNISSAQ nalunartoq ornittussanngorpaat
-#
+SETPARENT:M0043C @POSS> + TIDSPOSSESSOR + Sg IF
+(NOT p (*))
+(NEGATE 0 LIK + $$KASUS LINK *-1 $$KASUS BARRIER (*) - (/i?Num/r))#PL20230901 Ataasinngormat ullaakkut arnap 30-ikkunni UKIULLIP nukappiaraq 15-inik ukiulik pinngitsaaliisimasutut politiinut nalunaarutigaa, tamatumalu kingorna angut inuusuttoq Sisimiuni politiinit tigusarineqarpoq pinngitsaaliisimasutullu tigummigallagassanngortinneqarluni.
+TO (*1 OTHERTIME + POSSESSUM3) ; #Jude 20230831
+
 ####################################
 ## Frequent and safe rules - nouns #
 ####################################

src/cg3/disambiguator.cg3

@@ -1925,7 +1925,7 @@ LIST SKOLEFAG_LIST =
 
 SET SKOLEFAG = SKOLEFAG_LIST | LANGUAGE ;
 
-LIST EDIBLE = "iffiaq" (/"ii"\ Gram/TV\ TAR\ Der/vv\ TAR\ Der/vv\ Gram/TV\ TAQ/l) "issingigassaq" "kaagi" "kaffe" "kaffi" "kalorie" "kissartoq" "kujak" "mamartoq" "naatitaq" "neqi" "nutaaq" "orsoq" "panertoq" "siku" "sukku" "tarajoq" ;
+LIST EDIBLE = "iffiaq" (/"ii"\ Gram/TV\ TAR\ Der/vv\ TAR\ Der/vv\ Gram/TV\ TAQ/l) "issingigassaq" "kaagi" "kaffe" "kaffi" "kalorie" "kissartoq" "kujak" (/"mamar"\ Gram/IV\ KUJUP\ Der/vv\ Gram/IV\ TUQ/l) "mamartoq" "naatitaq" "neqi" "nutaaq" "orsoq" "panertoq" "siku" "sukku" "tarajoq" ;
 LIST TUR-ABLE = "cigaret" "tupa" ;
 SET FOOD = EDIBLE | <drink> | <food> | TUR-ABLE;
 LIST CLOTHES = "aqajaqanngitsoq" "kamik" "annoraaq" "kavaajaq" "alersi" "alerseq" "qarlik" "skuu" "tujuuluk" "tuluujuk" <cloH> ;
@@ -14902,6 +14902,7 @@ REMOVE:5578T ("aap") IF (0 (/"aa"\ Gram/TV\ V\ Cont\ 3SgO\ CONJ-LU/l) LINK -1 ("
 REMOVE:5578U (/"aalap"\ Gram/TV\ TIR/l) IF (0 (/"aalater"\ Gram/TV/l));#.. tapersersuisut napparsimmaviup silataaniittut tassani AALATERIFFIGALUGIT.
 REMOVE:5578V Imp + Gram/ImpPos IF (0 Imp - Gram/ImpPos); #Aamma ATUARUK Canadap inuisa 20.000-t missaat orpippassuit ikuallannerini qimagussorneqartariaqartut
 REMOVE:5578W ("ilar") IF (0 ("ilaler") LINK NEGATE *0 ("allu") OR ("alluaq")); 
+REMOVE:5578X (/"angi"\ Gram/IV\ \(iSem/be_attribute\ \)?NIQ\ Der/vn\ GE/l) IF (0 ("annere")) ;
 
 # Enkelte derivativer
 REMOVE:Int0401 IR + Der/nv IF (0 V + Der/vv OR ("ila")) ; #'ilaarpaa' ikke 'ila+IR'
@@ -15043,7 +15044,7 @@ REMOVE:5585B4 TUUR IF (0 (/"tigussaa"\ Gram/IV\ TUQ\ Der/vn\ U\ Der/nv\ Gram/IV\
 REMOVE:5585B5 TUUR IF (0 ("taama") + IP);
 
 REMOVE:5586 ("kalak") + U + LIR IF ( 0 ("kalaaleq"));
-REMOVE:5587 TAQ + LIR + Der/nv IF (0 TAR + LIR + Der/vv);
+REMOVE:5587 (/TAQ\ Der/vn\ LIR\ Der/nv/l) IF (0 (/TAR\ Der/vv\ LIR\ Der/vv/l)) ;
 REMOVE:5588 ("quer") + POSSESSUM IF (0 ("qui") + POSSESSUM); #næppe nogens hoster
 REMOVE:5589 ("nilleq") + PALLAP IF (0 ("niller"));
 REMOVE:5590 QATE + GIIP + Der/nn IF (0 QATE + GIIP + Der/nv);
@@ -15235,7 +15236,12 @@ REMOVE:5639CU (/"peqqip"\ Gram/IV\ SI/l) IF (0 ("peqqissi"));
 REMOVE:5639CV ("amerla") + (/NIQ\ Der/vn\ U/l) IF (0 NIRU); #- Taamaaliornikkut Nunatsinni suliffissat amerlissapput, aamma aningaasat Nunatsinni kaaviiaartut AMERLANERULISSAPPUT nunallu inui namminersortunngorsaanermi peqataatinneqalissallutik, Leif Fontaine allappoq.
 REMOVE:5639CW (/NIQ\ Der/vn\ U/l) IF (1C CONJ-C + NIRU); #Kalaallisut ordbogit PISOQAANERUSUT nutaanerusullu Oqaasileriffiup nittartagaaniilissapput.
 REMOVE:5639CX (/LIRSUR\ Der/nv\ Gram/IV\ VIP\ Der/vv\ Gram/IV\ VIK/l) IF (0 (/LIRSUR\ Der/nv\ Gram/TV\ HTR\ Der/vv\ Gram/IV\ VIK/l));
-
+REMOVE:5639CY (/LIR\ Der/nv\ Gram/IV\ TUQ\ Der/vn\ LIR/l) IF (0 (/LIRSUR\ Der/nv\ Gram/[IT]V\ \(iSem/dress\ \)?LIR/l)) ;
+REMOVE:5639CZ (/"ati"\ Gram/[IT]V\ TAR\ Der/vv\ LIR/l) IF (0 (/TAQ\ Der/vn\ LIRSUR/l)) ;
+REMOVE:5639CÆ (/"ati"\ Gram/IV\ SAR/l) IF (0 (/TAQ\ Der/vn\ LIRSUR/l)) ;
+REMOVE:5639CØ LIRSUR + Gram/Refl IF (0 LIRSUR + INTRANSVERB - Gram/Refl) ;
+REMOVE:5639CÅ GUP (NEGATE 0 FOOD);
+
 # Enkelte substantiver
 REMOVE:Int0476 ("pineq") IF (NEGATE *0 ("kamik")) ; #20091103 pineq+QAR vs. pineqar-
 REMOVE:Int0477 ("illaaq") IF (NEGATE 0 POSSESSUM OR QAR OR LIK); #20091112 soedyrsfostre vist altid moderdyrets
@@ -16666,6 +16672,7 @@ REMOVE:9963B $$BFORM + (/\"\ Gram\/TV/l) + INTRANSVERB - NIQAR - Gram/Db - NAR I
 (NEGATE 0 (/Gram/IV\ SI\ Der/vv\ Gram/IV\ TUQ/l) LINK 0 (/HTR\ Der/vv\ Gram/IV\ TUQ/l))#Suliallu ingerlanerani siunnersuutinik arlalinnik ILANNGUSSISOQARPOQ.
 (NEGATE 0 (/Gram/IV\ V\ Cont\ 1Sg/l) LINK *0 VFIN + 1Sg BARRIER VERB-NOTCONT)#Tamatuma saniatigut pingaartittarpara ullormut angusaqartutut misigisimallunga NAAMMAGISIMAARLUNGALU innassallunga.
 (NEGATE 0 Gram/TV + Gram/Refl LINK 0 HTR LINK -1 Ins)#Ilami taamani Hansenip annaassiniaraluarluni nakkakattarnera isinneralu takorloorlugit, naamik kingornagut ajorani panertunik ATISEREERMAT illarnarnera assissaqanngilaq.
+(NEGATE 0 LIRSUR + INTRANSVERB)
 ;
 
 REMOVE:9963C (/Gram/IV\ SI\ Der/vv\ Gram/IV\ TUQ/l) IF (0 (/HTR\ Der/vv\ Gram/IV\ TUQ/l)); #Suliallu ingerlanerani siunnersuutinik arlalinnik ILANNGUSSISOQARPOQ.
@@ -17734,6 +17741,10 @@ REMOVE:Sem0815 ("akunneq") + (/^i?Sem/ac/r) IF (0 (/^i?Sem/cc/r) + POSSESSUM); #
 
 REMOVE:Sem820 ("akunneq") + (/^i?Sem/cc/r) IF (0 (/^i?Sem/L/r) + POSSESSUM3 LINK -1 Rel) ;
 
+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) ;
+
 ##############
 AFTER-SECTIONS
 

src/cg3/functions.cg3

@@ -1759,7 +1759,9 @@ MAP:M0043B @POSS> TARGET Rel + Pl IF (*1 3PlPoss + NIRSAQ BARRIER (*) - Rel)
 
 SELECT:0082 3PlPoss + $$KASUS IF (0 CONJ-LU)(-1C 3PlPoss + $$KASUS); #3. led i opremsning med komma eller andet uden komma
 
-MAP:M0043C @POSS> TARGET TIDSPOSSESSOR + Sg (*1 OTHERTIME + POSSESSUM3) ; #Jude 20230831
+MAP:M0043C @POSS> TARGET TIDSPOSSESSOR + Sg (*1 OTHERTIME + POSSESSUM3)
+(NEGATE 0 LIK + $$KASUS LINK *-1 $$KASUS BARRIER (*) - (/i?Num/r))#PL20230901 Ataasinngormat ullaakkut arnap 30-ikkunni UKIULLIP nukappiaraq 15-inik ukiulik pinngitsaaliisimasutut politiinut nalunaarutigaa, tamatumalu kingorna angut inuusuttoq Sisimiuni politiinit tigusarineqarpoq pinngitsaaliisimasutullu tigummigallagassanngortinneqarluni.
+ ; #Jude 20230831
 
 #Sikre possessum
 

src/fst/affixes/derivations-inflections.lexc

@@ -99594,7 +99594,7 @@ LEXICON XTtX !!= * @CODE@ nakappaa nunguppaa anippaa Forudsætter Gram-tag fra H
 !flex-iv_schwa med typer som atsigaaq, ajoqaaq
 !pi_flex-iv_voq specielt til pi-
 
-!LEXICON flex-iv_agentiv !!= * @CODE@ 
+!LEXIC_agentiv !!= * @CODE@ 
 !+Gram/HV:   flex-iv2 ;
 
 LEXICON flex-iv !!= * @CODE@ 
@@ -108343,6 +108343,7 @@ LEXICON tp !!= * @CODE@ obs 20200623: fleksionsmorfemgrænse er %< og ikke %>
 @C.Loan.i@+GISSAAR+Der/nv+GI+Der/vv+Orth/Alt:%>@C.Loan.i@%TRUNCgissaari XIgujoqX ;
 @C.Loan.i@+GIIAAR+Der/nv:%>@C.Loan.i@%TRUNCgiiaar IV_long_stem ;
 @C.Loan.i@[email protected]@+Der/nv:%>@C.Loan.i@[email protected]@ XIiXmorf_stem ;
+[email protected]@+Der/nv:%>[email protected]@ IV_k_stem ; !Boole forhindrer *mamakujuttoruppoq
 @C.Loan.i@+IAR+Der/nv:%>@C.Loan.i@%TRUNCajar HTR_r_GAQ_i ;
 @C.Loan.i@+IAR+Der/nv:%>@C.Loan.i@%TRUNCiar HTR_r_GAQ_i ;
 +ILATSI+Der/nv:%>%TRUNCilatsi IV_voq ;

src/fst/stems/verbs.lexc

@@ -972,8 +972,8 @@ alla+TUR+Der/nv+Gram/IV+UTIGE+Der/vv:allatuutig UDEN_HTR_schwa_SAQ ;
 allaffissor IV_r ;
 allagaq+LIRI+Der/nv:allakkeri XIi_voqXmorf_stem ;
 allagarser HTR_ir_GAQ_i ;
-allap+Gram/TV+TAQ+Der/vn+SI+Der/nv+V+Ind+1Pl:allagarsivugut K_TUQ_plur ;
-allap+Gram/TV+TAQ+Der/vn+TAQ+Der/nn+QAR+Der/nv+GI+Der/vv:allagartaqar XIgujoqX ;
+!allap+Gram/TV+TAQ+Der/vn+SI+Der/nv+V+Ind+1Pl:allagarsivugut K_TUQ_plur ;
+!allap+Gram/TV+TAQ+Der/vn+TAQ+Der/nn+QAR+Der/nv+GI+Der/vv:allagartaqar XIgujoqX ;
 allajup XIuteXmorf ;
 allak+PALAAR+Der/vv+Orth/Alt:allappalaar IV_r_stem ; !den idiosynkratiske allappalaartoq for allapalaartoq
 allakkajaa IV_voq_stem ;
@@ -8837,7 +8837,8 @@ mamar+GALUAR+Der/vv+TIP+Der/vv+HTR+Der/vv+INNAR+Der/vv:mamaraluartitsiinnar	flex
 mamar+GALUAR+Der/vv+TIP+Der/vv:mamaraluartip	HTR_C_TAQ_tsi ;
 mamarisariunnaar	UDEN_HTR_r_GAQ ;
 mamarisaarup	XIuteXmorf ;
-mamar IV_r_stem ; !mamaq
+[email protected]@ IV_r_stem ; !mamaq Boole-flag for at blokere *mamakujuttoruppoq
+mamar+Gram/IV+KUJUP+Der/vv+Gram/IV+TUQ+Der/vn+GUP+Der/nv:mamakujuttugup IV_k_stem ;
 mamarler	HTR_r_GAQ_i ;
 !mamarlii	XIi_voqXmorf_stem ; !HTR
 mamarsar	IV_r_stem ;