From 48eb2e6b257632ac18afc75f4a2edea041d87a2c Mon Sep 17 00:00:00 2001 From: Juutitta <64779674+Juutitta@users.noreply.github.com> Date: Mon, 4 Sep 2023 22:34:37 +0000 Subject: [PATCH] --- src/cg3/dep_KalEng.cg3 | 10 ++++++---- src/cg3/disambiguator.cg3 | 6 ++++-- src/fst/affixes/derivations-inflections.lexc | 1 + src/fst/stems/nouns.lexc | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/cg3/dep_KalEng.cg3 b/src/cg3/dep_KalEng.cg3 index d0c1a2869..11ae390eb 100644 --- a/src/cg3/dep_KalEng.cg3 +++ b/src/cg3/dep_KalEng.cg3 @@ -1725,7 +1725,9 @@ SETPARENT:M_opremsning01 @SUBJ> + Abs IF #Kangerlussuarmi SERMERSUARMUKARNEQ, t (NEGATE *-1 Abs + $$NUMERUS + &&IV_SUBJ& LINK *1 _TARGET_ + ADJEKTIVISK + $$NUMERUS OR Abs + LIK + $$NUMERUS BARRIER (*) - Num - OBLIQUE LINK *1 VFIN + &&IV_SUBJ& BARRIER V)#2019-ip naanerani Kalaallit Nunaanni INUUSUTTUT 16-it 25-llu akornanni ukiullit 5.268-it imaluunniit 67 pct.-ii ilinniarfinnut suliffeqarfinnulluunniit atassuteqarput (NEGATE 0 Num + Rel LINK 1 Num + Rel + CONJ-C LINK 1 ("akunneq") + 3PlPoss)#Ukiuni kingullerni arfinilinni kalaallit HIV-mik tunillanneqarsimasut agguaqatigiissillugu ukiumut ARFINEQ_MARLUK qulingiluallu akornanniittarput . -TO (*1 KOMMA OR CONJ-C BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA LINK *1 INTRANSVERB + 3Pl BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA); +TO (*1 KOMMA OR CONJ-C BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA LINK *1 INTRANSVERB + 3Pl BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA - Conj); + +#MAP:M_opremsning01 @SUBJ> TARGET Abs IF (*1 KOMMA OR CONJ-C BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA LINK *1 INTRANSVERB + 3Pl BARRIER (*) - Abs - OBLIQUE - CONT - Adv - KOMMA - Conj) # ##Opremsningers sidste led med Gram/Conj-encl SETPARENT:M_opremsning02 @SUBJ> + Abs + CONJ-C IF #Minillu Inuit Ataqatigiit, Partii Naleraq, Atassut SULEEQATIGIISSITSISULLU ataatsimoorlutik Naalakkersuisunut nalunaaruteqarput: @@ -2429,13 +2431,13 @@ SETPARENT:M0000 (@PRED) + VFIN (NEGATE 0 iLok + U + GUNAR) # apriilimiugunarpoq nassiutereernikuuara. (NEGATE 0 U + NNGUATSIAR) #Tassa ukiut sisamaannguatsiarput qaangiuttut aalajangerpaat ... (NEGATE 0 Imp LINK 0 POSSESSUM3) #ilaasa -(NEGATE -1* @PRED) +(NEGATE -1* @PRED + CONJ-LU) TO (@0 (*)); -SETPARENT:M0000opremsningPRED (@PRED) + VFIN +SETPARENT:M0000parataktiskPRED (@PRED) + VFIN (NOT p (*)) -TO (-1* @PRED) (NOT -1* @PRED) ; #Jude 20230901 +TO (-1* @PRED + CONJ-LU) ; #Jude 20230901 Saarngi gigtertut angillutillu MANNGERPUT. # #MAP:M0001 (@PRED2) TARGET Par IF (@1 Interj)(NEGATE *0 VFIN OR NEXUS); #Ved emfase og udbrud diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3 index af68f8dc2..2f8f97e24 100644 --- a/src/cg3/disambiguator.cg3 +++ b/src/cg3/disambiguator.cg3 @@ -2978,6 +2978,8 @@ REMOVE:tidlig0665 (/"Inuit"\ Sem/Hum/l) IF (0 ("inuk") + Pl)(-1 BOS) #inuiak+3PlPoss vs. inuiak-3PlPoss REMOVE:tidlig0670 ("inuiak") + 3PlPoss IF (0 ("inuiak") - 3PlPoss + $$KASUS LINK 1 ("kalaaleq") + $$KASUS); +REMOVE:tidlig0671 ("saaneq") + 3PlPoss (0 ("saaneq") + 3SgPoss LINK 1* V - TAR) ; #Jude 20230904 Saarngi gigtertut angillutillu manngerput + REMOVE:tidlig0675 Par IF (*-1W (/"suli"\ Gram/IV\ VIK\ Der/vn\ N\ Abs\ Sg/l) LINK 1 (":") LINK *1W _TARGET_ + N + Abs LINK NEGATE *0 V - %AmbiguøsPar); #Meget smal regel Suliffik: ...Tuq. #Et par regler til at disambiguere 1SgPoss fra 3SgPoss @@ -12763,7 +12765,7 @@ SELECT:0618B Abs + CONJ-LU + Pl IF (-1C Abs + Pl - KKUT) (NEGATE 0 Rel + Pl OR Rel + LU LINK *1 3PlPoss BARRIER (*) - OBLIQUE - Rel)#Aamma Nuup, Sisimiut, Aasiaat Ilulissallu AKORNINI timmisartuussinerit pisarnertut ingerlanneqassapput (NEGATE 0 FAM_UNIK)#Manu atuartuugami aasami atuanngiffeqarnermini aanani AATANILU pinialullutik angalasut ilagiuartarpai. (NEGATE 0 + KKUT + Abs LINK 0 + Via)#Ataatsimut isigalugit pissutsit pitsanngorsaavigineqartariaqarneri qangali 80-ikkut aallartilaarneranni eqqumiitsuliortut KULTURIKKULLU suliniartut akornanni oqallisigineqartarsimapput. - +(NEGATE 0 N + POSSESSUM4 OR N + POSSESSUM2 LINK -1* N - POSSESSUM4 OR N - POSSESSUM2) #Jude 20230904 Saarngi gigtertut ANGILLUTILLU ("angilloq" N Abs Pl 4SgPoss/2SgPoss LU) manngerput. ; SELECT:0618C Abs + CONJ-LU + Sg IF (-1C Abs + Sg)(NEGATE 0 Rel + Sg LINK 1 3SgPoss) (NEGATE 0 Abs + Pl LINK 1 V + 3Pl OR 4Pl)#Taakkunannga 28 pct.-it ilinniakkamik ingerlatsipput, 39 PCT.-IILU suliffeqarlutik. @@ -12775,7 +12777,7 @@ SELECT:1610 Abs + CONJ-LU IF (*-1 Abs)(*1 INTRANSVERB + 3Pl BARRIER V)(NEGATE 0 (NEGATE -1 Rel LINK 1 _TARGET_ + Rel + CONJ-C LINK *1 3PlPoss BARRIER (*) - Rel - %AmbiguøsN)#Filmit Hollandimeersut , Indiameersut , Danmarkimeersut , Tysklandimeersut , Estlandimeersut , Sverigemeersut , Canadameersut kiisalu Letlandimeersut katillugit filmeeqqat FILMILLU sivisunerumaat qulit missaanniittut takutinneqarput . (NEGATE 0 4SgPoss LINK 0 Lok + Pl + CONJ-LU LINK *-1 Lok BARRIER (*) - KOMMA)#Inuittaaq quiminni, pilivimminni, naqqup-ataani, umiatsianilu ALLANILU pigisaminni misissuinissaannik kaammattorneqarput. (NEGATE 0 + KKUT + Abs LINK 0 + Via)#Ataatsimut isigalugit pissutsit pitsanngorsaavigineqartariaqarneri qangali 80-ikkut aallartilaarneranni eqqumiitsuliortut KULTURIKKULLU suliniartut akornanni oqallisigineqartarsimapput. - +(NEGATE 0 N + POSSESSUM4 OR N + POSSESSUM2 LINK -1* N - POSSESSUM4 OR N - POSSESSUM2) #Jude 20230904 Saarngi gigtertut ANGILLUTILLU ("angilloq" N Abs Pl 4SgPoss/2SgPoss LU) manngerput. ; SELECT:0618E Rel + Pl - POSSESSUM4 IF (1 (/__Gram\/Dem\ Pron__/l) + Rel + Pl)(NEGATE 2 3PlO) #'ILLUT taakku eqqaanni @SUBJ> ... @PRED' (NEGATE *-1 Rel LINK *1 _TARGET_ + Abs + Pl LINK *1 3PlO BARRIER Abs - ADJEKTIVISK - Num - Gram/Dem)#Københavnip Politiivisa ANGUTIT taakkua marluk toqutseqataasimasutut, toqutseriaqataasimasutut sakkortuumillu nakuuseqataasimasutut pasivaat. diff --git a/src/fst/affixes/derivations-inflections.lexc b/src/fst/affixes/derivations-inflections.lexc index b397b9f2e..4390808ad 100644 --- a/src/fst/affixes/derivations-inflections.lexc +++ b/src/fst/affixes/derivations-inflections.lexc @@ -43327,6 +43327,7 @@ LEXICON XIirXmorf2 !!= * @CODE@ til iR såsom *er* +NAR+Der/vv+SI+Der/vv:%>narsi flex-iv_voq ; +NAR+Der/vv+SI+Der/vv+GALUTTUAR+Der/vv:%>narsigaluttuar IV-mod_C ; +NAR+Der/vv+SI+Der/vv+GALUTTUAR+Der/vv+INNAR+Der/vv:%>narsigaluttuinnar IV-mod_C ; ++NAR+Der/vv+SI+Der/vv+GIARTUR+Der/vv:%>narsiartor IV-mod_C ; +NAR+Der/vv+SI+Der/vv+TIP+Der/vv:%>narsisip HTR_C_TAQ_tsi ; +NAR+Der/vv+SI+Der/vv+TIP+Der/vv:%>narsitip HTR_C_TAQ_tsi ; +NAR+Der/vv+SIMA+Der/vv+NNGIT+Der/vv:%>narsimanngi IV-mod_nngit ; diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc index 4ba9c4ef9..7c02a6340 100644 --- a/src/fst/stems/nouns.lexc +++ b/src/fst/stems/nouns.lexc @@ -10567,6 +10567,7 @@ husflid N_Loan_GEM ; hval N_Loan ; hvidkål N_Loan ; hvidløg N_Loan ; +hvidvin N_Loan ; hymnolog N_Loan ; hymnologi N_Loan_logi ; hyperkinetisk N_Loan_Adj ; @@ -29386,6 +29387,7 @@ rækkehus N_Loan_GEM ; rødbede N_Loan ; rødkål N_Loan ; rødviinni Z1VZmorf ; +rødvin N_Loan ; røgdykker N_Loan ; røntgen N_Loan ; saa+Gram/TV+Gram/Refl+VIK+Der/vn+GE+Der/nv+Gram/TV+HTR+Der/vv+Gram/IV+UTE+Der/vn:saaffiginnissut tptmorf ;