Skip to content

Commit

Permalink
Tilføjelse af Gram/Ord
Browse files Browse the repository at this point in the history
  • Loading branch information
@planggard
planggard committed Mar 6, 2025
1 parent 2ee8750 commit 87c17c2
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 30 deletions.
2 changes: 2 additions & 0 deletions src/cg3/dependency.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7794,6 +7794,8 @@ TO (1 Num + Abs - @N<);

SETPARENT:M0408Dnum @>N + Num + Gram/Ord IF
(NOT p (*))
(NEGATE 0 Abl LINK 1 MAANED LINK *1 ("tunge" Trm) BARRIER (*) - Rel) #Marsip ulluisa 28-ANNIT apriilip ulluisa 15-iata tungaanut sulissaanga.

TO (*1 MAANED BARRIER (*) - Num - ("tunge")) ; #15 må ikke gå til 20. her: Nalunaaquttap aasaanerani siuartinneqartarnera pisarpoq Namminersorlutik Oqartussat nalunaarutaat nr.15 20. oktober 2009-meersoq najoqqutaralugu.

#MAP:M0408Enum @i->N TARGET Num IF (1 iNum + NUMCOMP) ;
Expand Down
4 changes: 4 additions & 0 deletions src/cg3/disambiguator.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2181,6 +2181,8 @@ REMOVE:0001L ("\\p{Lu}.*"r) + Prop IF (0 ("([a-z].*)"r))(**0CW (VSTR:"$1"r))(-1
(NEGATE 0 NATIONALITY LINK *1 POSSESSUM3 + Prop BARRIER VFIN) #Kalaallit utRøde Korsiat
(NEGATE 0 ("Qinngorput" Prop) LINK 1 Prop)
(NEGATE 0 (Sem/Geo Prop) LINK 0 N - Sem/Geo)#Naalakkersuisoq: NUUMMI nutaanik killilersuisoqassanngilaq – misissuisarfilli nuunneqassaaq
(NEGATE 0 Ins link 1 ("ateq")) #ILANNAMIK ateqarpoq
(NEGATE 0 Sem/Hum + KKUT + OBLIQUE)# Ilannakkunnukarpoq
;

REMOVE:0001M N + Abs - NÆPPE_FIRSTNAME IF (0 Prop + Sem/Hum LINK -1 BOS OR DIRTALESTART LINK 2 CLB); #ARSUGAQ, sunaana? Oqariarit taamaaginnarnak!”, anaanaa oqarpoq.
Expand Down Expand Up @@ -4155,6 +4157,8 @@ REMOVE:0001C ("\\p{Lu}.*"r) + Prop IF (0 ("([a-z].*)"r))(**0CW (VSTR:"$1"r))(-1
(NEGATE 0 ("Nuna") + 1PlPoss) #vælg den med lille begyndelsesbogstav hvis den samme findes med lille begyndelsesbogstav i nærheden, men må ikke slette Nunarput
(NEGATE 0 NATIONALITY LINK *1 POSSESSUM3 + Prop BARRIER VFIN) #Kalaallit Røde Korsiat
(NEGATE 0 ("Qinngorput") LINK 1 Prop)
(NEGATE 0 Sem/Hum + KKUT + OBLIQUE)# Ilannakkunnukarpoq

;

REMOVE:0001D ("Arnaq" Prop Rel) OR ("Arnaĸ" Prop Rel) IF (-1 BOS)(0 ("arnaq" N Rel) LINK *1 (/U\ Der/nv\ Gram/IV\ NIQ\ Der/vn\ SSAQ\ Der/nn\ N\ Abs\ Sg\ 3SgPoss/l) BARRIER 3SgPoss); #ARNAP nunarsuarmi Qaammammut siulliulluni nunnittup USA-meersuunissaa siunniukkitsik, taassuma ilanngullugu erseqqissaatigaa:
Expand Down
5 changes: 3 additions & 2 deletions src/cg3/functions.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5791,8 +5791,9 @@ MAP:M0408Anum @>N TARGET NUMHOVED - Trm IF (1 Num + Abs - @N<)

MAP:M0408Cnum @>N TARGET Num + Abs - ("ataaseq") IF (1 Num - Gram/Ord - CONJ-C OR ("[0123456789]{4}"r) - Gram/Ord) ; #15 må ikke gå til 20. her: Nalunaaquttap aasaanerani siuartinneqartarnera pisarpoq Namminersorlutik Oqartussat nalunaarutaat nr.15 20. oktober 2009-meersoq najoqqutaralugu.

MAP:M0408Dnum @>N TARGET Num + Gram/Ord IF (*1 MAANED BARRIER (*) - Num - ("tunge")) ; #15 må ikke gå til 20. her: Nalunaaquttap aasaanerani siuartinneqartarnera pisarpoq Namminersorlutik Oqartussat nalunaarutaat nr.15 20. oktober 2009-meersoq najoqqutaralugu.

MAP:M0408Dnum @>N TARGET Num + Gram/Ord IF (*1 MAANED BARRIER (*) - Num - ("tunge")) #15 må ikke gå til 20. her: Nalunaaquttap aasaanerani siuartinneqartarnera pisarpoq Namminersorlutik Oqartussat nalunaarutaat nr.15 20. oktober 2009-meersoq najoqqutaralugu.
(NEGATE 0 Abl LINK 1 MAANED LINK *1 ("tunge" Trm) BARRIER (*) - Rel) #Marsip ulluisa 28-ANNIT apriilip ulluisa 15-iata tungaanut sulissaanga.
;
MAP:M0408Enum @i->N TARGET Num IF (1 iNum + NUMCOMP)
(NEGATE 0 $$KASUS LINK *-1 $$KASUS - Num)#Ilinnullu uanga terianniaavunga, teriannissat allat HUNNORUJUT tuusintillillu assingat.
;
Expand Down
48 changes: 28 additions & 20 deletions src/fst/morphology/affixes/numerals.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ LEXICON num_C
+Err/Sub+Num+Abs+Pl:%>-t Krestr ; !!= - **@CODE@**
+Num+Abs+Sg+3SgPoss:%>-ia Krestr ; !!= - **@CODE@**
+Err/Sub+Num+Abs+Sg+3SgPoss:%>-a Krestr ; !!= - **@CODE@**
+Num+Abs+Sg+3PlPoss:%>-iat Krestr ;
+Err/Sub+Num+Abs+Sg+3PlPoss:%>-at Krestr ; !1-at
+Num+Gram/Ord+Abs+Sg+3PlPoss:%>-iat Krestr ;
+Err/Sub+Num+Gram/Ord+Abs+Sg+3PlPoss:%>-at Krestr ; !1-at
+Num+Abs+Pl+3SgPoss:%>-ii K_plur ;
!+Err/Sub+Num+Abs+Pl+3SgPoss:%>-i K_plur ;
+Num+Abs+Pl+3PlPoss:%>-ii K_plur ;
Expand All @@ -29,8 +29,8 @@ LEXICON num_C
+Err/Sub+Num+Rel+Pl:%>-t Krestr ;
+Num+Rel+Sg+3SgPoss:%>-iata Krestr ;
+Err/Sub+Num+Rel+Sg+3SgPoss:%>-ata Krestr ;
+Num+Rel+Sg+3PlPoss:%>-iata Krestr ;
+Err/Sub+Num+Rel+Sg+3PlPoss:%>-ata Krestr ;
+Num+Gram/Ord+Rel+Sg+3PlPoss:%>-iata Krestr ;
+Err/Sub+Num+Gram/Ord+Rel+Sg+3PlPoss:%>-ata Krestr ;
+Num+Rel+Pl+3SgPoss:%>-iisa K_plur ;
+Err/Sub+Num+Rel+Pl+3SgPoss:%>-isa K_plur ;
+Num+Rel+Pl+3PlPoss:%>-iisa K_plur ;
Expand All @@ -41,8 +41,8 @@ LEXICON num_C
+Err/Sub+Num+Lok+Pl:%>-ni LokVb ;
+Num+Lok+Sg+3SgPoss:%>-iani LokVb ;
+Err/Sub+Num+Lok+Sg+3SgPoss:%>-ani LokVb ;
+Num+Lok+Sg+3PlPoss:%>-ianni LokVb ;
+Err/Sub+Num+Lok+Sg+3PlPoss:%>-anni LokVb ; !1-anni
+Num+Gram/Ord+Lok+Sg+3PlPoss:%>-ianni LokVb ;
+Err/Sub+Num+Gram/Ord+Lok+Sg+3PlPoss:%>-anni LokVb ; !1-anni
+Num+Lok+Pl+3SgPoss:%>-iini LokVb ;
+Err/Sub+Num+Lok+Pl+3SgPoss:%>-ini LokVb ;
+Num+Lok+Pl+3PlPoss:%>-iini LokVb ;
Expand All @@ -57,8 +57,8 @@ LEXICON num_C
+Err/Sub+Num+Trm+Pl:%>-nut TrmVb ;
+Num+Trm+Sg+3SgPoss:%>-ianut TrmVb ;
+Err/Sub+Num+Trm+Sg+3SgPoss:%>-anut TrmVb ;
+Num+Trm+Sg+3PlPoss:%>-iannut TrmVb ;
+Err/Sub+Num+Trm+Sg+3PlPoss:%>-annut TrmVb ;
+Num+Gram/Ord+Trm+Sg+3PlPoss:%>-iannut TrmVb ;
+Err/Sub+Num+Gram/Ord+Trm+Sg+3PlPoss:%>-annut TrmVb ;
+Num+Trm+Pl+3SgPoss:%>-iinut TrmVb ;
+Err/Sub+Num+Trm+Pl+3SgPoss:%>-inut TrmVb ;
+Num+Trm+Pl+3PlPoss:%>-iinut TrmVb ;
Expand All @@ -71,8 +71,10 @@ LEXICON num_C
+Err/Sub+Num+Abl+Pl:%>-nit AblVb ;
+Num+Abl+Sg+3SgPoss:%>-ianit AblVb ;
+Err/Sub+Num+Abl+Sg+3SgPoss:%>-anit AblVb ;
+Num+Abl+Sg+3PlPoss:%>-iannit AblVb ;
+Err/Sub+Num+Abl+Sg+3PlPoss:%>-annit AblVb ;
+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-iannit AblVb ;
+Err/Sub+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-annit AblVb ;
+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-ianniit AblVb ;
+Err/Sub+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-anniit AblVb ;
+Num+Abl+Pl+3SgPoss:%>-iinit AblVb ;
+Err/Sub+Num+Abl+Pl+3SgPoss:%>-init AblVb ;
+Num+Abl+Pl+3PlPoss:%>-iinit AblVb ;
Expand All @@ -81,6 +83,8 @@ LEXICON num_C
+Err/Sub+Num+Aeq+Sg:%>-tut Krestr ;
+Num+Aeq+Pl:%>-itut Krestr ;
+Err/Sub+Num+Aeq+Pl:%>-tut Krestr ;
+Num+Gram/Ord+Aeq+Sg+3PlPoss:%>-iattut AeqVb ;
+Err/Sub+Num+Gram/Ord+Aeq+Sg+3PlPoss:%>-attut AeqVb ;
+Num+Via+Sg:%>-ikkut ZkkutZ ;
+Err/Sub+Num+Via+Sg:%>-kkut ZkkutZ ;
+Num+U+Gram/IV+Der/nv:%>-iu IV_voq ;
Expand Down Expand Up @@ -134,8 +138,8 @@ LEXICON num_V
+Err/Sub+Num+Abs+Pl:%>-it K ; !!= - **@CODE@**
+Num+Abs+Sg+3SgPoss:%>-a Krestr ; !!= - **@CODE@**
+Err/Sub+Num+Abs+Sg+3SgPoss:%>-ia Krestr ; !!= - **@CODE@**
+Num+Abs+Sg+3PlPoss:%>-at Krestr ; !!= - **@CODE@**
+Err/Sub+Num+Abs+Sg+3PlPoss:%>-iat Krestr ; !! - ... osb.
+Num+Gram/Ord+Abs+Sg+3PlPoss:%>-at Krestr ; !!= - **@CODE@**
+Err/Sub+Num+Gram/Ord+Abs+Sg+3PlPoss:%>-iat Krestr ; !! - ... osb.
+Num+Abs+Pl+3SgPoss:%>-i K_plur ;
!+Err/Sub+Num+Abs+Pl+3SgPoss:%>-ii K_plur ;
+Num+Abs+Pl+3PlPoss:%>-i K_plur ;
Expand All @@ -147,8 +151,8 @@ LEXICON num_V
+Err/Sub+Num+Rel+Sg:%>-ip Krestr ;
+Num+Rel+Sg+3SgPoss:%>-ata Krestr ;
+Err/Sub+Num+Rel+Sg+3SgPoss:%>-iata Krestr ;
+Num+Rel+Sg+3PlPoss:%>-ata Krestr ;
+Err/Sub+Num+Rel+Sg+3PlPoss:%>-iata Krestr ;
+Num+Gram/Ord+Rel+Sg+3PlPoss:%>-ata Krestr ;
+Err/Sub+Num+Gram/Ord+Rel+Sg+3PlPoss:%>-iata Krestr ;
+Num+Rel+Pl+3SgPoss:%>-isa K_plur ;
+Err/Sub+Num+Rel+Pl+3SgPoss:%>-iisa K_plur ;
+Num+Rel+Pl+3PlPoss:%>-isa K_plur ;
Expand All @@ -159,8 +163,8 @@ LEXICON num_V
+Err/Sub+Num+Lok+Pl:%>-ini LokVb ;
+Num+Lok+Sg+3SgPoss:%>-ani LokVb ;
+Err/Sub+Num+Lok+Sg+3SgPoss:%>-iani LokVb ;
+Num+Lok+Sg+3PlPoss:%>-anni LokVb ;
+Err/Sub+Num+Lok+Sg+3PlPoss:%>-ianni LokVb ;
+Num+Gram/Ord+Lok+Sg+3PlPoss:%>-anni LokVb ;
+Err/Sub+Num+Gram/Ord+Lok+Sg+3PlPoss:%>-ianni LokVb ;
+Num+Lok+Pl+3SgPoss:%>-ini LokVb ;
+Err/Sub+Num+Lok+Pl+3SgPoss:%>-iini LokVb ;
+Num+Lok+Pl+3PlPoss:%>-ini LokVb ;
Expand All @@ -175,8 +179,8 @@ LEXICON num_V
+Err/Sub+Num+Trm+Pl:%>-inut TrmVb ;
+Num+Trm+Sg+3SgPoss:%>-anut TrmVb ;
+Err/Sub+Num+Trm+Sg+3SgPoss:%>-ianut TrmVb ;
+Num+Trm+Sg+3PlPoss:%>-annut TrmVb ;
+Err/Sub+Num+Trm+Sg+3PlPoss:%>-iannut TrmVb ;
+Num+Gram/Ord+Trm+Sg+3PlPoss:%>-annut TrmVb ;
+Err/Sub+Num+Gram/Ord+Trm+Sg+3PlPoss:%>-iannut TrmVb ;
+Num+Trm+Pl+3SgPoss:%>-inut TrmVb ;
+Err/Sub+Num+Trm+Pl+3SgPoss:%>-iinut TrmVb ;
+Num+Trm+Pl+3PlPoss:%>-inut TrmVb ;
Expand All @@ -193,14 +197,18 @@ LEXICON num_V
+Err/Sub+Num+Abl+Pl:%>-init AblVb ;
+Num+Abl+Sg+3SgPoss:%>-anit AblVb ;
+Err/Sub+Num+Abl+Sg+3SgPoss:%>-ianit AblVb ;
+Num+Abl+Sg+3PlPoss:%>-annit AblVb ;
+Err/Sub+Num+Abl+Sg+3PlPoss:%>-iannit AblVb ;
+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-annit AblVb ;
+Err/Sub+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-iannit AblVb ;
+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-anniit AblVb ;
+Err/Sub+Num+Gram/Ord+Abl+Sg+3PlPoss:%>-ianniit AblVb ;
+Num+Abl+Pl+3SgPoss:%>-init AblVb ;
+Err/Sub+Num+Abl+Pl+3SgPoss:%>-iinit AblVb ;
+Num+Abl+Pl+3PlPoss:%>-init AblVb ;
+Err/Sub+Num+Abl+Pl+3PlPoss:%>-iinit AblVb ;
+Num+Aeq+Sg:%>-tut Krestr ;
+Err/Sub+Num+Aeq+Sg:%>-itut Krestr ;
+Num+Gram/Ord+Aeq+Sg+3PlPoss:%>-attut AeqVb ;
+Err/Sub+Num+Gram/Ord+Aeq+Sg+3PlPoss:%>-iattut AeqVb ;
+Num+Via+Sg:%>-kkut ZkkutZ ;
+Err/Sub+Num+Via+Sg:%>-ikkut ZkkutZ ;
+Num+U+Gram/IV+Der/nv:%>-u IV_voq ;
Expand Down
6 changes: 3 additions & 3 deletions src/fst/morphology/affixes/propernouns.lexc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
! ===================== !
!! # Propriernes morfologi i grønlandsk
! ===================== !
! ====================================== !
!! # Propriernes morfologi i grønlandsk !!
! ====================================== !

!PJAT FO AT FÅ KOMPILERINGEN I GANG

Expand Down
2 changes: 1 addition & 1 deletion src/fst/morphology/stems/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,7 @@ ilalaar+Gram/IV+SSUSIQ+Der/vn+Orth/Arch:ilalaarsuseq SEQgemin ;
ilangaaqqut tptmorf ;
ilangiiuissoq Z1Zmorf ;
ilannaaq Z1Zmorf ;
ilannaq Z2-qZmorf ;
!ilannaq Z2-qZmorf ; !PL20250306 Er vist utænkelig
ilannariik@U.Num.Pl@ Z2-Zmorf ;
ilanngaaqqut tptmorf ;
ilanngaaseriffik Z2-Zmorf ;
Expand Down
11 changes: 8 additions & 3 deletions src/fst/morphology/stems/propernouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5394,6 +5394,7 @@ Hugo:Hugo Z1Mask_ateqZ ;
Huitfeldt Zateq_oqsZmorf ;
Huld:Huld ZFem_oqsZ ;
Hulda:Hulda Z1Fem_ateqZ ;
Humane% Society% of% the% United% States Zateq_oqsZmorf ;
Hume Z1ateqpropZ ;
Hummel Zateq_oqsZmorf ;
Humphrey:Humphrey Z1Mask_ateqZ ;
Expand Down Expand Up @@ -5699,8 +5700,10 @@ Ilaitsunnguaq+Dial/Ngr:Ilaitsunnguaq Z1Fem_nnguaqZ ;
Ilaitsúnguaĸ+Dial/Ngr:Ilaitsúnguaĸ Z1Fem_nnguaqZ ;
Ilaitsúnguaĸ+Dial/Ngr:Ilaitsúnguaĸ Z1Mask_nnguaqZ ;
Ilakujuk+Dial/Vgr:Ilakujuk Z2Mask_kZ ;
Ilanna+Dial/Vgr:Ilanna Z1Fem_GrlateqZ ;
Ilanna:Ilanna Z1Fem_GrlateqZ ;
!Ilanna+Dial/Vgr:Ilanna Z1Fem_GrlateqZ ; !TEST
Ilanna:Ilanna Z1Fem_GrlateqZ ; !TEST
!Ilanna:Ilanna Z1Fem_ateqZ ; !TEST

Ilannguaq+Dial/Vgr:Ilannguaq Z1Mask_nnguaqZ ;
Ilaqutariinnut% Inatsiseqarnermullu% Naalakkersuisoqarfik+Sem/inst:Ilaqutariinnut% Inatsiseqarnermullu% Naalakkersuisoqarfik Z2-ateqZmorf ;
Ilaraattuusaq+Dial/Egr:Ilaraattuusaq Z1Fem_GrlateqZ ;
Expand Down Expand Up @@ -5776,7 +5779,9 @@ Ilta:Ilta Z1Fem_GrlateqZ ;
Ilummaaluk+Dial/Egr:Ilummaaluk Z2Fem_kZ ;
Ilungmâluk+Dial/Egr:Ilungmâluk Z2Fem_kZ ;
Ilva Z1ateqZ ;
Ilána+Dial/Vgr:Ilána Z1Fem_GrlateqZ ;
Ilána+Dial/Vgr:Ilána Z1Fem_GrlateqZ ; !TEST
!Ilána+Dial/Vgr:Ilána Z1Fem_ateqZ ;

Ilánguaĸ+Dial/Vgr:Ilánguaĸ Z1Mask_nnguaqZ ;
Ilâmût:Ilâmût Z1Mask_GrlateqZ ;
Ilíkajípât+Dial/Egr:Ilíkajípât Z1Fem_GrlateqZ ;
Expand Down
2 changes: 1 addition & 1 deletion src/fst/morphology/stems/verbs.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2644,7 +2644,7 @@ eqqiluisaar IV_long ;
eqqiluisaartuu IV_voq ;
eqqiluitsuu IV_voq ;
eqqinip XIiXmorf ;
eqqip XIiXmorf ;
eqqip+Orth/Arch:eqqip XIiXmorf ;
eqqisseqatige:eqqisseqatig HTR_schwa_SAQ_nnip ;
eqqissi+Gram/IV+SAR+Der/vv:eqqissisar IV_r ; !NB: Skal ikke slettes da +SAR og ikke +TAR
eqqissi+Gram/IV+SAR+Der/vv:eqqissisar DOTR_IV_r ; !NB: Skal ikke slettes da +SAR og ikke +TAR
Expand Down

0 comments on commit 87c17c2

Please sign in to comment.