Skip to content

Commit

Permalink
fst-huller og begyndende sletning af tag @advl>N
Browse files Browse the repository at this point in the history
  • Loading branch information
planggard committed Aug 30, 2023
1 parent 963d441 commit 52c810d
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 18 deletions.
11 changes: 5 additions & 6 deletions src/cg3/dep_KalEng.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -5313,15 +5313,14 @@ SETPARENT:M0411E @ADVL>N + TRANSPORT OR SPATIAL OR ("akunneq") IF
TO (*1 <Lpath> + $$KASUS BARRIER (*) - $$KASUS)
;
#
#MAP:M0411F @ADVL>N TARGET Sem/Geo + Abl IF (*1 SPATIAL + Trm BARRIER (*) - Rel LINK 1 <Lpath>)#Naasoqarneq taamaattoq aqquserniassap aqqutissaata sinaani nassaassaavoq, assersuutigalugu KANGERLUSSUARMIIT tatsit tarajuusut saneqqunnissaata tungaanut aqqummi.
#;
SETPARENT:M0411F @ADVL>N + Sem/Geo + Abl IF
(NOT p (*))
TO (*1A SPATIAL + Trm BARRIER (*) - Rel LINK 1 <Lpath>)#Naasoqarneq taamaattoq aqquserniassap aqqutissaata sinaani nassaassaavoq, assersuutigalugu KANGERLUSSUARMIIT tatsit tarajuusut saneqqunnissaata tungaanut aqqummi.
;

#MAP:M0411G @ADVL>N TARGET SPATIAL + Lok IF (*1 <inst> BARRIER (*) - PROP) ;
#
#MAP:M0411H @ADVL>N TARGET (Lok) IF (1 ("ila") - AFFINGERET) (NEGATE 0 (TIME)) ; #Toqutaasuni ilaat sakkutuujunngitsut Sermitsiaq allaaserisaqarpoq.
#
#MAP:M0411I @ADVL>N TARGET (Ins) IF (1 INDERIVERENDE_SUBSTANTIV) (0 (/TAQ\ Der/nn\ LIK\ Der/nn\ N\ Ins__/l)) ;
#

##Specifikke ord
#MAP:M0414 @HNOUN TARGET ("isikkivik") IF (NEGATE *1 V BARRIER KOMMA) ; #måske mere konstaterende end udbrudsagtigt, derfor ikke EXCLM. #Manu aananilu illuaqqami aataap qangangaatsiarli sanaarisimasaani nerriviusannguaq nerriviliullugu issiapput, mannalu isikkivik.
#
Expand Down
12 changes: 8 additions & 4 deletions src/cg3/disambiguator.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -5148,7 +5148,7 @@ SELECT:0070 Rel + Pl - Num - POSSESSUM12 IF (1C 3PlPossUdenMWE)(NEGATE 1 ("siune
(NEGATE 0 U LINK *-1 BOS BARRIER (*) - ("suli" Adv))#Suli MEERAASUT angutaat inupiluup Saqup inuartarai.
(NEGATE -1 Rel + Sg LINK 1 _TARGET_ + Sg + CONJ-C)#Danmarkip nunattalu akornanni juullip UKIORTAALLU akornanni angalasussat aarlerinarnerpaapput.
(NEGATE 0 Abs + Pl LINK *1 CONJ-C + Abs + Pl BARRIER (*) - Hyb/1-2 LINK *1 VFIN + 3Pl BARRIER V)#Allagaatinik katersuivimmi ujarliutip nanisaani ujagaq qiterliulluni inissisimasassaaq, oqaatsillu siuliiniITTUT kinguliiniittullu amerlanngitsuinnaat aamma nuisinneqartassapput

(NEGATE 0 (NIQ Sg Lok) - HUM LINK 1 3PlPoss + Abs + &&IV_SUBJ& LINK 1 V + &&IV_SUBJ&)#- Meeqqat taakkua sisamat qitinnermik festivalimi soqutiginnilluinnarlutik peqataapput , qitinnermillu TAKUTITSINERMI piginnaasaqarluarnerat takuneqarsinnaammat , piginnaasaminnik ineriartortitseqqissinnaanissaannik periarfissinniarpavut , Norgemi qitinnermik ilinniarfimmeersoq Kristin Berg oqarpoq .
; #iluaqutaasumik

#Før 0072 for at holde på den før andet gennemløb sletter possessum med regel 0105
Expand Down Expand Up @@ -5225,6 +5225,7 @@ SELECT:0074B Rel + Pl + 4SgPoss IF (1 3PlPoss)(*0 3Sg BARRIER VERB-NOTCONT)#Ikke
(NEGATE 0 ("ilaanni") + Adv LINK -1 KOMMA)#Piniartut arlallit qivittunik naammattoorsisimasut tusarnaartarpai, ilalu ersisuittarsimassusii, ILAANNIMI ilaasa malittarsimagaluaqaat sumiiffeeruttarsimallugilli.
(NEGATE *-1 Rel + Pl BARRIER (*) - Rel LINK *1 _TARGET_ + OBLIQUE LINK 1 3PlPoss)#Nunat killiit ISSITTUMI sakkutuuliinerat Ruslandimit ernummatigineqarpoq
(NEGATE 1 (".*logi"r) + Abs)#ILISIMATUSARFIMMI biologii pillugu ilinniarsinnaalernermut aningaasaateqarfik aningaasaliisoq
(NEGATE 0 (NIQ Sg Lok) - HUM LINK 1 3PlPoss + Abs + &&IV_SUBJ& LINK 1 V + &&IV_SUBJ&)#- Meeqqat taakkua sisamat qitinnermik festivalimi soqutiginnilluinnarlutik peqataapput , qitinnermillu TAKUTITSINERMI piginnaasaqarluarnerat takuneqarsinnaammat , piginnaasaminnik ineriartortitseqqissinnaanissaannik periarfissinniarpavut , Norgemi qitinnermik ilinniarfimmeersoq Kristin Berg oqarpoq .

;

Expand Down Expand Up @@ -6706,6 +6707,7 @@ SELECT:0412B Pl + Rel - NÆPPE-POSS - Orth/Arch IF (*1C 3PlPossUdenMWE - Orth/A
(NEGATE 0 Abs + Pl LINK *1 NIQAR + 3Pl OR NIQAR + 4Pl BARRIER V OR KOMMA LINK *-1 3PlPoss BARRIER _TARGET_)#NB snæver specialitet ved passiv inderivering hvor usikkerhed mellem anersaartornerminnut og anersaartornerannut: Uninngasunit 125-nit 18-it peruluttut uninngavianniipput, taakkunanngalu 13-IT anersaartornerannut ikiorsiissutaasumik anersaartuuteqartinneqarlutik.
(NEGATE -1 Rel + Sg LINK 1 _TARGET_ + Sg + CONJ-C)#Danmarkip nunattalu akornanni juullip UKIORTAALLU akornanni angalasussat aarlerinarnerpaapput.
(NEGATE 0 Abs + Pl LINK *1 CONJ-C + Abs + Pl BARRIER (*) - Hyb/1-2 LINK *1 VFIN + 3Pl BARRIER V)#Allagaatinik katersuivimmi ujarliutip nanisaani ujagaq qiterliulluni inissisimasassaaq, oqaatsillu siuliiniITTUT kinguliiniittullu amerlanngitsuinnaat aamma nuisinneqartassapput
(NEGATE 0 (NIQ Sg Lok) - HUM LINK 1 3PlPoss + Abs + &&IV_SUBJ& LINK 1 V + &&IV_SUBJ&)#- Meeqqat taakkua sisamat qitinnermik festivalimi soqutiginnilluinnarlutik peqataapput , qitinnermillu TAKUTITSINERMI piginnaasaqarluarnerat takuneqarsinnaammat , piginnaasaminnik ineriartortitseqqissinnaanissaannik periarfissinniarpavut , Norgemi qitinnermik ilinniarfimmeersoq Kristin Berg oqarpoq .

;

Expand Down Expand Up @@ -12547,8 +12549,9 @@ REMOVE:0522B N + TUQ OR (".*(s|t)oq"r) IF (0 Par + <fn:Enter> LINK 1 ORATIOOBLVE

REMOVE:0523B Par IF (0 N + <Hprof>) (1 CLB - KOMMA) ;

REMOVE:0523C Par IF (0 N + <Hprof> LINK *1 Sem/Hum BARRIER (*) - KOMMA); #Ilinniartitsisut kattuffianni SIULITTAASOQ, Sivso Dorph isumaqarpoq ajornartorsiut tassaasoq, meeqqat atuarfii pillugit inatsit erseqqarluppallaartoq.

REMOVE:0523C Par IF (0 N + <Hprof> LINK *1 Sem/Hum BARRIER (*) - KOMMA) #Ilinniartitsisut kattuffianni SIULITTAASOQ, Sivso Dorph isumaqarpoq ajornartorsiut tassaasoq, meeqqat atuarfii pillugit inatsit erseqqarluppallaartoq.
(NEGATE *0 ORATIOOBLVERB + V)#Toqutaasuni ilaat SAKKUTUUJUNNGITSUT Sermitsiaq allaaserisaqarpoq.
;
REMOVE:0549 Abs IF (0 Par + ADV-LU LINK NOT -1 Abs)(NEGATE 0 Rel)(NEGATE -1 BOS OR KOMMA) ; #Taannarsuaq imminut naalliutsinnermik kajungerisalik suli pangalilluni tatsip illua'tungaani orpiit akornannut *pulasorlu tatsip tasertaa patsisaasimanerluni nunap sajukulanera malunnarunnaarpoq. # taget højde for paratakse med LINK NOT -1 Abs

REMOVE:0549A Par IF (0 TUQ LINK 1C ADV-LU + Par) ;
Expand Down Expand Up @@ -13948,7 +13951,7 @@ REMOVE:8563F (/Gram/TV\ V\ Ind\ 3Pl\ 3PlO/l) IF (0 (/Gram/TV\ V\ Ind\ 3Pl\ 3SgO/
##### Nomen eller numerale 14271
##### Nomen eller verbum 14314
##### Verbum eller verbum 14389
##### Enkelte derivativer 14875
##### Enkelte derivativer 14884
##### Enkelte substantiver 15042
# ======================================================================= #

Expand Down Expand Up @@ -14879,6 +14882,7 @@ REMOVE:5578T ("aap") IF (0 (/"aa"\ Gram/TV\ V\ Cont\ 3SgO\ CONJ-LU/l) LINK -1 ("
;
REMOVE:5578U (/"aalap"\ Gram/TV\ TIR/l) IF (0 (/"aalater"\ Gram/TV/l));#.. tapersersuisut napparsimmaviup silataaniittut tassani AALATERIFFIGALUGIT.
REMOVE:5578V Imp + Gram/ImpPos IF (0 Imp - Gram/ImpPos); #Aamma ATUARUK Canadap inuisa 20.000-t missaat orpippassuit ikuallannerini qimagussorneqartariaqartut
REMOVE:5578W ("ilar") IF (0 ("ilaler") LINK NEGATE *0 ("allu") OR ("alluaq"));

# Enkelte derivativer
REMOVE:Int0401 IR + Der/nv IF (0 V + Der/vv OR ("ila")) ; #'ilaarpaa' ikke 'ila+IR'
Expand Down
4 changes: 2 additions & 2 deletions src/cg3/functions.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -4865,9 +4865,9 @@ MAP:M0411F @ADVL>N TARGET Sem/Geo + Abl IF (*1 SPATIAL + Trm BARRIER (*) - Rel L

MAP:M0411G @ADVL>N TARGET SPATIAL + Lok IF (*1 <inst> BARRIER (*) - PROP) ;

MAP:M0411H @ADVL>N TARGET (Lok) IF (1 ("ila") - AFFINGERET) (NEGATE 0 (TIME)) ; #Toqutaasuni ilaat sakkutuujunngitsut Sermitsiaq allaaserisaqarpoq.
#MAP:M0411H @ADVL>N TARGET (Lok) IF (1 ("ila") - AFFINGERET) (NEGATE 0 (TIME)) ; #Toqutaasuni ilaat sakkutuujunngitsut Sermitsiaq allaaserisaqarpoq.

MAP:M0411I @ADVL>N TARGET (Ins) IF (1 INDERIVERENDE_SUBSTANTIV) (0 (/TAQ\ Der/nn\ LIK\ Der/nn\ N\ Ins__/l)) ;
#MAP:M0411I @ADVL>N TARGET (Ins) IF (1 INDERIVERENDE_SUBSTANTIV) (0 (/TAQ\ Der/nn\ LIK\ Der/nn\ N\ Ins__/l)) ;

#Specifikke ord
MAP:M0414 @HNOUN TARGET ("isikkivik") IF (NEGATE *1 V BARRIER KOMMA) ; #måske mere konstaterende end udbrudsagtigt, derfor ikke EXCLM. #Manu aananilu illuaqqami aataap qangangaatsiarli sanaarisimasaani nerriviusannguaq nerriviliullugu issiapput, mannalu isikkivik.
Expand Down
9 changes: 6 additions & 3 deletions src/fst/affixes/derivations-inflections.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -28909,6 +28909,8 @@ LEXICON IV_voq2 !!= * @CODE@ skal få 200 medl.
+NAR+Der/vv+NNGIT+Der/vv+VIP+Der/vv:%>nanngivip IV-mod_iC ;
+NAR+Der/vv+PALUP+Der/vv+TIGE+Der/vv:%>narpalutsigig flex-iv_schwa ;
+NAR+Der/vv+PALUP+Der/vv+TIGE+Der/vv+GALUAR+Der/vv:%>narpalutsigigaluar IV-mod_C ;
+NAR+Der/vv+PASIP+Der/vv:%>narpasip IV-mod_C ;
+NAR+Der/vv+PASIP+Der/vv+NGAAR+Der/vv:%>narpasingaar IV-mod_C ;
+NAR+Der/vv+QE+Der/vv:%>na%TRUNCq IV-mod_qe ;
+NAR+Der/vv+QQAJAR+Der/vv:%>naqqajar IV-mod_C ;
+NAR+Der/vv+QQAJAR+Der/vv+QE+Der/vv:%>naqqaja%TRUNCq IV-mod_qe ;
Expand Down Expand Up @@ -31544,6 +31546,7 @@ LEXICON XIi_voqXmorf2 !!= * @CODE@
!+GIARTUR+Der/vv+SIMA+Der/vv+GALUAR+Der/vv:%>g3iartorsimagaluar Gaq ; !liv 170308 Kan ikke gå til transitivt katalog
+GIARTUR+Der/vv+SIMA+Der/vv+NNGIT+Der/vv:%>g3iartorsimanngi IV-mod_nngit ;
+GIARTUR+Der/vv+SINNAA+Der/vv:%>g3iartorsinnaa IV-mod_V ;
+GIARTUR+Der/vv+SINNAA+Der/vv+NNGIT+Der/vv:%>g3iartorsinnaanngi IV-mod_nngit ;
+GIARTUR+Der/vv+SINNAA+Der/vv+SSA+Der/vv:%>g3iartorsinnaassa IV-mod_ssa ;
+GIARTUR+Der/vv+SSA+Der/vv:%>g3iartussa IV-mod_ssa ;
+GIARTUR+Der/vv+SSA+Der/vv+NIR+Der/vv:%>g3iartussaner XIiX_fleksiver ;
Expand Down Expand Up @@ -65609,7 +65612,7 @@ LEXICON TV !!= * @CODE@ Forudsættes tagget via HTR
+LIR+Der/vv+NIAR+Der/vv:%>%TRUNClerniar Gaq ;
+LIR+Der/vv+NIAR+Der/vv+SSA+Der/vv:%>%TRUNClerniassa TV-mod_ssa ;
+LIR+Der/vv+NIKUU+Der/vv:%>%TRUNClernikuu Saq ;
!+LIR+Der/vv+NIR+Der/vv:%>%TRUNClerner flex-tv_fleksiver ;
+LIR+Der/vv+NIQAR+Der/vv:%>%TRUNClerneqar IV_r ;
+LIR+Der/vv+NNGIT+Der/vv:%>%TRUNClinngi nngisaq ;
!+LIR+Der/vv+NNGIT+Der/vv+NIR+Der/vv:%>%TRUNClinnginner flex-tv_fleksiver ;
+LIR+Der/vv+NNGUATSIAR+Der/vv:%>%TRUNClinnguatsiar Gaq ;
Expand Down Expand Up @@ -115593,7 +115596,8 @@ LEXICON tup !!= * @CODE@
+N+Rel+Pl+1SgPoss+Orth/Alt:%>ma K_plur ;
+N+Rel+Pl+2SgPoss:%>%TRUNCvit K_plur ; !tup
+N+Rel+Pl+3SgPoss:%>isa K_plur ; !tup
+N+Rel+Pl+4SgPoss:%>%TRUNCmi K_plur ; !tup
+N+Rel+Pl+4SgPoss:%>%TRUNCmi K_plur ; !PL20230830 truncativ vs. additiv sandhi ikke længere produktiv adskillelse af Sg og Pl i Rel
+N+Rel+Pl+4SgPoss:%>mi K_plur ; !tup
+N+Rel+Sg+1PlPoss:%>%TRUNCtta Krestr ; !tup
+N+Rel+Sg+2PlPoss:%>%TRUNCssi Krestr ; !tup
+N+Rel+Sg+3PlPoss:%>ata Krestr ; !tup
Expand Down Expand Up @@ -119849,7 +119853,6 @@ LEXICON nngisaqP !!= * @CODE@ passivt nomen af transitive pluralis tantum stamm

LEXICON HTR_V_SAQ_nnip !!= * @CODE@ 20100630 vokalstammer som asavaa med HTR på NNIP (asannippoq, takunnippoq)
+Gram/TV: TV_vaa ;
! flex-tv_vaa ;
+Gram/TV+HTR+Der/vv:%>nnip IV_k_stem ;
+Gram/TV+HTR+Der/vv+NIQ_AJUR+Der/vv:%>nninneq% ajor flex-iv ;
+Gram/TV+TAQ+Der/vn:%>saq Z1Zmorf ;
Expand Down
7 changes: 4 additions & 3 deletions src/fst/stems/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -14042,7 +14042,7 @@ parngup HTR_UTE_SSAQ_ssi ;
parngup XIuteXmorf ;
parngutige:parngutig HTR_schwa_SAQ_nnip ;
!parngutiinnar IV_r_stem ;
parngutivip XIiXmorf_stem ;
!parngutivip XIiXmorf_stem ;
parninnar IV_r_stem ;
parninnartip HTR_C_TAQ_tsi ;
parni HTR_i_SAQ_si ;
Expand All @@ -14051,7 +14051,7 @@ parnup HTR_UTE_SSAQ_ssi ;
parnup IV_k_stem ;
parnutige:parnutig HTR_schwa_SAQ_nnip ;
!parnutiinnar IV_r_stem ;
parnutivip XIiXmorf_stem ;
!parnutivip XIiXmorf_stem ;
parnaar IV_long_stem ;
parnaar HTR_longV_GAQ_addi ;
parnaar+TUR+Der/vv:parnaarsor HTR_r_GAQ_i ;
Expand Down Expand Up @@ -20947,7 +20947,6 @@ sugup XIuteXmorf ;
sugaa+Gram/IV+GI+Der/vv:sugaag XIgujoqX ;
suge:sug HTR_schwa_SAQ_nnip ;
su su_flex-iv_voq ;
su su_flex-tv_vaa ;
su+Gram/IV+GUSUP+Der/vv:sorusup IV_k_stem ;
su+Gram/IV+INNAR+Der/vv:suinnar IV_r ;
su+RIAR+Der/vv:soriar IV_r ;
Expand All @@ -20957,6 +20956,8 @@ su+Gram/IV+SINNAA+Der/vv+NNGIT+Der/vv:susinnaanngi IV-mod_nngit ;
su+Gram/IV+SINNAA+Der/vv+NNGIT+Der/vv:susinnaanngi TV-mod_nngit ;
su+Gram/IV+SINNAA+Der/vv+NNGIT+Der/vv+GALLAR+Der/vv:susinnaanngikkallar IV-mod_gallar ;
su+Gram/IV+SIMA+Der/vv:susima IV_voq_stem ;
su su_flex-tv_vaa ;
su+Gram/TV+NIQAR+Der/vv:suneqar IV_r ;
suialaar IV_long_stem ;
suiikkutar:suiikkutar HTR_schwa_SAQ_nnip ;
suilatsi XIi_voqXmorf_stem ;
Expand Down

0 comments on commit 52c810d

Please sign in to comment.