Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
klanggaard committed Aug 31, 2023
1 parent b3bf2b3 commit 9092d26
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
20 changes: 12 additions & 8 deletions src/cg3/dep_KalEng.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -3527,9 +3527,10 @@ SETPARENT:OrObl0150 @CL-<CIT + Par - GAANNI IF
(NEGATE *1 (":") LINK *1W DIRTALESTART BARRIER EOS) #Ilanngaaserisumut Sakæusimut oqarpoq nikagisaasoq taanna PILLUGU:
(NEGATE *-1 Con + ORATIOOBLVERB BARRIER V LINK *-1 VFIN + ORATIOOBLVERB OR CONT + ORATIOOBLVERB + CONJ-C)#Sulisartup qallunaap Eriup Kalaallit Nunaanniit aallalerami Katrine asasarilikkani aningaasanik tunivaa Danmarkiliarnissaminut akissanik, ilisimatilluguli aatsaat nammineq nalunaarfigereeruniuk AGGERUMAARTOQ
(NEGATE 0 (/"taama"\ IP\ Der/nv\ Gram/IV\ GALUAR\ Der/vv\ Gram/IV\ V\ Par\ 3Sg/l) LINK *1 V + Par)#Rasmus Lyberth akinngilaq, kisiannili illalaartuinnaalluni, paasinarporlu TAAMAAKKALUARTOQ Tom Jonesiunngitsoq.

TO (-*1 OQARPOQ OR ORATIOOBLVERB - N OR ("taa" 3SgO) BARRIER KOMMA)(NEGATE -*1 ("taama") OR ("nalinginnaq")) #oo ved oqarpoq aldrig simultan med taama;
;#
#oo ved oqarpoq aldrig simultan med taama;# Inuppassuit tupigusupput tusarpassuk Kalaallit Nunaat aamma Savalimmiut naalagaaffiuSUT ataaseq.
TO (-*1 OQARPOQ OR ORATIOOBLVERB - N OR ("taa" 3SgO) BARRIER KOMMA LINK NEGATE -*1 ("taama") OR ("nalinginnaq"))
;
#

#MAP:OrObl0151 @CL-CIT> TARGET Par IF (*1 OQARPOQ BARRIER VFIN LINK NEGATE -*1 ("taama") OR ("nalinginnaq") ) #oo ved oqarpoq aldrig simultan med taama
#(NEGATE *-1 ORATIOOBLVERB) #Misigisimavunga pisassartik PIGAAT, Erna Vinther AG-mut oqarpoq. Skal være @CL-<CIT
Expand Down Expand Up @@ -9642,11 +9643,14 @@ TO (*-1 ORATIOOBLVERB_CAU BARRIER V LINK *1 _TARGET_ + (/[124][SP][gl]/r)) #Nuan

#MAP:M1390E @CL-<CIT TARGET CONT IF (*-1 ORATIOOBLVERB_CAU LINK *1 Cau LINK *1 CONJ-C BARRIER V LINK *1 _TARGET_ BARRIER V) ; #Tamakkuali inerneraat Pompeop København siorna juulimi tikeraarmagu, tassanilu Steen Lynge (D), taamani nunanut allanut naalakkersuisuusoq, NAAPILLUGU.

#MAP:M1391 @CL-<CIT TARGET Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl IF (-*1 ORATIOOBLVERB + V OR ("tassa") BARRIER VFIN)(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt
##(-*1 Abs + Pl BARRIER ORATIOOBLVERB)
#(NEGATE *1C Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl BARRIER CONJ-C)
#(NEGATE *1 ORATIOOBLVERB LINK *1 Par BARRIER V)
#;
SETPARENT:M1391 @CL-<CIT + Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl IF
(NOT p (*))
(NEGATE *1C Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl BARRIER CONJ-C)
(NEGATE *1 ORATIOOBLVERB LINK *1 Par BARRIER V)
TO (-*1 ORATIOOBLVERB + V OR ("tassa") BARRIER VFIN)(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt #Inuppassuit tupigusupput tusarpassuk Kalaallit Nunaat aamma Savalimmiut naalagaaffiuSUT ataaseq.
##(-*1 Abs + Pl BARRIER ORATIOOBLVERB) #

;
SETPARENT:M1392 (@CL-<CIT) + CONT + INTRANSVERB + 1Sg OR Cau + INTRANSVERB + 1Sg IF
(NOT p (*))
(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt
Expand Down
5 changes: 4 additions & 1 deletion src/cg3/disambiguator.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -2393,7 +2393,10 @@ SUBSTITUTE:tidlig0580 (Abs) (Rel) TARGET (/"ataaseq"\ Num\ Abs/l) OR (/"01"\ Num

#Hyppig disambigueringsfejl, hvor (2SgPoss Sg) vælges isf. Pl pga. følgende UGEDAGE + 3Sg
REMOVE:tidlig0585 2SgPoss IF (0 Pl LINK *1 UGEDAGE + 3Sg BARRIER V LINK *1 V + 3Pl);
REMOVE:tidlig0586 2SgPoss (0 Abs + Pl LINK -1 Abs + Pl) ; #Jude 20230830
REMOVE:tidlig0586 2SgPoss (0 Abs + Pl LINK -1 Abs + Pl)
(NEGATE 1 V + 1Sg + 3SgO )
; #Jude 20230830 #KL 20230831 NEGATE til at klare #Aap eqqaamavara, aamma massakkut siunnersuutIT ajorinngilluinnarpara.
REMOVE:tidlig0587 Abs + Pl IF (0 Abs + Sg + 2SgPoss LINK 1 V + 1Sg + 3SgO ) ; #Aap eqqaamavara, aamma massakkut siunnersuutIT ajorinngilluinnarpara. #KL 20230831 suppl til 0586-NEGATE

REMOVE:miss ("miss.*"r) + Abs (0 (Lok|Ins|Abl|Trm|Aeq|Via)) (1 ("miss.*"r Adv)) ;
REMOVE:Nal ("Nal") + Prop + Gram/Abbr IF (0 ("nalunaaqutaq") LINK 1 Num + Rel LINK 1 ("misse") OR ("missaa") OR ("miss." Adv)) ;
Expand Down
4 changes: 2 additions & 2 deletions src/cg3/functions.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -8623,11 +8623,11 @@ MAP:M1390D @CL-CIT> TARGET Cau IF (1 ORATIOOBLVERB_CAU); #Olip AKILINNGIMMAGU na

MAP:M1390E @CL-<CIT TARGET CONT IF (*-1 ORATIOOBLVERB_CAU LINK *1 Cau LINK *1 CONJ-C BARRIER V LINK *1 _TARGET_ BARRIER V) ; #Tamakkuali inerneraat Pompeop København siorna juulimi tikeraarmagu, tassanilu Steen Lynge (D), taamani nunanut allanut naalakkersuisuusoq, NAAPILLUGU.

MAP:M1391 @CL-<CIT TARGET Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl IF (-*1 ORATIOOBLVERB + V OR ("tassa") BARRIER VFIN)(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt
MAP:M1391 @CL-<CIT TARGET Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl IF (-*1 ORATIOOBLVERB + V OR ("tassa") BARRIER VFIN)(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt #Inuppassuit tupigusupput tusarpassuk Kalaallit Nunaat aamma Savalimmiut naalagaaffiuSUT ataaseq.
#(-*1 Abs + Pl BARRIER ORATIOOBLVERB)
(NEGATE *1C Par + INTRANSVERB + 3Pl OR CONT + INTRANSVERB + 4Pl OR Cau + INTRANSVERB + 3Pl BARRIER CONJ-C)
(NEGATE *1 ORATIOOBLVERB LINK *1 Par BARRIER V)
##
##
;
MAP:M1392 (@CL-<CIT) TARGET CONT + INTRANSVERB + 1Sg OR Cau + INTRANSVERB + 1Sg IF (-*1 ORATIOOBLVERB + 1Sg BARRIER ORATIOOBLVERB OR VFIN OR @CL-<CIT)(NEGATE 1 Prop + Abs OR Prop + Sem/FirstName)(NEGATE 0 Der/nv LINK *1 Par + Sg) #20100322 Sidste NEGATE for skyld oo, hvor et verbalnomen er subjekt
(NEGATE 0 CONT + CONJ-C LINK 1 CONT LINK 1 EOS)#Tamatuma saniatigut pingaartittarpara ullormut angusaqartutut misigisimallunga NAAMMAGISIMAARLUNGALU innassallunga.
Expand Down
2 changes: 1 addition & 1 deletion src/fst/stems/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -21008,7 +21008,7 @@ sukkaqqisaap HTR_UTE_SSAQ_ssi ;
sukkaqqisaap XIuteXmorf ;
sukkarsor IV_r_stem ;
sukkatsip HTR_C_TAQ_tsi ;
sukka+Gram/IV+TSIP+Gram/vv:sukkatsip XIitX_stem ;
sukka+Gram/IV+TSIP+Der/vv:sukkatsip XIitX_stem ;
sukkatsisar IV_r_stem ;
sukkior IV_r_stem ;
sukkip XIiXmorf_stem ;
Expand Down

0 comments on commit 9092d26

Please sign in to comment.