Skip to content

Commit aaca1a2

Browse files
committed
x
1 parent ab1bb89 commit aaca1a2

3 files changed

Lines changed: 75 additions & 16 deletions

File tree

src/cg3/dependency.cg3

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,6 +2522,7 @@ TO (1 ("inatsit") + N - Der/nv OR ("skema") - Der/nv OR ("suliaq") - Der/nv OR (
25222522
#Tamatuma saniatigut siunnersuutip imaraa aatsitassarsiornermut akuersissutinik killilersuinissamut aamma utertitsinissamut toqqammavissaq.
25232523
#Katersugaasivinnimi takornariat isernermut akiliutaat ingerlatsinermut aningaasartuutinut matussuseeqataasarput.
25242524
#Qujanaq Oqaasileriffimmut apeqqutinnut.
2525+
#Uuliap nappartamut akia nunarsuarmi qaffakkaluttuinnarmat Nunavummi uulia akitsoriartuinnartoq, Nunavummi nukissiuuteqarnermut naalakkersuisoq Ed Picco oqarpoq.
25252526

25262527
SETPARENT:M_faste0001x1a @ADVL>N + Ins IF
25272528
(NOT p (*))
@@ -4906,6 +4907,11 @@ TO (@0 (*));
49064907
#
49074908
#MAP:MMWE01 @N< TARGET ("ilaasortaat") + $$KASUS IF (-1 ("umiarsuaq") + $$KASUS OR ("umiaq") + SUAQ + $$KASUS) ;
49084909

4910+
##KL: uulia i de konstruktioner hvor uulia + nappartaq ligner composita-agtig
4911+
SETPARENT:M0043O @>N + ("uulia") + Sg + Abs IF
4912+
(NOT p (*))
4913+
TO (1A ("nappartaq") - Sg LINK 1 Num) ;#Uulia nappartat 90 milliardit tassaapput nunarsuarmi ukiut pingasungajaat ingerlaneranni atorneqartartut.
4914+
49094915
#MAP:M1580 @>N TARGET Gram/Abbr + Abs IF (1 Num)(NEGATE *1 TRANSVERB + 3SgO - CONT BARRIER V - CONT);
49104916

49114917

@@ -5417,6 +5423,18 @@ TO (*-1 VFIN BARRIER CLB);
54175423
#
54185424
#tassa i sætninger uden overordnede modi, med eller uden U
54195425

5426+
SETPARENT:M0231Ax1 @FOC>N + ("tassa") - V IF (-*1 Ins + $$NUMERUS BARRIER (*) - KOMMA)
5427+
(NOT p (*))
5428+
TO (*1 Ins + $$NUMERUS OR ("misse")+ Ins BARRIER (*) - Num - Rel ) ;
5429+
5430+
SETPARENT:M0231Ax2 @N< + Ins + $$NUMERUS - ("misse" Ins) IF
5431+
(NOT p (*))
5432+
TO (-*1 ("tassa") - V BARRIER (*) - Rel - Ins - Num LINK -**1A Ins + $$NUMERUS BARRIER V LINK NOT -1 Ins + $$NUMERUS );
5433+
5434+
SETPARENT:M0231Ax3 @N< + Ins + ("misse" Ins) IF
5435+
(NOT p (*))
5436+
TO (-*1 ("tassa") - V BARRIER (*) - Rel - Ins - Num LINK -**1A Ins + $$NUMERUS LINK NOT -1 Ins + $$NUMERUS );
5437+
54205438
SETPARENT:0231A @PRED + (/"tassa"\ Adv/l) - MI - UNA - UKU IF
54215439
(*-1 BOS LINK 1 Abs LINK 1 _TARGET_ LINK *1 Abs BARRIER (*) - Lok - Rel LINK *1 KOMMA BARRIER (*) - Abs LINK *1 VFIN) #Nuuk TASSA Kalaallit Nunaanni illoqarfiit anginersaat, inuit 18.000-it missaat Nuummi najugaqarput.
54225440
TO (@0 (*)); #
@@ -5973,7 +5991,9 @@ SETPARENT:M0408Ex7 @i->N>N + N + Ins - ADVERBIEL IF
59735991
(NEGATE 1 (/LIR\ Der/nv\ Gram/TV\ HTR\ Der/vv\ Gram/IV/l) + N)#- Ruslandip tassaniinnerata *ilisimaneqarneranik takussusiinissaq USA-p inassutigaa.
59745992
TO (1 (/LIR\ Der/nv\ Gram/TV/l) + N ) ;#Naja Lyberth akuersiteqqaarnagu naartunaveersaammik spiralilerneqarsimasoq taama oqaluttuarpoq.
59755993

5976-
5994+
SETPARENT:M0408Ex8 @i->N + Ins IF
5995+
(NOT p (*))
5996+
TO (1 KOMMA LINK 1 @FOC>N LINK *1 Ins + @N< LINK 1A V + QAR) ; #Amerikami aningaaseriviup Merrill Lynchip uuliap ukiuni tulliuttuni akikilliartuinnarnissaa naatsorsuutigaa oqaatigalugulu uulia nappartamut 25 dollarinik, tassa 125 koruunit missaannik akeqalersinnaasoq.
59775997

59785998

59795999

@@ -8073,6 +8093,11 @@ SETPARENT:OrObl0152D @CL-<CIT + Cau IF (1 CONJ-LU) (*1 CONT BARRIER (*) - OBLIQU
80738093
(NOT p (*))
80748094
TO (-*1 ORATIOOBLVERB_CAU + V + VFIN BARRIER VFIN) ;# - Erseqqissaassutigerusuppara naluneqanngitsutut ukiup massumap aallartilaarnerani oqariartuutit aalajangersimasut maani nunatsinni ernumalersitserujussuarmata eqqarsarnartoqarsimaqalutillu.
80758095

8096+
SETPARENT:OrObl0152E @CL-<CIT + Par IF (1 EOS)
8097+
(NOT p (*))
8098+
TO (-*1 CONT + CONJ-LU + @PRED BARRIER V) ;#Amerikami aningaaseriviup Merrill Lynchip uuliap ukiuni tulliuttuni akikilliartuinnarnissaa naatsorsuutigaa oqaatigalugulu uulia nappartamut 25 dollarinik, tassa 125 koruunit missaannik akeqalersinnaasoq.
8099+
8100+
80768101
SETPARENT:OrObl0153_NOTx1 @ADVL> + CONT + TIP IF (-*1 ("maluge") + VFIN BARRIER V)
80778102
(NOT p (*))
80788103
TO (*1 Cau + 3Pl OR Cau + 3Sg BARRIER V) ;#Maluginiarumaarpat illoqarfiup ornigassap sorliunera apeqqutaatillugu maleruagassat assigiinngitsuummata.
@@ -10488,6 +10513,7 @@ SETPARENT:MM0407Anum @>N + Num + Abs IF
1048810513
TO (1 NUMCOMP) ;
1048910514
##USA-mi suliffissaaleqisut 17 millioninngortut
1049010515
#Suliffeqanngitsutut nalunaarutiginnittut sapaatip-akunnerisa kingulliit marluk ingerlaneranni 10 millioniupput, 6,6 millioninillu taakku maanna amerlillutik.
10516+
#Ilisimatuut ukioq kingullerni oqaatigisarpaat, uuliat nappartat *7,5 milliardit Issittumi qaluneqarsinnaasut, amerikamiulli ilisimatuut, geologimit Don Gautier-imit aqunneqartut isumalluannginnerupput.
1049110517

1049210518
###Afløst af @>N: #SETPARENT:M0407Anum @i-MWE>N + Num IF
1049310519
#(NOT p (*))
@@ -10551,14 +10577,14 @@ SETPARENT:M0408Anumx3 @>N + Num IF
1055110577
TO (1 Conj LINK 1 Num LINK 1A Sem/Unit); #Ini 4 gange 3 meterinik uuttuuteqarpoq
1055210578

1055310579

10554-
SETPARENT:M0408Anum @>N + NUMHOVED - Trm - Ins IF
10580+
SETPARENT:M0408Anum @>N + NUMHOVED + $$KASUS + $$NUMERUS - Trm - Ins - POSSESSUM IF
1055510581
(NOT p (*))
1055610582
(NEGATE *1 (/\(\ |=|"\)gange\(\ |=|"\)/r) BARRIER (*) - NUM) #ini 4 gange 3 meterinik uuttuuteqarpoq.
1055710583
(NEGATE -1 NUM + @>N LINK 2 NUM + @>N) # ' .. kapitel 2 ..' specialfald før de følgende
1055810584
(NEGATE 0 Rel + Pl LINK 1 Gram/Ord + 3PlPoss)#IMMIKKOORTUT arferngat
1055910585
(NEGATE 0 ("procent") LINK 1 Num LINK 1 ("pct.") )
10560-
TO (1 Num + Abs - @N<);
10561-
10586+
TO (1A Num + Abs - @N< LINK NOT 1 Num + $$KASUS + $$NUMERUS );
10587+
## - POSSESSUM: #Doris Jakobsen Jensenip oqarnera naapertorlugu taanna Facebookikkut pisortatigoortumik quppernermini 10.000-it sinnerlugit malinnaasoqarpoq.
1056210588

1056310589

1056410590
SETPARENT:M0408Cnum @>N + Num + Abs - ("ataaseq") IF
@@ -12545,6 +12571,10 @@ SETPARENT:M0632 @ADVL> + Trm IF
1254512571
TO (*1 @MIK-OBJ> BARRIER (Lok @N< ) OR V LINK *1A HTR + V - CONJ-LU BARRIER V OR (*) - (Trm @N<) - Ins) ;# Sinnattumini takusimavaattaaq angut kusanartorsuarnik atisalik inunNUT perlilersunut nerisassanik agguaasoq, kingornalu angut taannarpiaq toqungalluni nalasoq.
1254612572
##BARRIER V: #- Tamanna pisariaqanngitsumik tunngavissaqanngitsumillu Kujallermi, pingaartumik Narsami najugaqartunut, toqqissisimatitsinngilaq aamma Siumup qanoq aalajangersaasimaneranik nalornilersitsivoq, taanna tusagassiuutinut nalunaarummi oqarpoq.
1254712573

12574+
##led i Trm som står ved Ins og V med inderiv objekt
12575+
SETPARENT:M0633 @ADVL> + Trm - OTHERTIME IF
12576+
(NOT p (*))
12577+
TO (**1 Ins - Der/vn - HTR - Gram/HV BARRIER V OR Der/vn OR HTR OR Gram/HV LINK 1A V + QAR ) ;##Amerikami aningaaseriviup Merrill Lynchip uuliap ukiuni tulliuttuni akikilliartuinnarnissaa naatsorsuutigaa oqaatigalugulu uulia nappartamut 25 dollarinik, tassa 125 koruunit missaannik akeqalersinnaasoq.
1254812578

1254912579
############################
1255012580
## Inderiverede adverbaler #
@@ -12617,7 +12647,7 @@ SETPARENT:M0744Cx @i-ADVL> + CONT + 3SgO IF
1261712647
(NEGATE 2 ("IP") + V)#Atuagaq takkuppoq, dvd atuakkap iluaniittoq tassaniitiinnarlugu atuagaateqarfimmiilissava?
1261812648
(NEGATE 1 ANIMAL + (/TAQ\ Der/nn\ SSIP/l))#Pinngortitaleriffiup qalerallit tunineqartut mikineruleriartuinnarnerat PISSUTIGALUGU qaleralittassiissutit ikinnerungaatsiarnissaat ukiorpassuarni innersuussutigisarpaa.
1261912649
(NEGATE 1 Aeq LINK 1 ("misige") ) #Ungasillereersoq takullugu annaasaqartutut misigivunga.
12620-
TO (1A TAQ + N - 3SgPoss - 3PlPoss LINK NOT 1 @CL-<CIT) ; #Imeqarniarneq pillugu nalunaarusiaq Nukissiorfinniit Asiaq suleqatigaluGU saqqummersitaq politikerit atorluassagaat, Nukissiorfinni ingerlatsinermut siunnersortip Niels Christian Nielsenip qularinngilaa.
12650+
TO (1A TAQ + N - 3SgPoss - 3PlPoss - (/"atuar"\ Gram/TV\ TAQ\ Der/vn\ N/l) LINK NOT 1 @CL-<CIT) ; #Imeqarniarneq pillugu nalunaarusiaq Nukissiorfinniit Asiaq suleqatigaluGU saqqummersitaq politikerit atorluassagaat, Nukissiorfinni ingerlatsinermut siunnersortip Niels Christian Nielsenip qularinngilaa.
1262112651

1262212652

1262312653
SETPARENT:0744C @i-ADVL> + CONT + (/3[SP][gl]O/r) IF
@@ -12626,7 +12656,7 @@ SETPARENT:0744C @i-ADVL> + CONT + (/3[SP][gl]O/r) IF
1262612656
(NEGATE 0 FossileredeCont LINK *1 VFIN OR Cau)#Atuakkiortut peqatigiiffiata siulittaasuata Arkaluk Lyngep Islandermiut unamminernut peqataajuartarnerannut pissutaanerarpaa Islandermiut nunanut allanut naleqqiullugit atuakkanik atuarnerpaagamik, immikkullu atuagaateqartariaqarneq kultureqarfigigamikku.
1262712657
(NEGATE 0 (/"ip"\ Gram/TV/l) LINK -1 Aeq LINK 1 _TARGET_ LINK*1 VFIN)#Kiisa naammattuukkakka suli upperinngitsutut illugit eqqaamiutsinnik soqutigisaarullunga nillialerpunga sinnattupalaamit itissasoralunga.
1262812658
(NEGATE 0 QQU LINK *1 (/TAQ\ Der/vn\ U/l) + QQU )#Taamaammat innuttaasut suliffeqarfiillu politiinit piumaffigineqarput atortut assigisinnaasaallu isumannaatsumik *inisseqqullugit anorersuarmiit tingitaaqqunagit, inunnut allanullu eqqaaniittunut navianarsinnaammat.
12629-
TO (*1 N + NIQAR - LEKSIKALISERING - Aeq - NIRU - (/Gram/IV\ TARIAQAR\ Der/vv\ TAR\ Der/vv\ Gram/IV/l) OR (/TAQ\ Der/vn/l) - (U VIK GE) - LEKSIKALISERING - Aeq - NIRU - (/Gram/IV\ TARIAQAR\ Der/vv\ TAR\ Der/vv\ Gram/IV/l) BARRIER CONJ-LU OR (*) - OBLIQUE OR Der/vn + N)
12659+
TO (*1 N + NIQAR - LEKSIKALISERING - Aeq - NIRU - (/Gram/IV\ TARIAQAR\ Der/vv\ TAR\ Der/vv\ Gram/IV/l) OR (/TAQ\ Der/vn/l) - (U VIK GE) - LEKSIKALISERING - Aeq - NIRU - (/Gram/IV\ TARIAQAR\ Der/vv\ TAR\ Der/vv\ Gram/IV/l) - (/"atuar"\ Gram/TV\ TAQ\ Der/vn\ N/l) BARRIER CONJ-LU OR (*) - OBLIQUE OR Der/vn + N)
1263012660
; #Oqaasileriffimmit ilisimatitsissutit Oqaasileriffimmi pisortamit Katti Frederiksenimit ALLAGANNGORLUGIT Oqaasiliortunut nassiunneqarnikut Oqaasiliortut siulittaasuannit Oqaasiliortunut ilisimatitsissutigineqarput.
1263112661

1263212662
SETPARENT:0745A2 @i-ADVL> + Trm IF

src/cg3/disambiguator.cg3

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ LIST <sem-c> = (/"eqqarsar"\ Gram/IV\ UTE\ Der/vn/l) ;
15141514
LIST <sem-r> = "allagaq" (/"allap"\ Gram/HV\ SIMA\ Der/vv\ \(Gram/IV\ \)?TUQ/l) (/"allap"\ Gram/HV\ Gram/IV\ USIQ\ Der/vn\ GE\ Der/nv\ Gram/TV\ TAQ/l) (/"nutser"\ Gram/TV\ UTE/l) "ordbog" "paragraf" ;
15151515
LIST <temp> = ("siuneq" SSAQ);
15161516
LIST <tool> = "qarasaasiaq" (/"timmiaq"\ SIUT/l) "timmiarsiut" ;
1517-
LIST <unit> =Sem/Unit "grad" "km/time" "liter" "pingajorarterut" "procent" "%" "mil";
1517+
LIST <unit> =Sem/Unit "grad" "km/time" "liter" "pingajorarterut" "procent" "%" "mil" "nappartaq";
15181518
LIST <Vwater> = (/"angala"\ Gram/IV\ UTE\ Der/vn/l) (/"annap"\ Gram/IV\ NIUTE/l) (/"arfap"\ Gram/IV\ NIUTE/l) "gummibåd" "Sisak" ;
15191519

15201520
#!! ### Semantic tags
@@ -1999,7 +1999,7 @@ LIST INSTITUTION = Sem/inst
19991999
LIST LANDTRANSPORT = "bussi" "biili" "bil" "lastbiili" "nivattaassuaq" "pisummik" <Vground> "ATV" "taxa";
20002000
LIST MWE_POSS = "ullaap-tunge" "Kalaallit Illuutaat" "Kalaallit Nunaat" "Kalaallit Røde Korsiat" "nunap inoqqaavi" "Nunatsinni Inuit Innarluutillit Kattuffiat" "Tuluit Nunaat" "Zombiet Nunaat";
20012001
LIST NON-POSSESSUM = "malunnar" "utoqqaq" ; #en klasse af ord, der sjældent eller aldrig har possessor
2002-
LIST NUMHOVED = "cent" "centimeter" "cm" "dollar" "dollari" "euro" "fase" "fod" "franc" "grad" "gram" "hestekræfter" "hjerter" ("immikkoor" TUQ) "ini" "kapitali" "kapitel" "kiilu" "kilo" "kilometer" "km" "km/time" "klasse" "kulooq" "koruuni" "kr" "kr." "krone" "kvadratmeter" "liter" "m" "meter" "milliardi" "milliard" "miliuuni" "mio" "mio." "million" "millioni" "milliard" ("nalunaar" UTE) "niveau" "nr" "oori" "paragraf" "%" "procent" "procentpoint" "pct" "pct." ("qupper" NIQ) "ruder" "side" "sipaaq" ("titar" NIQ Abs) "ton" (/".*vej/r) "øre" Sem/Unit ;
2002+
LIST NUMHOVED = "cent" "centimeter" "cm" "dollar" "dollari" "euro" "fase" "fod" "franc" "grad" "gram" "hestekræfter" "hjerter" ("immikkoor" TUQ) "ini" "kapitali" "kapitel" "kiilu" "kilo" "kilometer" "km" "km/time" "klasse" "kulooq" "koruuni" "kr" "kr." "krone" "kvadratmeter" "liter" "m" "meter" "milliardi" "milliard" "miliuuni" "mio" "mio." "million" "millioni" "milliard" ("nalunaar" UTE) "nappartaq" "niveau" "nr" "oori" "paragraf" "%" "procent" "procentpoint" "pct" "pct." ("qupper" NIQ) "ruder" "side" "sipaaq" ("titar" NIQ Abs) "ton" (/".*vej/r) "øre" Sem/Unit ;
20032003
#Prænominaler, der ofte tager et tal i Sg som hoved
20042004
LIST N_NUMHOVED = "blok" "sipaaq" "hjerteri" "kippari" "kulooq" "normu" "linie";
20052005
LIST NÆPPE-SING = (/"naatsorsor"\ Gram/TV\ UTE/l);
@@ -8190,10 +8190,12 @@ REMOVE:0477G Par IF (0 TUQ LINK *-1 Abs BARRIER V LINK *-1 Ind + (/3[SP][gl]/l)
81908190

81918191
REMOVE:0477Hx1 Abs + Sg IF (0 Par + 3Sg LINK 1 ORATIOOBLVERB + NIQAR + VFIN LINK 1 KOMMA LINK NOT *1 Par OR CONT - FossileredeCont) ;#Aka Hansenilli quppernera killilerneqarsimasoq nalunaarfigineqarpoq, ...
81928192

8193-
REMOVE:0477H Par IF (0 TUQ LINK -1 Abs)(*1 Num LINK *1 VFIN + (/3[SP][gl]/l)); #2020-mi imigassaq akoqanngitsoq EQQUSSUUNNEQARTOQ TUNISASSIARINEQARTORLU 372 tusind literiusimavoq.
8193+
REMOVE:0477H Par IF (0 TUQ LINK -1 Abs)(*1 Num LINK *1 VFIN + (/3[SP][gl]/l))
8194+
(NEGATE -*1 Abs + Sg LINK *1 _TARGET_ LINK 1 CONJ-LU LINK *1 Par + 3Sg LINK *1 VFIN)# Uuliamik qillerivik *aserorsimasoq uuliamillu nappartanik 4,9 millioninik annertussusilimmik Mexicop Kangerliumanersuanut mingutsitsisoq, periaaseq Static Kill-imik taaneqartoq atorlugu milinniarnera, BP-p iluatsippaa.
8195+
; #2020-mi imigassaq akoqanngitsoq EQQUSSUUNNEQARTOQ TUNISASSIARINEQARTORLU 372 tusind literiusimavoq.
81948196

81958197
REMOVE:0477I (/TUQ\ Der/vn\ N\ Abs\ Sg/l) IF (0 Par + NUMERAL + NNGUR + 3Sg LINK -1 BOS);#QULAALUANNGUNNGITSOQ apuutissuunga
8196-
8198+
81978199
REMOVE:0479 INTRANSVERB + Par IF (0 iAbl) ; #Nunaanneersoq
81988200

81998201
REMOVE:0479 INTRANSVERB + Par + 3Pl - GAANNI IF (1 3PlPoss + Sg)(*1 TRANSVERB + 3SgO) ;
@@ -8509,6 +8511,9 @@ REMOVE:0549A2 (/TUQ\ Der/vn\ N\ Abs\ Pl\ %AmbiguøsN/l) IF (0 (/TUQ\ Der/vn\ N\
85098511
(NEGATE *1 V + QQU + CONT)#Taamaammat innuttaasut suliffeqarfiillu politiinit piumaffigineqarput *atortut assigisinnaasaallu isumannaatsumik inisseqqullugit anorersuarmiit tingitaaqqunagit, inunnut allanullu eqqaaniittunut navianarsinnaammat.
85108512
;
85118513

8514+
REMOVE:0549A3 Abs + Sg IF (0 Par + 3Sg LINK -*1 Abs + Sg LINK *1 _TARGET_ LINK 1 CONJ-LU LINK *1 Par + 3Sg LINK *1 VFIN) ;
8515+
# Uuliamik qillerivik *aserorsimasoq uuliamillu nappartanik 4,9 millioninik annertussusilimmik Mexicop Kangerliumanersuanut mingutsitsisoq, periaaseq Static Kill-imik taaneqartoq atorlugu milinniarnera, BP-p iluatsippaa.
8516+
85128517
#Er i tvivl om hvad følgende regel gør, så vil ikke slette den, men korrigerer bare for en akut fejl
85138518
SELECT:0549B N OR Prop - Sem/Hum IF (*1 LIK - INDERIVERENDE_TITEL - (/siu"\ LIK/l) BARRIER V) #siulik ikke-disambigueret siuleq
85148519
(NEGATE 0 Adv OR Pali OR Num)

0 commit comments

Comments
 (0)