No commit message

giellalt · Nov 15, 2023 · 794d332 · 794d332
1 parent 69c6c93
commit 794d332
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3
@@ -3704,7 +3704,7 @@ SETPARENT:M0032A @<APPOS + PROP + $$KASUS - CONJ-C OR PLACE_MORE - PLACE + $$KAS
 (NEGATE -1 TIMENOUN LINK 1 _TARGET_ + Sem/Geo)#Aggustimili Hjørringimi najugaqarpunga
 (NEGATE -1 (/NIQ\ Der/vn\ N\ Ins/l) LINK 1 (/UTE\ Der/vn\ N\ Ins/l) LINK 1 HTR) #Danskit nunanut allanut tunngasunut ministeriat, Lars Løkke Rasmussen (M) Naalakkersuisut kiap aallartitaasariaqarneranik KISSAATAANNIK qaangiiginnarsimasoq taanna KNR-imut mailikkut allappoq.
 
-TO (-*1C N + $$KASUS - Prop - TIME - @>N - @VOK - ("[0123456789]{4}"r) BARRIER (*) - KOMMA - PUNCT - (Abs Prop) - (Hyb/1-2) - $$KASUS);
+TO (-*1C N + $$KASUS - Prop - TIME - @>N - @VOK - ("[0123456789]{4}"r) - ("avannaq") - ("kujate") BARRIER (*) - KOMMA - PUNCT - (Abs Prop) - (Hyb/1-2) - $$KASUS);
 #
 #MAP:M0032B @<APPOS TARGET PROP + $$KASUS + CONJ-LU IF (-1C PROP + $$KASUS + @<APPOS); #Nuummi nunaqarfinnilu Kapisilinni QEQERTARSUATSIAANILU imigassanik aalakoornartortalinnik tuniniaasarnerit sassaalliuteqartarnerillu inerteqqutigineqalerput.
 #
@@ -10031,7 +10031,9 @@ TO (0 $$KASUS LINK *1A V BARRIER (Der/vn N) - $$KASUS);
 
 #0947A ved opremsninger med en possessor-possessum på vejen@RULENAME@
 
-SETPARENT:M0947B @ADVL> + $$OBLIQUE TO (*1 $$OBLIQUE BARRIER (*) - KOMMA LINK *1 CONJ-C LINK *1S Rel + &&POSS34_POSS& BARRIER (*) - Trm LINK *1 &&POSS34_POSS& + $$OBLIQUE LINK *1A V BARRIER (Der/vn N) - $$OBLIQUE); #Naligiinnginneq tamatuma malitsigaa, nunasiaataasimanerlu PINERLUNNIARNERNUT, toqutsinernut imminullu toqunnerit amerlassusaannut sunniuteqartarpoq.
+SETPARENT:M0947B @ADVL> + $$OBLIQUE IF
+(NOT p (*))
+TO (*1 $$OBLIQUE BARRIER (*) - KOMMA LINK *1 CONJ-C LINK *1S Rel + &&POSS34_POSS& BARRIER (*) - Trm LINK *1 &&POSS34_POSS& + $$OBLIQUE LINK *1A V BARRIER (Der/vn N) - $$OBLIQUE); #Naligiinnginneq tamatuma malitsigaa, nunasiaataasimanerlu PINERLUNNIARNERNUT, toqutsinernut imminullu toqunnerit amerlassusaannut sunniuteqartarpoq.
 
 #!! @RULENAME@
 

diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
@@ -3088,8 +3088,7 @@ MAP:M0010F @i-ADVL>N TARGET ("Kalaallit Nunaat") + OBLIQUE (1 Prop - CONJ-C - @P
 SUBSTITUTE:Sub0021 Sg Pl TARGET Sur IF (*-1 FIRSTNAME BARRIER (*) - KOMMA LINK -1 Conj LINK -1 FIRSTNAME);
 
 #Forsøg på en mere generel regel for Prop der er @<APPOS til noget ikke-Prop
-MAP:M0032A @<APPOS TARGET PROP + $$KASUS - CONJ-C OR PLACE_MORE - PLACE + $$KASUS - CONJ-LU - (/"naalagaq"\ LIRSUR\ Der/nv\ Gram/TV\ HTR\ Der/vv\ Gram/IV\ TUQ/l) 
-OR Gram/ACR + $$KASUS IF (-*1C N + $$KASUS - Prop - TIME - @>N - @VOK - ("[0123456789]{4}"r) BARRIER (*) - KOMMA - PUNCT - (Prop Abs) - (Hyb/1-2) - $$KASUS )
+MAP:M0032A @<APPOS TARGET PROP + $$KASUS - CONJ-C OR PLACE_MORE - PLACE + $$KASUS - CONJ-LU - (/"naalagaq"\ LIRSUR\ Der/nv\ Gram/TV\ HTR\ Der/vv\ Gram/IV\ TUQ/l) OR Gram/ACR + $$KASUS IF (-*1C N + $$KASUS - Prop - TIME - @>N - @VOK - ("[0123456789]{4}"r) - ("avannaq") - ("kujate") BARRIER (*) - KOMMA - PUNCT - (Prop Abs) - (Hyb/1-2) - $$KASUS )
 (NEGATE 1 KOMMA LINK 1 $$KASUS)
 (NEGATE *-1 @PROP> - (Hyb/1-2) BARRIER (*) - (Hyb/1-2))
 (NEGATE 0 Rel + POSSESSUM LINK 1 POSSESSUM)
@@ -8021,7 +8020,7 @@ MAP:M0939F @ADVL> TARGET Trm IF (*1 TRMVERB + V BARRIER (/"tunnga"\ Gram/IV\ TIP
 
 MAP:M0939G @ADVL> TARGET Abl IF (*1 VFIN + (/GE\ Der/nv\ Gram/TV\ TAQ\ Der/vn\ QAR/l)) ; #- InunNIT inuusuttunik marlunnik sumiiffimmit arpattunik takusisimasunit tusarfigisaqarusuppugut, Ole Hard oqarpoq.
 
-MAP:M0940 (@ADVL>) TARGET OBLIQUE + $$KASUS IF (*1C V BARRIER LIAQ OR TIGE OR ("quleriilik") LINK NOT 0 QAR OR LIK)
+MAP:M0940 (@ADVL>) TARGET OBLIQUE + $$KASUS IF (*1C V - FossileredeCont BARRIER LIAQ OR TIGE OR ("quleriilik") LINK NOT 0 QAR OR LIK)
 (NEGATE 0 Par LINK *-1 ORATIOOBLVERB)
 (NEGATE 0 Ins LINK 1 DOTR)
 (NEGATE 0 Ins LINK 1 Ins LINK 1 DOTR)
@@ -8329,7 +8328,7 @@ MAP:M1130_2 (@i-ADVL>) TARGET CONT IF (*1 NIQ - LEKSIKALISERING - Gram/Int - Gra
 
 # Mapping af ledsagemåde til inderiveret verbum
 
-MAP:M1131A @i-ADVL> TARGET CONT IF (*1 N + Der/vn )(NEGATE *0 V);
+MAP: @i-ADVL> TARGET CONT IF (*1 N + Der/vn )(NEGATE *0 V);
 
 MAP:M1131B @i-ADVL> TARGET (/"ata"\ Gram/IV\ TIP\ Der/vv\ Gram/TV\ V\ Cont\ 3SgO/l) IF (-1 Trm LINK 2 (Der/vn N) );#Aningaasat, Novo Nordisk Fondenip coronamut ATATILLUGU suliniutinut atorneqartussanngortitaanit kingulliit Peqqinnissamut Naalakkersuisoqarfimmut tunniunneqarput.