From 3951ff017afaebbb60a0703f0fcfc6ef742ad664 Mon Sep 17 00:00:00 2001 From: KennyMcFly <35669096+KennyMcFly@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:38:11 +0100 Subject: [PATCH] disam, func og dep --- src/cg3/dependency.cg3 | 4 ++++ src/cg3/disambiguator.cg3 | 19 +++++++++++++------ src/cg3/functions.cg3 | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3 index f784a7853..862e33c2a 100644 --- a/src/cg3/dependency.cg3 +++ b/src/cg3/dependency.cg3 @@ -11831,6 +11831,10 @@ TO (@0 (*)); # # #MAP:M9968L @ADVL> TARGET FossileredeCont IF (*-1 CONJ-C LINK *1 _TARGET_ BARRIER (*) - Abs LINK *1 CONT + @PRED BARRIER (*) - Abs); #Air Greenlandimi saqisut kattuffianni ACU-mi siulittaasoq Anders Mark Jensen paasissutissiivoq, tamannalu PEQATIGALUGU suleqatini kajumissaarlugit sulinertik nangeqqeqqullugu + +SETPARENT:M9968M @ADVL> + FossileredeCont IF +(NOT p (*)) +TO (*1 V - NIQAR); #Uffarfimmi sivisuumik nillertuinnarmik kuutsitiffigalugu pillarsimavaa... ilaannimigooq allaat pillartarpaa, issersuarmi unnuaq NAALLUGU aneertillugu angerlaqqussanagu.” # #MAP:M9968Q @CL-ADVL> TARGET GAANNI IF (*1 @SUBJ> BARRIER (*) - Adv - OBLIQUE LINK *1 @PRED OR @CL- BARRIER VERB-NOTCONT); #Nukappissat namminneq takuaat TIMERSULLAMMANNGUSSAGAANNI piumasaqaatit qanoq annertutiginersut. # diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3 index e1adc8d39..a34b8d60a 100644 --- a/src/cg3/disambiguator.cg3 +++ b/src/cg3/disambiguator.cg3 @@ -1613,6 +1613,7 @@ SET FossileredeCont = (/"malip"\ Gram/TV\ V\ ContNeg/l) OR (/"marluk"\ RIAR\ Der/nv\ Gram/IV\ V\ Cont/l) OR (/"marluk"\ RIAR\ Der/nv\ Gram/IV\ V\ ContNeg/l) OR + (/"naa"\ Gram/TV\ V\ Cont/l) OR (/"naapertor"\ Gram/TV\ V\ Cont/l) OR (/"najoqqutaq"\ GE\ Der/nv\ Gram/TV\ V\ Cont/l) OR (/"najoqqutaq"\ GE\ Der/nv\ Gram/TV\ V\ ContNeg/l) OR @@ -7348,7 +7349,8 @@ REMOVE:0435B N + Abs IF (0 (/TUQ\ Der/vn\ QAR\ Der/nv\ Gram/IV\ V\ Par/l) LINK * REMOVE:0435C Abs + Pl IF (*1 ORATIOOBLVERB - 3Pl BARRIER V LINK *-1 Par + 3Pl BARRIER (*) LINK -1 Abs LINK -1 CONJ-C LINK -1 Abs); #Taassuma tunillatsittut amerlingaatsiarnerat pissutigalugu misissortittoqarnissaa tunillatsissimasinnaasunillu ujartuinissaq PINGAARUTEQARTUT oqaatigaa. -SELECT:0435D Par + INTRANSVERB IF (*-1 ORATIOOBLVERB LINK *1 ("qanoq") LINK *1 _TARGET_); #Takusinnaavara qanoq EQQARSARTOQ, una tarrarsuummiittoq. +SELECT:0435D Par + INTRANSVERB IF (*-1 ORATIOOBLVERB LINK *1 ("qanoq") LINK *1 _TARGET_) #Takusinnaavara qanoq EQQARSARTOQ, una tarrarsuummiittoq. +(NEGATE *1 Par BARRIER V OR KOMMA); #Ikuallassimasugullu tusaruniuk paasiniaalissalluni unnuakkut anigama angerlarsimaffipput qanoq ITTOQ qimassimaneriga, qanoq akissagama? ##Tamannguassi kissaappassi timikkut anersaakkullu peqqinnartumik 2022-mi immissinnut pisarumaartusi. @@ -7379,9 +7381,12 @@ REMOVE:0439B Par + 3Sg IF (0 $$KASUS + $$NUMERUS LINK *-1 (/"una"\ Prefix/TA/l) REMOVE:0441 Par + 3Pl IF (NEGATE *0 VFIN)(NEGATE 0 VFIN)(*1 Par + 3Pl) ; # evt. også (@1 ("tassa")) som IF, hvis for bred #vn, som er subjekt to SELECT:100 er ikke selv Par -REMOVE:0442 Par IF (NOT *0 VFIN OR Cau LINK *-1W VFIN LINK NOT *0 Par) #Pineqaatissiissutigineqartoq piumasaqaateqarpoq. Piumasaqaatit uannut KIFFAANNGISSUSIIAASUT. #må stå før 0443 +REMOVE:0442A Par IF (NOT *0 VFIN OR Cau LINK *-1W VFIN LINK NOT *0 Par) #Pineqaatissiissutigineqartoq piumasaqaateqarpoq. Piumasaqaatit uannut KIFFAANNGISSUSIIAASUT. #må stå før 0443 (NEGATE 0 Par + $$PN LINK *0 Cont - $$PN - 4Sg - 4Pl) #Ups toortooriga. Uatsinniik kunaat. Nukissaalatsivoq. Isumaqarlunga MASSAKKUUSOQ. Ajuusaarpunga kingusinaarlunga suliakkiissutissat nassiukkakkit. -(NEGATE *0 UNA OR UKU OR UKUA); #Naasunukua ajorniaannarlutik KAPINARTOQARTUT. +(NEGATE *0 UNA OR UKU OR UKUA) #Naasunukua ajorniaannarlutik KAPINARTOQARTUT. +(NEGATE *0 Con); #Inimi kamaappaluttut tusaasinnaavakka. Arlaat pinngikkuni, arlaat PEQQUSOQ. + +REMOVE:0442B TUQ IF (NOT *0 VFIN OR Cau LINK *0 Con); #Inimi kamaappaluttut tusaasinnaavakka. Arlaat pinngikkuni, arlaat PEQQUSOQ. SELECT:0443 Par + 3Pl IF (NEGATE *0 VFIN - (Gram/Exclm)) @@ -9262,6 +9267,7 @@ REMOVE:8602B ("neriup") + UTE + (/^iSem/HH/r) IF (0 (/^iSem/f-psych/r)); #Mannge REMOVE:8602C ("Ulloriaq") + Prop IF (0 ("ulloriaq" N ARAQ)); #ULLORIAAQQAMIK nalunngisaqarpunga REMOVE:8602D (*) - ("timi") (0 ("<[T|t]im.*>"r) + Trm LINK 1 ("qaqorsaat") LINK NEGATE 1* Gram/Db OR ("tunniup") OR ("isaap")) ; #Jude 20230906 REMOVE:8602E ("arsugaq") + N IF (*0W ("Arsugaq") + Prop); #kan sikkert laves om til en almen regel for alle navne. +REMOVE:8602F ("arnaq") + GIP + TUQ IF (0 ("Arnarissoq")); # Proprium eller pron? REMOVE:8603 ("Kina") + Prop IF (0 ("kina") + Pron LINK *1 ("?")); #KINA? @@ -9295,7 +9301,7 @@ REMOVE:4913A1 N + INNAQ IF (0 Part) #partikler med INNAQ fejllæses tit som N SELECT:4913A2 N + INNAQ + (/^i?Sem/col/r); REMOVE:4913B ("igaq") + LAAQ IF (0 ("igalaaq")) ; REMOVE:4913C ("imaq") + Aeq IF (0 ("imatut")) ; -REMOVE:4913D ("arlaaq") IF (0 ("arlaq"))(NEGATE *0 ANIMAL OR BODY OR ANATOMIC) ; +REMOVE:4913D ("arlaaq") IF (0 ("arlaq"))(NEGATE *0 ANIMAL OR BODY - ("arlaaq") OR ANATOMIC - ("arlaaq")) ; REMOVE:4913E ("sooq") IF (0 ("sooruna")) ; REMOVE:4913F ("ima") + LUUNNIIT IF (0 ("imaluunniit")) ; REMOVE:4913G ("aaq") IF (0 (/"aarit"\ Interj/l)); @@ -10596,7 +10602,8 @@ REMOVE:9479 Sem/Unit + Rel + Sg IF ((1 i3PlPoss) OR (2 Hyb/2-2 + 3PlPoss))(NEGAT REMOVE:9479 Sem/Unit + Rel + Pl IF (1 i3SgPoss)(NEGATE 1 i3PlPoss) ; REMOVE:9480 i3PlPoss + iPOSSESSUM IF (-1 Sg + Rel); REMOVE:9480 i3SgPoss + iPOSSESSUM IF (-1 Pl + Rel); -REMOVE:9481 iPOSSESSUM - iPOSSESSUM3 IF (0 iOBLIQUE - iPOSSESSUM) ; #qaqqakkoornerli +REMOVE:9481 iPOSSESSUM - iPOSSESSUM3 IF (0 iOBLIQUE - iPOSSESSUM) #qaqqakkoornerli +(NEGATE *0 1Sg OR 2Sg); # Possessum singularis eller pluralis? SELECT:9490A Sg + POSSESSUM + SPATIAL (NEGATE 0 ("ati") + TAQ) #NEGATE for ikke at blande atisassat ind i stedet for ataa @@ -12125,7 +12132,7 @@ REMOVE:9969BL (/TIP\ Der/vv\ Gram/Db/l) IF (0 (/TIP\ Der/vv\ Gram/Refl/l))#tigua REMOVE:9969BM (/Gram/TV\ \(.*\)?QQU\ Der/vv\ HTR/l) IF (0 (/Gram/IV\ \(.*\)?QQU\ Der/vv\ Gram/TV\ HTR/l)); #Ilaanni nassaarnangaluunniit aniinnartarpunga, neriullunga nalaatsortumik naapitsissallunga ISERIARTOQQUSILAARUSUTTUSSAMIK. -REMOVE:9969BN (/"tusaa"\ Gram/IV/l) + SURE IF (0 (/"tusaa"\ Gram/TV/l) + SURE); #Unnuk taanna angerlareerlunga siniffinni innangatillunga nipi taanna unnummut TUSAASORISARA tusaaqqilerpara. +REMOVE:9969BN (/"tusaa"\ Gram/IV/l) IF (0 (/"tusaa"\ Gram/TV/l) + SURE); #Unnuk taanna angerlareerlunga siniffinni innangatillunga nipi taanna unnummut TUSAASORISARA tusaaqqilerpara. REMOVE:9969BO Gram/TV + TUQ + Aeq IF (0 Gram/IV + TUQ + Aeq LINK NOT *1 ("ip")); #Pujortaat millukkaangakku pujualu ilummoorlugu silara aallartarpoq, timeralu OQILISUTUT ingerlaannaq misigisimalertarluni. diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3 index 9b1d15391..d88292bb6 100644 --- a/src/cg3/functions.cg3 +++ b/src/cg3/functions.cg3 @@ -10606,6 +10606,8 @@ MAP:M9968K @PRED TARGET CONT - FossileredeCont IF (*-1 VFIN LINK 1 KOMMA LINK 1 MAP:M9968L @ADVL> TARGET FossileredeCont IF (*-1 CONJ-C LINK *1 _TARGET_ BARRIER (*) - Abs LINK *1 CONT + @PRED BARRIER (*) - Abs); #Air Greenlandimi saqisut kattuffianni ACU-mi siulittaasoq Anders Mark Jensen paasissutissiivoq, tamannalu PEQATIGALUGU suleqatini kajumissaarlugit sulinertik nangeqqeqqullugu +MAP:M9968M @ADVL> TARGET FossileredeCont IF (*1 V - NIQAR); #Uffarfimmi sivisuumik nillertuinnarmik kuutsitiffigalugu pillarsimavaa... ilaannimigooq allaat pillartarpaa, issersuarmi unnuaq NAALLUGU aneertillugu angerlaqqussanagu.” + #flg kan ikke # da @ REMOVE:9968P Par + @CL-CIT> IF (0 Abs LINK 1 Abs + LU LINK *1 3PlO BARRIER (*) - OBLIQUE);#Kaffisortillutik nalinginnaq oqaloqatigiipput, palasip Juaap nakorsaq AALLARTOQ nulialu eqqartorneruai, nulia Sofia qallunaatut aamma oqaluttarpoq ileqqunillu kusanartunik aamma ilikkarsimalluni inuusuttuulluni qallunaani kiffaanikuugami.