diff --git a/src/fst/morphology/affixes/derivations-inflections.lexc b/src/fst/morphology/affixes/derivations-inflections.lexc index bb5bf6d58..e3adf02a8 100644 --- a/src/fst/morphology/affixes/derivations-inflections.lexc +++ b/src/fst/morphology/affixes/derivations-inflections.lexc @@ -43875,7 +43875,7 @@ LEXICON XItX2 !!= * @CODE@ LEXICON XIitX_stem !!= * @CODE@ type katerippoq og alt på TIP +Gram/IV: XIitX2 ; -+Gram/IV+V+Ind+Gram/Exclm:%>%TRUNCk K ; ++Gram/IV+V+Ind+Gram/Exclm+Use/-Spell:%>%TRUNCk K ; flex-iv ; LEXICON XIitX !!= * @CODE@ @@ -97039,68 +97039,68 @@ LEXICON flex-tv_ssa2 !!= * @CODE@ +TUQ@C.Num@+Der/vn+N+Aeq+Sg:%>sutut@C.Num@ K ; !til de særlige tut ippaa-former !tilføjet livm 20170505 +TUQ@C.Num@+Der/vn+N+Aeq+Sg+IP+Orth/Alt:%>sutut-ip@C.Num@ flex-tv ; !til de særlige tut ippaa-former +V+Ind+1Sg+2SgO:%>vakkit K_VOK ; !flex-tv_vaa -+V+Ind+1Sg+2SgO+Orth/Alt:%>%VTRUNCuakkit K_VOK ; !flex-tv_vaa -+V+Ind+1Sg+2SgO+Orth/Alt:%>vagit K_VOK ; !flex-tv_vaa -+V+Ind+1Sg+2SgO+Orth/Alt:%>%VTRUNCuagit K_VOK ; !flex-tv_vaa ++V+Ind+1Sg+2SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuakkit K_VOK ; !flex-tv_vaa ++V+Ind+1Sg+2SgO+Orth/Alt+Use/-Spell:%>vagit K_VOK ; !flex-tv_vaa ++V+Ind+1Sg+2SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuagit K_VOK ; !flex-tv_vaa +V+Ind+1Sg+3SgO:%>vara K ; !flex-tv_vaa -+V+Ind+1Sg+3SgO+Orth/Alt:%>%VTRUNCuara K ; !flex-tv_vaa ++V+Ind+1Sg+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuara K ; !flex-tv_vaa +V+Ind+1Sg+2PlO:%>vassi K_plur ; !flex-tv_vaa -+V+Ind+1Sg+2PlO+Orth/Alt:%>%VTRUNCuassi K_plur ; !flex-tv_vaa ++V+Ind+1Sg+2PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuassi K_plur ; !flex-tv_vaa +V+Ind+1Sg+3PlO:%>vakka K_plur ; !flex-tv_vaa -+V+Ind+1Sg+3PlO+Orth/Alt:%>%VTRUNCuakka K_plur ; !flex-tv_vaa ++V+Ind+1Sg+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuakka K_plur ; !flex-tv_vaa +V+Ind+2Sg+1SgO:%>varma K ; !flex-tv_vaa -+V+Ind+2Sg+1SgO+Orth/Alt:%>%VTRUNCuarma K ; !flex-tv_vaa ++V+Ind+2Sg+1SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuarma K ; !flex-tv_vaa +V+Ind+2Sg+3SgO:%>vat K ; !flex-tv_vaa -+V+Ind+2Sg+3SgO+Orth/Alt:%>%VTRUNCuat K ; !flex-tv_vaa ++V+Ind+2Sg+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuat K ; !flex-tv_vaa +V+Ind+2Sg+1PlO:%>vatsigut K_plur ; !flex-tv_vaa -+V+Ind+2Sg+1PlO+Orth/Alt:%>%VTRUNCuatsigut K_plur ; !flex-tv_vaa ++V+Ind+2Sg+1PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuatsigut K_plur ; !flex-tv_vaa +V+Ind+2Sg+3PlO:%>vatit K_plur ; !flex-tv_vaa -+V+Ind+2Sg+3PlO+Orth/Alt:%>%VTRUNCuatit K_plur ; !flex-tv_vaa ++V+Ind+2Sg+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuatit K_plur ; !flex-tv_vaa +V+Ind+3Sg+1SgO:%>vaanga K ; !flex-tv_vaa -+V+Ind+3Sg+1SgO+Orth/Alt:%>%VTRUNCuaanga K ; !flex-tv_vaa ++V+Ind+3Sg+1SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaanga K ; !flex-tv_vaa +V+Ind+3Sg+2SgO:%>vaatit K ; !flex-tv_vaa -+V+Ind+3Sg+2SgO+Orth/Alt:%>%VTRUNCuaatit K ; !flex-tv_vaa ++V+Ind+3Sg+2SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaatit K ; !flex-tv_vaa +V+Ind+3Sg+3SgO:%>vaa K ; !flex-tv_vaa -+V+Ind+3Sg+3SgO+Orth/Alt:%>%VTRUNCuaa K ; !flex-tv_vaa ++V+Ind+3Sg+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaa K ; !flex-tv_vaa +V+Ind+3Sg+4SgO+Orth/Arch:%>vaani K ; +V+Ind+3Sg+1PlO:%>vaatigut K_plur ; !flex-tv_vaa -+V+Ind+3Sg+1PlO+Orth/Alt:%>%VTRUNCuaatigut K_plur ; !flex-tv_vaa ++V+Ind+3Sg+1PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuaatigut K_plur ; !flex-tv_vaa +V+Ind+3Sg+2PlO:%>vaasi K_plur ; !flex-tv_vaa -+V+Ind+3Sg+2PlO+Orth/Alt:%>%VTRUNCuaasi K_plur ; !flex-tv_vaa ++V+Ind+3Sg+2PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuaasi K_plur ; !flex-tv_vaa +V+Ind+3Sg+3PlO:%>vai K_plur ; !flex-tv_vaa -+V+Ind+3Sg+3PlO+Orth/Alt:%>%VTRUNCuai K_plur ; !flex-tv_vaa ++V+Ind+3Sg+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuai K_plur ; !flex-tv_vaa +V+Ind+1Pl+2SgO:%>vatsigit K ; !flex-tv_vaa -+V+Ind+1Pl+2SgO+Orth/Alt:%>%VTRUNCuatsigit K ; !flex-tv_vaa ++V+Ind+1Pl+2SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuatsigit K ; !flex-tv_vaa +V+Ind+1Pl+3SgO:%>varput K ; !flex-tv_vaa -+V+Ind+1Pl+3SgO+Orth/Alt:%>%VTRUNCuarput K ; !flex-tv_vaa ++V+Ind+1Pl+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuarput K ; !flex-tv_vaa +V+Ind+1Pl+2PlO:%>vassi K_plur ; !flex-tv_vaa -+V+Ind+1Pl+2PlO+Orth/Alt:%>%VTRUNCuassi K_plur ; !flex-tv_vaa ++V+Ind+1Pl+2PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuassi K_plur ; !flex-tv_vaa +V+Ind+1Pl+3PlO:%>vavut K_plur ; !flex-tv_vaa -+V+Ind+1Pl+3PlO+Orth/Alt:%>%VTRUNCuavut K_plur ; !flex-tv_vaa ++V+Ind+1Pl+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuavut K_plur ; !flex-tv_vaa +V+Ind+1Pl+3PlO:%>vagut K_plur ; !flex-tv_vaa -+V+Ind+1Pl+3PlO+Orth/Alt:%>%VTRUNCuagut K_plur ; !flex-tv_vaa ++V+Ind+1Pl+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuagut K_plur ; !flex-tv_vaa +V+Ind+2Pl+1SgO:%>vassinga K ; !flex-tv_vaa -+V+Ind+2Pl+1SgO+Orth/Alt:%>%VTRUNCuassinga K ; !flex-tv_vaa ++V+Ind+2Pl+1SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuassinga K ; !flex-tv_vaa +V+Ind+2Pl+3SgO:%>varsi K ; !flex-tv_vaa -+V+Ind+2Pl+3SgO+Orth/Alt:%>%VTRUNCuarsi K ; !flex-tv_vaa ++V+Ind+2Pl+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuarsi K ; !flex-tv_vaa +V+Ind+2Pl+1PlO:%>vatsigut K_plur ; !flex-tv_vaa -+V+Ind+2Pl+1PlO+Orth/Alt:%>%VTRUNCuatsigut K_plur ; !flex-tv_vaa ++V+Ind+2Pl+1PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuatsigut K_plur ; !flex-tv_vaa +V+Ind+2Pl+3PlO:%>vasi K_plur ; !flex-tv_vaa -+V+Ind+2Pl+3PlO+Orth/Alt:%>%VTRUNCuasi K_plur ; !flex-tv_vaa ++V+Ind+2Pl+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuasi K_plur ; !flex-tv_vaa +V+Ind+3Pl+1SgO:%>vaannga K ; !flex-tv_vaa -+V+Ind+3Pl+1SgO+Orth/Alt:%>%VTRUNCuaannga K ; !flex-tv_vaa ++V+Ind+3Pl+1SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaannga K ; !flex-tv_vaa +V+Ind+3Pl+2SgO:%>vaatsit K ; !flex-tv_vaa -+V+Ind+3Pl+2SgO+Orth/Alt:%>%VTRUNCuaatsit K ; !flex-tv_vaa ++V+Ind+3Pl+2SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaatsit K ; !flex-tv_vaa +V+Ind+3Pl+3SgO:%>vaat K ; !flex-tv_vaa -+V+Ind+3Pl+3SgO+Orth/Alt:%>%VTRUNCuaat K ; !flex-tv_vaa ++V+Ind+3Pl+3SgO+Orth/Alt+Use/-Spell:%>%VTRUNCuaat K ; !flex-tv_vaa +V+Ind+3Pl+1PlO:%>vaatigut K_plur ; !flex-tv_vaa -+V+Ind+3Pl+1PlO+Orth/Alt:%>%VTRUNCuaatigut K_plur ; !flex-tv_vaa ++V+Ind+3Pl+1PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuaatigut K_plur ; !flex-tv_vaa +V+Ind+3Pl+2PlO:%>vaasi K_plur ; !flex-tv_vaa -+V+Ind+3Pl+2PlO+Orth/Alt:%>%VTRUNCuaasi K_plur ; !flex-tv_vaa ++V+Ind+3Pl+2PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuaasi K_plur ; !flex-tv_vaa +V+Ind+3Pl+3PlO:%>vaat K_plur ; !flex-tv_vaa -+V+Ind+3Pl+3PlO+Orth/Alt:%>%VTRUNCuaat K_plur ; !flex-tv_vaa ++V+Ind+3Pl+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuaat K_plur ; !flex-tv_vaa +V+Ind+3Pl+3PlO+Orth/Alt:%>vai K_plur ; !flex-tv_vaa -+V+Ind+3Pl+3PlO+Orth/Alt:%>%VTRUNCuai K_plur ; !flex-tv_vaa ++V+Ind+3Pl+3PlO+Orth/Alt+Use/-Spell:%>%VTRUNCuai K_plur ; !flex-tv_vaa +V+Int+2Sg+1SgO:%>vinga K ; !flex-tv_vaa +V+Int+2Sg+3SgO:%>viuk K ; !flex-tv_vaa +V+Int+2Sg+1PlO:%>visigut K_plur ; !flex-tv_vaa diff --git a/src/fst/morphology/stems/nouns.lexc b/src/fst/morphology/stems/nouns.lexc index 5dd1476a3..eb24345ac 100644 --- a/src/fst/morphology/stems/nouns.lexc +++ b/src/fst/morphology/stems/nouns.lexc @@ -8494,6 +8494,7 @@ novembari+N+Abs+Sg+Err/Sub+Orth/Arch:nuvimberi Z1VZmorf ; !liv 170405 PL20170407 novembari+N+Abs+Sg+Err/Sub+Orth/Arch:nuvimpari Z1VZmorf ; !liv 170403 der mangler en regel for at 'v' ikke skal forsvinde her. PL20170407 done! novembari+N+Abs+Sg+Err/Sub+Orth/Arch:nuvimperi Z1VZmorf ; !liv 170405 PL20170407 done! november+N+Abs+Sg:november Krestr ; !ved dateringer +normu+N+Abs+Sg+Err/Sub:nr'mu # ; nuaarsaat tptmorf ; nuaarsarfik Z2-Zmorf ; nuak Z2-Zmorf ; diff --git a/test/data/typos.txt b/test/data/typos.txt index 9ce7d5201..c42d873b9 100644 --- a/test/data/typos.txt +++ b/test/data/typos.txt @@ -505,4 +505,13 @@ atinngortiterusullunga atinngortitserusullunga akuerineqarsinnaasasoq akuerineqarsinnaassasoq atsiukkusukkakkut atsiukkusukkakku ajuerisassatut akuerisassatut -Tunngavilersuutingineqarneri Tunngavilersuutigineqarneri \ No newline at end of file +Tunngavilersuutingineqarneri Tunngavilersuutigineqarneri +iperartsippallattarneri iperartippallattarneri +tusaasaleraagakkit tusaasaleraangakkit +assingiinngittut assigiinngitsut +sammiumaassangaat sammiumassagaat +angunniunnerit anngunniunnerit +sukkanniunnerit sukkaniunnerit +nr’mu normu +Saqqamiik Saqqamiit +Inuutilluga Inuutillunga \ No newline at end of file diff --git a/tools/grammarcheckers/errors.source.xml b/tools/grammarcheckers/errors.source.xml index b3ada1fb8..872b5fbbc 100644 --- a/tools/grammarcheckers/errors.source.xml +++ b/tools/grammarcheckers/errors.source.xml @@ -128,6 +128,19 @@ Taggit "$2" ilaliussartaalu "$1" ataasersiutaassapput, "$4" ataasersiutaatillugu + + +
+ Missing suffix and Wrong inflection + Manglende suffiks og forkert bøjning + Uiguummik amigaateqarpoq naaneralu ajorluni +
+ + When the object of a transitive verb, here "$8" is in plural, there has to be added a suffix added and the inflection changed in the verb "$8" + + Oqaluutip susallip susaa "$2" kinaassusersiutit pingajuanni qasseersiutaatillugu oqaluut "$1" uiguuserneqarlunilu naleqquttumik naanilerneqassaaq + +
@@ -136,7 +149,7 @@ Sapaatip akunnerata ullua taggisaassaaq allamoorummik naanilik
- The word that designates a weekday "$1" should be a noun in relative case, when it modifies a possessed noun "2" + The word that designates a weekday "$1" should be a noun in relative case, when it modifies a possessed noun "$2" Ordet, der betegner en ugedag skal være et nomen i relativ kasus, når det er adled til et nomen med possessormarkering Oqaaseq sapaatip akunnerata ulluanut tunngasoq "$1" taggisaassaaq allamoorummik naanilik, taggimmut pigisamut imaattumut "$2" ilaliussaaguni diff --git a/tools/grammarcheckers/grammarchecker.cg3 b/tools/grammarcheckers/grammarchecker.cg3 index 4d73035b5..88b96e48b 100644 --- a/tools/grammarcheckers/grammarchecker.cg3 +++ b/tools/grammarcheckers/grammarchecker.cg3 @@ -235,6 +235,15 @@ COPY (1Pl 3SgO &SUGGEST) EXCEPT (2Pl 1PlO &msyn-con-2Pl1Pl0-1Pl3SgO) TARGET &msy ### agreement ### ADD:msyn-obj-marking-abs-3PlO &msyn-obj-marking-abs-3PlO TARGET (HTR Der/vv Gram/IV) IF (*-1 Abs BARRIER (*) - Abs LINK *-1 Rel BARRIER (*) - Rel); +#CASE, PERSON, NUMBER +WITH (1Sg 2SgO) + Opt +(-1 Pron + Abs + Pl) +{ +ADD:msyn-Opt-1Sg-2SgO &msyn-Opt-1Sg-2SgO (*) ; +COPY (LAAR Der/vv Gram/TV V Imp 2Sg 3PlO &SUGGEST) EXCEPT (V Opt 1Sg 2SgO &msyn-Opt-1Sg-2SgO) (*) ; +ADDRELATION ($2 LEFT) (_C1_) TO (1 &msyn-Opt-1Sg-2SgO) ; +} ; +# [takulakkit -> takulaakkit] Immaqa to pillugu ilitsersuummik allassimasoqanngilaq, kisianni uku takulakkit. #FEJL #ilinniartitsisup meeqqat ilinniartitsivoq REL ABS HTR diff --git a/tools/grammarcheckers/liststemplates.cg3 b/tools/grammarcheckers/liststemplates.cg3 index a126f08b7..760f5bd46 100644 --- a/tools/grammarcheckers/liststemplates.cg3 +++ b/tools/grammarcheckers/liststemplates.cg3 @@ -40,6 +40,7 @@ LIST-TAGS += &syn-abs-wordorder #!!= - @CODE@ &syn-TUQ-wordorder #!!= - @CODE@ &ADDED #!!= - @CODE@ + &msyn-Opt-1Sg-2SgO #!!= - @CODE@ &msyn-personalname-Pl-Sg #!!= - @CODE@ co&msyn-personalname-Pl-Sg #!!= - @CODE@ #!!= - @CODE@ diff --git a/tools/spellcheckers/strings.default.txt b/tools/spellcheckers/strings.default.txt index de5d80d97..e0af44bf2 100644 --- a/tools/spellcheckers/strings.default.txt +++ b/tools/spellcheckers/strings.default.txt @@ -1,27 +1,27 @@ # Add your error:correct string pairs here (not complete words, they have # a separate file), followed by TAB and the weight for the edit operation: +#disse er for generelle og gør det bare ustyrligt +#aa:a 8 +#ee:e 8 +#ff:f 8 +#ii:i 8 +#kk:k 6 +#ll:l 7 +#nn:n 6 +#oo:o 8 +#qq:q 5 +#ss:s 6 -aa:a 8 -ee:e 8 -ff:f 8 -ii:i 8 -kk:k 6 -ll:l 7 -nn:n 6 -oo:o 8 -qq:q 5 -ss:s 6 - -a:aa 6 -g:q 5 -i:ii 6 -k:kk 6 -m:mm 6 -##n:nn 6 giver forkerte forslag -s:ss 5 -t:tt 8 -u:uu 7 +#a:aa 6 +#g:q 5 +#i:ii 6 +#k:kk 6 +#m:mm 6 +#n:nn 6 giver forkerte forslag +#s:ss 5 +#t:tt 8 +#u:uu 7 s:rs 4 @@ -29,8 +29,9 @@ s:rs 4 -mi:mi 8 -pput:-upput 8 -agguts:aggust 7 +aaja:aava 8 aarma:ama 8 +agguts:aggust 7 ajoqqus:ajoqus 3 ajuer:akuer 8 ane:anne 3 @@ -58,6 +59,7 @@ isss:iss 8 itu:ittu 7 iuliu:iliu 8 iussa:iutissa 5 +iussin:iuussin 6 laak:lak 8 lalalit:laallit 8 skotlanmi:Skotlandimi 8 @@ -78,6 +80,7 @@ eratik:ernatik 3 ngersersuu:ngersuu 8 qqisa:qqissa 3 rissat:riat 5 +rtsi:rti 9 sa:ssa 8 sis:siis 5 sitsut:sitsisut 4