From 2dfe78b709f5a045b8371c647222b06d125fa98f Mon Sep 17 00:00:00 2001 From: Jack Rueter Date: Mon, 11 Nov 2024 13:01:52 +0200 Subject: [PATCH] Derivation for NomAg is not complete Distinctions should be made Add more words from NT 2013 --- src/fst/morphology/affixes/nouns.lexc | 22 +- src/fst/morphology/affixes/verbs.lexc | 217 +++++++++++++----- .../morphology/stems/adjectives_newwords.lexc | 32 ++- src/fst/morphology/stems/nouns.lexc | 4 +- src/fst/morphology/stems/nouns_newwords.lexc | 22 ++ .../stems/propernouns_newwords.lexc | 2 +- src/fst/morphology/stems/verbs.lexc | 6 +- src/fst/morphology/stems/verbs_newwords.lexc | 27 ++- 8 files changed, 255 insertions(+), 77 deletions(-) diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc index b047915f..703d74d4 100644 --- a/src/fst/morphology/affixes/nouns.lexc +++ b/src/fst/morphology/affixes/nouns.lexc @@ -51,8 +51,10 @@ LEXICON N_SANA :%>a PL-ACC-SUF ; :o PL-OBLIQUE ; R ; - + LEXICON N_MARJ + N_0/an/ad/aha/oid ; +LEXICON N_0/an/ad/aha/oid ! _0/an/ad/aha/oid !Sg+Nom/Sg+Gen/Sg+Par/Sg+Ill/Pl+Par @@ -443,6 +445,10 @@ R ; ! xxx check :j PL-OBLIQUE ; LEXICON N_TEGII ! tegii:tegi + N_i/jan/jad/jaha/joid ; +LEXICON N_i/jan/jad/jaha/joid +! _i/jan/jad/jaha/joid +!Sg+Nom/Sg+Gen/Sg+Par/Sg+Ill/Pl+Par !!€gt-norm: Noun ' / ' !!€ : +N+Sg+Nom !!€ n: +N+Sg+Gen @@ -692,11 +698,25 @@ LEXICON N_VEPS :QÄQ1 NMN_ ; LEXICON N_NADO !!= @CODE@ nado:nado + N_o/on/od/oho/oid ; +LEXICON N_o/on/od/oho/oid +! _o/on/od/oho/oid +!Sg+Nom/Sg+Gen/Sg+Par/Sg+Ill/Pl+Par !!€gt-norm: Noun ' wife's sister-in-law/ ' !!€ nado: nado+N+Sg+Nom !!€ nadon: nado+N+Sg+Gen +!!€ nadod: nado+N+Sg+Par +!!€ nadoho: nado+N+Sg+Ill !!€ nadoid: nado+N+Pl+Par !!* Yaml: __nado__ +: SG-NOM-SUF ; +: SG-OBLIQUE ; +R ; ! xxx check +! Plural +: PL-NOM-SUF ; +: PL-ACC-SUF ; +: PL-OBLIQUE ; + : NMN_ ; !! ## Nominals diff --git a/src/fst/morphology/affixes/verbs.lexc b/src/fst/morphology/affixes/verbs.lexc index 85088224..75d92088 100644 --- a/src/fst/morphology/affixes/verbs.lexc +++ b/src/fst/morphology/affixes/verbs.lexc @@ -23,7 +23,7 @@ LEXICON V_ada/ab/i/agaha !! largest verb group vedada:ved !! preceding vowel always required for affix :a V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:ai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with ‹e› present stems20241109 +Der/NomAg+PrsPrc:a%>jA1 K ; ! This will have to be AdjTag or something !! sometimes requires preceding vowel @@ -66,7 +66,7 @@ LEXICON V_da/vab/voi/gaha :va INF_da ; :va V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, -+Der+Der/NomAg+N:vai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:va N_TEGII ;! this will need its own work with ‹e› present stems20241109 :va ACT_COND_type ; : ACT_PRFPRC_type_nu ; @@ -85,7 +85,7 @@ LEXICON V_ada/ab/oi/agaha :a INF_da ; :a V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:ai N_TEGII ;! this will need its own work with ‹e› present ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with ‹e› present :a ACT_COND_type ; :a ACT_PRFPRC_type_nu ; @@ -113,7 +113,7 @@ LEXICON V_da/b/i/gaha : INF_da ; : V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N: N_TEGII ;! this will need its own work with : ACT_COND_type ; : ACT_PRFPRC_type_nu ; @@ -132,10 +132,10 @@ LEXICON V_ta/ab/i/kaha ! preceding vowel required :a V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:ai N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with :a ACT_COND_type ; -:a ACT_PRFPRC_type_nu ; +: ACT_PRFPRC_type_nu ; +Der/NomAg+PrsPrc:a%>jA1 K ; ! This will have to be AdjTag or something @@ -158,7 +158,7 @@ LEXICON V_ta/dab/zhi/kaha !! preceding vowel always required for affix :da V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:dai N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N:da N_TEGII ;! this will need its own work with !! sometimes requires preceding vowel :da ACT_COND_type ; @@ -181,7 +181,7 @@ LEXICON V_ta/dab/zi/kaha !! preceding vowel always required for affix :da V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:dai N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N:da N_TEGII ;! this will need its own work with !! sometimes requires preceding vowel :da ACT_COND_type ; @@ -205,7 +205,7 @@ LEXICON V_ta/dab/di/kaha !! preceding vowel always required for affix :da V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:dai N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N:da N_TEGII ;! this will need its own work with !! sometimes requires preceding vowel :da ACT_COND_type ; @@ -222,6 +222,29 @@ LEXICON V_ta/dab/di/kaha !! preterite stem vowel :d ACT_IND_PRT ;! gets i +LEXICON V_1Syl_DVta/ab/i/DVkaha +!! @LEXNAME@ = pörtta:pörd +! V_ +!! preceding vowel always required for affix +:a V-VowelStem-PRS ; +!! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with + +!! sometimes requires preceding vowel +:a ACT_COND_type ; +: ACT_PRFPRC_type_nu ; +:a VNONFIN_m ; + +!!consonant stem if there is one takes both te, tes,... and kaha, koi +:%^DEVOICE V-ConsonantStem_t/k ; +! refl-imprt-sg2, refl-ind-prs-sg-conneg + +!! problems with tta, ta, da +:%^DEVOICE INF_ta ; + +!! preterite stem vowel +: ACT_IND_PRT ;! gets i + LEXICON V_ta/cheb/chi/kaha !! @LEXNAME@ adivoita:adivoi ! V_AMUNTA, kerata:kera @@ -324,7 +347,7 @@ LEXICON V_eda/eb/i/egaha !! preceding vowel always required for affix :e V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel : ACT_COND_type ; @@ -348,7 +371,7 @@ LEXICON V_ta/ndab/nzi/kaha !! preceding vowel always required for affix :nda V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ndai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:nda N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :nda ACT_COND_type ; @@ -372,7 +395,7 @@ LEXICON V_ta/ndeb/nzi/kaha !! preceding vowel always required for affix :nde V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ndii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ndi N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :nde ACT_COND_type ; @@ -396,7 +419,7 @@ LEXICON V_ta/neb/ni/kaha !! preceding vowel always required for affix :ne V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:nii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ni N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel : ACT_COND_type ; @@ -419,7 +442,7 @@ LEXICON V_ata/neb/ni/akaha !! preceding vowel always required for affix :ne V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:nii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ni N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :a ACT_COND_type ; @@ -436,6 +459,29 @@ LEXICON V_ata/neb/ni/akaha !! preterite stem vowel :n ACT_IND_PRT ;! gets i +LEXICON V_eta/neb/ni/ekaha +!! @LEXNAME@ = küpseta:küps +! V_OIGETA +!! preceding vowel always required for affix +:ne V-VowelStem-PRS ; +!! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg ++Der+Der/NomAg+N:ni N_TEGII ;! this will need its own work with ‹e› present stems20241109 + +!! sometimes requires preceding vowel +:n ACT_COND_type ; +: ACT_PRFPRC_type_nu ; +: VNONFIN_m ; !does not include -matoi 20241109 + +!!consonant stem if there is one takes both te, tes,... and kaha, koi +:e V-ConsonantStem_t/k ; +! refl-imprt-sg2, refl-ind-prs-sg-conneg + +!! problems with tta, ta, da +:e INF_ta ; + +!! preterite stem vowel +:n ACT_IND_PRT ;! gets i + LEXICON V_ta/ib/i/kaha !! @LEXNAME@ = bruncta:brunc ! V_?? @@ -466,7 +512,7 @@ LEXICON V_da/ib/i/gaha !! preceding vowel always required for affix :i V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :i ACT_COND_type ; @@ -489,7 +535,7 @@ LEXICON V_ta/ab/oi/kaha !! preceding vowel always required for affix :a V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :a ACT_COND_type ; @@ -513,7 +559,7 @@ LEXICON V_ta/eb/i/kaha !! preceding vowel always required for affix :e V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :e ACT_COND_type ; @@ -532,53 +578,53 @@ LEXICON V_ta/eb/i/kaha : ACT_IND_PRT ;! gets i -LEXICON V_shta/zheb/zhi/shkaha -!! @LEXNAME@ = pagišta:pagi +LEXICON V_2Syl_DVta/eb/i/DVkaha +!! @LEXNAME@ = pagišta:pagiž ! V_?? !! preceding vowel always required for affix -:že V-VowelStem-PRS ; +:e V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:žii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel -:ž ACT_COND_type ; -:ž ACT_PRFPRC_type_nu ; +: ACT_COND_type ; +: ACT_PRFPRC_type_nu ; -:že VNONFIN_m ; !does not include -matoi 20241109 +:e VNONFIN_m ; !does not include -matoi 20241109 !!consonant stem if there is one takes both te, tes,... and kaha, koi -:š V-ConsonantStem_t/k ; +:%^DEVOICE V-ConsonantStem_t/k ; ! refl-imprt-sg2, refl-ind-prs-sg-conneg !! problems with tta, ta, da -:š INF_ta ; +:%^DEVOICE INF_ta ; !pagišta !! preterite stem vowel -:ž ACT_IND_PRT ;! gets i +: ACT_IND_PRT ;! gets i -LEXICON V_sta/zeb/zi/skaha -!! @LEXNAME@ = pesta:pez +LEXICON V_1Syl_DVta/eb/i/DVkaha +!! @LEXNAME@ = pesta:pez only for verbs with devoicing ! V_PESTA !! preceding vowel always required for affix -:ze V-VowelStem-PRS ; +:e V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:zii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel -:z ACT_COND_type ; -:z ACT_PRFPRC_type_nu ; +: ACT_COND_type ; +: ACT_PRFPRC_type_nu ; -:ze VNONFIN_m ; !does not include -matoi 20241109 +:e VNONFIN_m ; !does not include -matoi 20241109 !!consonant stem if there is one takes both te, tes,... and kaha, koi -:s V-ConsonantStem_t/k ; +:%^DEVOICE V-ConsonantStem_t/k ; !DV devoice ! refl-imprt-sg2, refl-ind-prs-sg-conneg !! problems with tta, ta, da -:s INF_ta ; +:%^DEVOICE INF_ta ; !! preterite stem vowel -:z ACT_IND_PRT ;! gets i +: ACT_IND_PRT ;! gets i LEXICON V_kta/gub/gui/ggaha !! @LEXNAME@ = kirkta:kir @@ -586,7 +632,7 @@ LEXICON V_kta/gub/gui/ggaha !! preceding vowel always required for affix :gu V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:gui N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:gu N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :gu ACT_COND_type ; @@ -610,7 +656,7 @@ LEXICON V_kta/gib/gi/ggaha !! preceding vowel always required for affix :gi V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:gii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:gi N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :gi ACT_COND_type ; @@ -634,7 +680,7 @@ LEXICON V_pta/bub/bui/pkaha !! preceding vowel always required for affix :bu V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:bui N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:bu N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :bu ACT_COND_type ; @@ -658,7 +704,7 @@ LEXICON V_elta/leb/li/elkaha !! preceding vowel always required for affix :le V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:lii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:li N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :el ACT_COND_type ; @@ -682,7 +728,7 @@ LEXICON V_da/eb/i/kaha !! preceding vowel always required for affix :e V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:ii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:i N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :e ACT_COND_type ; @@ -700,29 +746,53 @@ LEXICON V_da/eb/i/kaha !! preterite stem vowel : ACT_IND_PRT ;! gets i -LEXICON V_tta/dab/doi/tkaha -!! @LEXNAME@ = antta:an +LEXICON V_1Syl_DVta/ab/oi/DVkaha +!! @LEXNAME@ = antta:and ! V_ANTTA !! preceding vowel always required for affix -:da V-VowelStem-PRS ; +:a V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:dai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:a N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel -:da ACT_COND_type ; -:d ACT_PRFPRC_type_nu ; +:a ACT_COND_type ; +: ACT_PRFPRC_type_nu ; -:d VNONFIN_m ; !does not include -matoi 20241109 +: VNONFIN_m ; !does not include -matoi 20241109 + +!!consonant stem if there is one takes both te, tes,... and kaha, koi +:%^DEVOICE V-ConsonantStem_t/k ; +! refl-imprt-sg2, refl-ind-prs-sg-conneg + +!! problems with tta, ta, da +:%^DEVOICE INF_ta ; + +!! preterite stem vowel +:o ACT_IND_PRT ;! gets i + +LEXICON V_1Syl_DVta/ub/ui/DVkaha +!! @LEXNAME@ = ampta:amb +! V_ +!! preceding vowel always required for affix +:u V-VowelStem-PRS ; +!! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg ++Der+Der/NomAg+N:u N_TEGII ;! this will need its own work with ‹e› present stems20241109 + +!! sometimes requires preceding vowel +:u ACT_COND_type ; +: ACT_PRFPRC_type_nu ; + +: VNONFIN_m ; !does not include -matoi 20241109 !!consonant stem if there is one takes both te, tes,... and kaha, koi -:t V-ConsonantStem_t/k ; +:%^DEVOICE V-ConsonantStem_t/k ; ! refl-imprt-sg2, refl-ind-prs-sg-conneg !! problems with tta, ta, da -:t INF_ta ; +:%^DEVOICE INF_ta ; !! preterite stem vowel -:do ACT_IND_PRT ;! gets i +:u ACT_IND_PRT ;! gets i LEXICON V_kta/gab/goi/ggaha @@ -731,7 +801,7 @@ LEXICON V_kta/gab/goi/ggaha !! preceding vowel always required for affix :ga V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:gai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ga N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :ga ACT_COND_type ; @@ -755,7 +825,7 @@ LEXICON V_kta/gab/gi/ggaha !! preceding vowel always required for affix :ga V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:gai N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ga N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :ga ACT_COND_type ; @@ -779,7 +849,7 @@ LEXICON V_kta/geb/gi/ggaha !! preceding vowel always required for affix :ge V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:gii N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:gi N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :ge ACT_COND_type ; @@ -803,7 +873,7 @@ LEXICON V_äda/äb/i/ägaha !! preceding vowel always required for affix :ä V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg, NomAg -+Der+Der/NomAg+N:äi N_TEGII ;! this will need its own work with ‹e› present stems20241109 ++Der+Der/NomAg+N:ä N_TEGII ;! this will need its own work with ‹e› present stems20241109 !! sometimes requires preceding vowel :ä ACT_COND_type ; @@ -827,7 +897,7 @@ LEXICON V_ta/äb/i/kaha !! preceding vowel always required for affix :ä V-VowelStem-PRS ; !! refl-ind-prs, act-imprt-sg2, act-ind-prs, ind-sg-conneg -+Der+Der/NomAg+N:äi N_TEGII ;! this will need its own work with ++Der+Der/NomAg+N:ä N_TEGII ;! this will need its own work with !! sometimes requires preceding vowel :ä ACT_COND_type ;!heitäiži @@ -1437,12 +1507,35 @@ LEXICON V-ConsonantStem_kaha/koi ! VNONFIN_m ; LEXICON VNONFIN_m +VNONFIN_m_ABE ; +VNONFIN_m_ADE ; +VNONFIN_m_ELA ; +VNONFIN_m_ILL_maha ; ! CHECK distribution, jaska 20241111 +VNONFIN_m_ILL_mha ; +VNONFIN_REFL_m_ILL_mahas ; +VNONFIN_REFL_m_ILL_mhas ; +VNONFIN_m_INE ; +VNONFIN_m_MINE ; +VNONFIN_m_MATOI ; +LEXICON VNONFIN_m_ILL_mha +Inf+Der/ma+Ill:%>mha K ; +LEXICON VNONFIN_m_ILL_maha ++Inf+Der/ma+Ill:%>maha K ; +LEXICON VNONFIN_REFL_m_ILL_mahas !! this could be a reflexive infinitive if you want one, jaska 20241111 ++Inf+Refl+Der/ma+Ill:%>mahas K ; +LEXICON VNONFIN_REFL_m_ILL_mhas ++Inf+Refl+Der/ma+Ill:%>mhas K ; +LEXICON VNONFIN_m_INE +Inf+Der/ma+Ine:%>mas K ; +LEXICON VNONFIN_m_ELA +Inf+Der/ma+Ela:%>maspäi K ; +LEXICON VNONFIN_m_ADE +Inf+Der/ma+Ade:%>mal K ; +LEXICON VNONFIN_m_ABE +Inf+Der/ma+Abe:%>mata K ; +LEXICON VNONFIN_m_MINE +Der+Der/Mine+N:%>mi N_TOSHTMINE ; +LEXICON VNONFIN_m_MATOI +Der+Der/Matoi+A:%>mato A_KENGATOI ; LEXICON PRFPRC_nu @@ -1521,6 +1614,7 @@ LEXICON ACT_PRFPRC_type_nu LEXICON ACT_PRFPRC ACT_PRFPRC_SG ; ACT_PRFPRC_PL ; ++PrfPrc:%>nu A_PRFPRC ; LEXICON PRFPRC_SG_nu ACT_PRFPRC_SG ; !FIXME drop _nu LEXICON PRFPRC_PL_nuded @@ -1534,6 +1628,15 @@ LEXICON REFL_ACT_PRT_CONNEG LEXICON REFL_ACT_PRFPRC +Refl+Act+PrfPrc:%>nus K ; +LEXICON A_PRFPRC +!+PrfPrc:%>nu K ; +: SG-NOM-SUF ; +SG-PAR-SUF_t ;! this is real +:de SG-OBLIQUE ; !Adjustment needed here +:de PL-NOM-SUF ; +:de PL-ACC-SUF ; +:z PL-OBLIQUE ; + LEXICON INF_da +Inf:%>da K ; diff --git a/src/fst/morphology/stems/adjectives_newwords.lexc b/src/fst/morphology/stems/adjectives_newwords.lexc index 191fc77d..f14925be 100644 --- a/src/fst/morphology/stems/adjectives_newwords.lexc +++ b/src/fst/morphology/stems/adjectives_newwords.lexc @@ -10,4 +10,34 @@ LEXICON A_NEWWORDS !! **LEXICON @LEXNAME@** test:test N_ "" ; ! ADD ADJECTIVES BELOW -!uz’+Z:ud A_UZ1 ; ! this one in xml +!uz’+A:ud A_UZ1 ; ! this one in xml +ülembaine+A:ülemba A_CIPUINE ; +harvinaine+A:harvina A_CIPUINE ; +nügüdläine+A:nügüdlä A_CIPUINE ; +aigembaine+A:aigemba A_CIPUINE ; +endevanhaine+A:endevanha A_CIPUINE ; +finikialaine+A:finikiala A_CIPUINE ; +hananalaine+A:hananala A_CIPUINE ; +hristosalaine+A:hristosala A_CIPUINE ; +hüväsanaine+A:hüväsana A_CIPUINE ; +igäine+A:igä A_CIPUINE ; +jogapäiväine+A:jogapäivä A_CIPUINE ; +kovatabaine+A:kovataba A_CIPUINE ; +kritalaine+A:kritala A_CIPUINE ; +kundlijaine+A:kundlija A_CIPUINE ; +lähembaine+A:lähemba A_CIPUINE ; +lühüdaigaine+A:lühüdaiga A_CIPUINE ; +murdoine+A:murdo A_CIPUINE ; +muupäiväine+A:muupäivä A_CIPUINE ; +nügüdläine+A:nügüdlä A_CIPUINE ; +pehmedtabaine+A:pehmedtaba A_CIPUINE ; +samarialaine+A:samariala A_CIPUINE ; +sirialaine+A:siriala A_CIPUINE ; +tijalaine+A:tijala A_CIPUINE ; +tippuine+A:tippu A_CIPUINE ; +verazmaine+A:verazma A_CIPUINE ; +vähäine+A:vähä A_CIPUINE ; +änikoine+A:äniko A_CIPUINE ; +üksjaine+A:üksja A_CIPUINE ; +ülembaine+A:ülemba A_CIPUINE ; +ülimäraine+A:ülimära A_CIPUINE ; diff --git a/src/fst/morphology/stems/nouns.lexc b/src/fst/morphology/stems/nouns.lexc index 136d1c84..e4d614fb 100644 --- a/src/fst/morphology/stems/nouns.lexc +++ b/src/fst/morphology/stems/nouns.lexc @@ -51,7 +51,7 @@ anšpug+N:anšpug N_MARJ ; apelʼsin+N:apelʼsin N_MARJ ; apelʼsinpu+N:apelʼsin#pu N_PU ; apiterapii+N:apiterapi N_TEGII ; -apostol+N:apostol N_POIG ; +apostol+N:apostol N_MARJ ; aptek+N:aptek N_MARJ ; arheologii+N:arheologi N_TEGII ; armii+N:armi N_TEGII ; @@ -267,7 +267,7 @@ hengaiduz+N:hengaiduz N_ALUZ ; hengenavaidai+N:hengenavaida N_KONDI ; heraštoitim+N:heraštoiti N_AVADIM ; herekogo+N:here#kogo N_PU ; -hibj+N:hibj N_LEIB ; +hibj+N:hibj N_MARJ ; higo+N:higo N_PU ; hijam+N:hijam N_POIG ; himii+N:himi N_TEGII ; diff --git a/src/fst/morphology/stems/nouns_newwords.lexc b/src/fst/morphology/stems/nouns_newwords.lexc index 2cd5936c..1e9d6df9 100644 --- a/src/fst/morphology/stems/nouns_newwords.lexc +++ b/src/fst/morphology/stems/nouns_newwords.lexc @@ -11,4 +11,26 @@ LEXICON N_NEWWORDS test:test N_ "" ; ! ADD NOUNS BELOW +angel+N:angel N_0/an/ad/aha/oid ; +antihrist+N:antihrist N_0/an/ad/aha/oid ; +astii+N:asti N_i/jan/jad/jaha/joid ; +bohat+N:bohat N_0/an/ad/aha/oid ; +deng+N:deng N_0/an/ad/aha/oid ; +dinarii+N:dinari N_i/jan/jad/jaha/joid ; +ižand+N:ižand N_0/an/ad/aha/oid ; +jumal+N:jumal N_0/an/ad/aha/oid ; +kanznik+N:kanznik N_0/an/ad/aha/oid ; +kirj+N:kirj N_0/an/ad/aha/oid ; +kodinik+N:kodinik N_0/an/ad/aha/oid ; +kollii+N:kolli N_i/jan/jad/jaha/joid ; +käskabunik+N:käskabunik N_0/an/ad/aha/oid ; +!leskiak+N:leskiak N_0/an/ad/aha/oid ; CHECKME akha? +loičend+N:loičend N_0/an/ad/aha/oid ; +vihanik+N:vihanik N_0/an/ad/aha/oid ; +armo+N:armo N_o/on/od/oho/oid ; +agj+N:agj N_0/an/ad/aha/oid ; +himo+N:himo N_o/on/od/oho/oid ; +hüväntegii+N:hüväntegi N_i/jan/jad/jaha/joid ; +živataine+N:živata N_CIPUINE ; +kühkjaine+N:kühkja N_CIPUINE ; diff --git a/src/fst/morphology/stems/propernouns_newwords.lexc b/src/fst/morphology/stems/propernouns_newwords.lexc index 27fcbeea..63687796 100644 --- a/src/fst/morphology/stems/propernouns_newwords.lexc +++ b/src/fst/morphology/stems/propernouns_newwords.lexc @@ -47,7 +47,7 @@ Zevs+N+Prop:Zevs N_MARJ ; Zilot+N+Prop:Zilot N_MARJ ; Iisus+N+Prop:Iisus N_MARJ ; -Jumal+N+Prop:Jumal N_POIG ; +Jumal+N+Prop:Jumal N_MARJ ; Ižand+N+Prop:Ižand N_POIG ; Hristos+N+Prop:Hristos N_MARJ ; David+N+Prop:David N_MARJ ; diff --git a/src/fst/morphology/stems/verbs.lexc b/src/fst/morphology/stems/verbs.lexc index 11cfb35f..cf9b0085 100644 --- a/src/fst/morphology/stems/verbs.lexc +++ b/src/fst/morphology/stems/verbs.lexc @@ -86,7 +86,7 @@ eläbzuda+V:eläbzu V_da/b/i/gaha ; elähtoitta+V:elähtoi V_ABIDOITTA ; elähtuda+V:elähtu V_da/b/i/gaha ; elätoitta+V:elätoi V_ABIDOITTA ; -elʼgeta+V:elʼge V_OIGETA ; +elʼgeta+V:elʼge V_ta/ndab/nzi/kaha ; emägoitta+V:emägoi V_ABIDOITTA ; enambištuda+V:enambištu V_da/b/i/gaha ; erigata+V:eriga V_ta/ndeb/nzi/kaha ; @@ -490,7 +490,7 @@ kül’mehtuda+V:kül’mehtu V_da/b/i/gaha ; kül’menzoitta+V:kül’menzoi V_ABIDOITTA ; künzäita+V:künzäi V_ta/dab/zhi/kaha ; küpsenzoitta+V:küpsenzoi V_ABIDOITTA ; -küpseta+V:küpse V_OIGETA ; +küpseta+V:küps V_eta/neb/ni/ekaha ; kütkta+V:kütk V_ASTTA ; kütʼkta+V:kütʼk V_ASTTA ; küumehtuda+V:küumehtu V_da/b/i/gaha ; @@ -834,7 +834,7 @@ peneta+v1+V:pene V_HUBETA ; peneta+v1+V:pene V_OIGETA ; peništuda+V:peništu V_da/b/i/gaha ; penzastuda+V:penzastu V_da/b/i/gaha ; -pesta+V:pez V_sta/zeb/zi/skaha ; +pesta+V:pez V_1Syl_DVta/eb/i/DVkaha ; pezaduda+V:pezadu V_da/b/i/gaha ; pezelta+V:pezel V_JOKSTA ; pezetada+V:pezet V_ada/ab/i/agaha ; diff --git a/src/fst/morphology/stems/verbs_newwords.lexc b/src/fst/morphology/stems/verbs_newwords.lexc index b38a1ea3..7f447e5f 100644 --- a/src/fst/morphology/stems/verbs_newwords.lexc +++ b/src/fst/morphology/stems/verbs_newwords.lexc @@ -946,15 +946,14 @@ vinkta+V:ving V_kta/gub/gui/ggaha ; činkta+V:čing V_kta/gub/gui/ggaha ; štarkta+V:štarg V_kta/gub/gui/ggaha ; !#V_kuda/ub/ui/Q ;_haukkuda+V:hauk V_kuda/ub/ui/Q ; -!#V_pta/bub/bui/pkaha ;_ampta+V:am V_pta/bub/bui/pkaha ; -börišta+V:böri V_shta/zheb/zhi/shkaha ; -hogišta+V:hogi V_shta/zheb/zhi/shkaha ; -jurišta+V:juri V_shta/zheb/zhi/shkaha ; -kähišta+V:kähi V_shta/zheb/zhi/shkaha ; -pagišta+V:pagi V_shta/zheb/zhi/shkaha ; -värišta+V:väri V_shta/zheb/zhi/shkaha ; -čihišta+V:čihi V_shta/zheb/zhi/shkaha ; -šihišta+V:šihi V_shta/zheb/zhi/shkaha ; +börišta+V:böriž V_2Syl_DVta/eb/i/DVkaha ; +hogišta+V:hogiž V_2Syl_DVta/eb/i/DVkaha ; +jurišta+V:juriž V_2Syl_DVta/eb/i/DVkaha ; +kähišta+V:kähiž V_2Syl_DVta/eb/i/DVkaha ; +pagišta+V:pagiž V_2Syl_DVta/eb/i/DVkaha ; +värišta+V:väriž V_2Syl_DVta/eb/i/DVkaha ; +čihišta+V:čihiž V_2Syl_DVta/eb/i/DVkaha ; +šihišta+V:šihiž V_2Syl_DVta/eb/i/DVkaha ; alaštoitta+V:alaštoit V_ta/ab/i/kaha ; alenzoitta+V:alenzoit V_ta/ab/i/kaha ; astutoitta+V:astutoit V_ta/ab/i/kaha ; @@ -1095,6 +1094,8 @@ väzutoitta+V:väzutoit V_ta/ab/i/kaha ; vöstta+V:vöst V_ta/ab/i/kaha ; ühtenzoitta+V:ühtenzoit V_ta/ab/i/kaha ; ülenzoitta+V:ülenzoit V_ta/ab/i/kaha ; +korgenzoitta+V:korgenzoit V_ta/ab/i/kaha ; +lopenzoitta+V:lopenzoit V_ta/ab/i/kaha ; čorskta+V:čorsk V_ta/ab/i/kaha ; čudutoitta+V:čudutoit V_ta/ab/i/kaha ; šlibahtoitta+V:šlibahtoit V_ta/ab/i/kaha ; @@ -1530,9 +1531,11 @@ hihtta+V:hiht V_ta/äb/i/kaha ; !#V_tta/cheb/chi/tkaha ;_besedoitta+V:besedoi V_tta/cheb/chi/tkaha ; erigoitta+V:erigoit V_ta/ab/i/kaha ;!CHECKME !#V_tta/cheb/chi/tkaha ;_kodikoitta+V:kodikoi V_tta/cheb/chi/tkaha ; -antta+V:an V_tta/dab/doi/tkaha ; -kantta+V:kan V_tta/dab/doi/tkaha ; -!#V_tta/dub/dui/tkaha ;_hautta+V:hau V_tta/dub/dui/tkaha ; +pörtta+V:pörd V_1Syl_DVta/ab/i/DVkaha ; +antta+V:and V_1Syl_DVta/ab/oi/DVkaha ; +kantta+V:kand V_1Syl_DVta/ab/oi/DVkaha ; +ampta+V:amb V_1Syl_DVta/ub/ui/DVkaha ; +hautta+V:haud V_1Syl_DVta/ub/ui/DVkaha ; eläda+V:el V_äda/äb/i/ägaha ; idäda+V:id V_äda/äb/i/ägaha ; !#V_šta/žub/žui/škaha ;_haišta+V:hai V_šta/žub/žui/škaha ;