diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3 index 7b4a15b06..c0b539eac 100644 --- a/src/cg3/dependency.cg3 +++ b/src/cg3/dependency.cg3 @@ -3704,7 +3704,7 @@ SETPARENT:M0032A @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 @ + $$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 index 33b61b161..0632f50c1 100644 --- 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 @N - @VOK - ("[0123456789]{4}"r) BARRIER (*) - KOMMA - PUNCT - (Prop Abs) - (Hyb/1-2) - $$KASUS ) +MAP:M0032A @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.