Correction to contlexes,

Still work

src/fst/morphology/affixes/verbs.lexc

@@ -123,8 +123,8 @@ LEXICON V_da/b/i/gaha
 
 +Der/NomAg+PrsPrc:%>jA1 K ; ! This will have to be AdjTag or something
 
-: REFL_IND_PRT ;
-: ACT_IND_PRT_PERS ;! has i at affix
+!! preterite stem vowel
+: ACT_IND_PRT ;! has i at affix
 
 LEXICON V_ta/ab/i/kaha
 !! @LEXNAME@ = ülenzoitta:ülenzoit, čorskta:čorsk
@@ -318,6 +318,30 @@ LEXICON V_da/eb/i/gaha
 !! preterite stem vowel
 : ACT_IND_PRT ;! gets i
 
+LEXICON V_eda/eb/i/egaha
+!! @LEXNAME@ = arvostelda:arvostel
+! V_
+!! 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
+
+!! sometimes requires preceding vowel
+: ACT_COND_type ;
+:e ACT_PRFPRC_type_nu ;
+
+:e VNONFIN_m ; !does not include -matoi 20241109
+
+!!consonant stem if there is one takes both te, tes,... and kaha, koi
+:e V-ConsonantStem_d/g ;
+! refl-imprt-sg2, refl-ind-prs-sg-conneg
+
+!! problems with tta, ta, da
+:e INF_da ;
+
+!! preterite stem vowel
+: ACT_IND_PRT ;! gets i
+
 LEXICON V_ta/ndab/nzi/kaha
 !! @LEXNAME@ = henota:heno
 ! V_??
@@ -446,7 +470,7 @@ LEXICON V_da/ib/i/gaha
 
 !! sometimes requires preceding vowel
 :i ACT_COND_type ;
-:iACT_PRFPRC_type_nu ;
+:i ACT_PRFPRC_type_nu ;
 :i VNONFIN_m ; !does not include -matoi 20241109
 
 !!consonant stem if there is one takes both te, tes,... and kaha, koi
@@ -686,9 +710,9 @@ LEXICON V_tta/dab/doi/tkaha
 
 !! sometimes requires preceding vowel
 :da ACT_COND_type ;
-:da ACT_PRFPRC_type_nu ;
+:d ACT_PRFPRC_type_nu ;
 
-:da VNONFIN_m ; !does not include -matoi 20241109
+:d 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 ;
@@ -829,8 +853,8 @@ LEXICON V_OLDA
 !:le V-VowelStem ;
 !:l V-ConsonantStem ;
 :le ACT_IMPRT_SG2 ;
-:le INDPRSSG_CONNEG ;
-:le INDPRTSG_CONNEG ;!CHECKME 20241110
+:le ACT_IND_PRS_SG_CONNEG ;
+:le ACT_IND_PRT_SG_CONNEG ;!CHECKME 20241110
 : V-VowelStem-PRS ;
 +Ind+Prs+Sg3:%>m K ;
 +Ind+Prs+Pl3:%>ma K ;
@@ -994,8 +1018,8 @@ LEXICON V_
 !! ### PNDPRS3
 
 LEXICON INDPRS3
- INDPRSSG3 ;
- INDPRSPL3 ;
+ ACT_IND_PRSSG3 ;
+ ACT_IND_PRSPL3 ;
 
 LEXICON ACT_IND_PRT
 :%>i ACT_IND_PRT_PERS ;
@@ -1013,7 +1037,7 @@ LEXICON ACT_IND_PRT_PERS
  INDPRTPL2 ;
  INDPRTPL3 ;
 
-LEXICON INDPRTSG_CONNEG
+LEXICON ACT_IND_PRT_SG_CONNEG
 +Ind+Prt+Sg+ConNeg:%>nd K ;
 
 LEXICON INDPRTSG1
@@ -1056,8 +1080,8 @@ LEXICON V-VowelStem-PRS
  REFL_IND_PRS ;
  ACT_IMPRT_SG2 ;
  ACT_IND_PRS ;
- INDPRSSG_CONNEG ;
- INDPRTSG_CONNEG ;
+ ACT_IND_PRS_SG_CONNEG ;
+ ACT_IND_PRT_SG_CONNEG ;
 
 +Der+Der/V:%>škande ACT_IND_PRS ;!inchoative?
 +Der+Der/V:%>škanz ACT_IND_PRT ;!inchoative?
@@ -1293,6 +1317,13 @@ LEXICON IMPRT_gaha
  IMPRTPL3_gaha ;
  IMPRTPLCONNEG_goi ;
 
+LEXICON IMPRT_kaha
+ IMPRTSG3_kaha ;
+ IMPRTPL1_kam ;
+ IMPRTPL2_kat ;
+ IMPRTPL3_kaha ;
+ IMPRTPLCONNEG_koi ;
+
 LEXICON IMPRTPLCONNEG_goi
 +Imprt+Pl+ConNeg:%>goi K ;
 
@@ -1306,6 +1337,19 @@ LEXICON IMPRTPL2_gat
 LEXICON IMPRTPL3_gaha
 +Imprt+Pl3:%>gaha K ;
 
+LEXICON IMPRTPLCONNEG_koi
++Imprt+Pl+ConNeg:%>koi K ;
+
+LEXICON IMPRTSG3_kaha
++Imprt+Sg3:%>kaha K ;
+
+LEXICON IMPRTPL1_kam
++Imprt+Pl1:%>kam K ;
+LEXICON IMPRTPL2_kat
++Imprt+Pl2:%>kat K ;
+LEXICON IMPRTPL3_kaha
++Imprt+Pl3:%>kaha K ;
+
 LEXICON REFL_IMPRT_gahas
 REFL_IMPRT_SG3_gahas ;
 REFL_IMPRT_PL1_gamoish ;
@@ -1324,6 +1368,24 @@ LEXICON REFL_IMPRT_PL3_gahas
 LEXICON REFL_IMPRT_CONNEG_goish
 +Refl+Imprt+ConNeg:%>goiš K ;
 
+LEXICON REFL_IMPRT_kahas
+REFL_IMPRT_SG3_kahas ;
+REFL_IMPRT_PL1_kamoish ;
+REFL_IMPRT_PL2_katoish ;
+REFL_IMPRT_PL3_kahas ;
+REFL_IMPRT_CONNEG_koish ;
+
+LEXICON REFL_IMPRT_SG3_kahas
++Refl+Imprt+Sg3:%>kahas K ;
+LEXICON REFL_IMPRT_PL1_kamoish
++Refl+Imprt+Pl1:%>kamoiš K ;
+LEXICON REFL_IMPRT_PL2_katoish
++Refl+Imprt+Pl2:%>katoiš K ;
+LEXICON REFL_IMPRT_PL3_kahas
++Refl+Imprt+Pl3:%>kahas K ;
+LEXICON REFL_IMPRT_CONNEG_koish
++Refl+Imprt+ConNeg:%>koiš K ;
+
 
 
 LEXICON V-ConsonantStem_d/g
@@ -1386,7 +1448,7 @@ LEXICON VNONFIN_m
 LEXICON PRFPRC_nu
 PRFPRC_SG_nu ;
 PRFPRC_PL_nuded ;
-COND_PRT_CONNEG ;
+ACT_COND_PRT_CONNEG ;
 
 LEXICON ACT_COND_type
  ACT_COND_PRS ; ! both COND_PRS and COND_PRT

src/fst/morphology/root.lexc

@@ -462,6 +462,18 @@ V3    !!≈ * **@CODE@**
 @U.number.nine@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
 @U.number.zero@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
 
+@P.number.one@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.two@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.three@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.four@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.five@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.six@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.seven@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.eight@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.nine@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.ten@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+@P.number.zero@ !!≈ | @CODE@ | Flag used to give arabic numerals in smj different cases ;
+
 
 !! ## Lexc lexica
 

src/fst/morphology/stems/verbs.lexc

@@ -1,7 +1,7 @@
 
 LEXICON verbs
 
-ampta+V:amb V_AMPTA ;
+ampta+V:amb V_pta/bub/bui/pkaha ;
 
 abidoitta+V:abidoi V_ABIDOITTA ;
 abittuda+V:abittu V_da/b/i/gaha ;

src/fst/morphology/stems/verbs_newwords.lexc

@@ -488,73 +488,73 @@ palada+V:pal V_ada/ab/oi/agaha ;
 rižada+V:riž V_ada/ab/oi/agaha ;
 sadada+V:sad V_ada/ab/oi/agaha ;
 valada+V:val V_ada/ab/oi/agaha ;
-ahjata+V:ahj V_ata/ab/oi/kaha ;
-harjata+V:harj V_ata/ab/oi/kaha ;
+ahjata+V:ahj V_ata/ab/oi/akaha ;
+harjata+V:harj V_ata/ab/oi/akaha ;
 hapata+V:hap V_ata/neb/ni/akaha ;
 !#V_ata/tab/si/Q ;_ezipaukata+V:ezipauk V_ata/tab/si/Q ;
-aidoida+V:aidoi V_da/b/0/Q ;
-annuliruida+V:annulirui V_da/b/0/Q ;
-arboida+V:arboi V_da/b/0/Q ;
-blahoslovida+V:blahoslovi V_da/b/0/Q ;
-buhvostida+V:buhvosti V_da/b/0/Q ;
-capnida+V:capni V_da/b/0/Q ;
-cukoida+V:cukoi V_da/b/0/Q ;
-deklamiruida+V:deklamirui V_da/b/0/Q ;
-demonstriruida+V:demonstrirui V_da/b/0/Q ;
-diskuitiruida+V:diskuitirui V_da/b/0/Q ;
-dumaida+V:dumai V_da/b/0/Q ;
-glumida+V:glumi V_da/b/0/Q ;
-gorʼuida+V:gorʼui V_da/b/0/Q ;
-grazida+V:grazi V_da/b/0/Q ;
-gulʼaida+V:gulʼai V_da/b/0/Q ;
-hakkida+V:hakki V_da/b/0/Q ;
-haugoida+V:haugoi V_da/b/0/Q ;
-hüppida+V:hüppi V_da/b/0/Q ;
-hüväksida+V:hüväksi V_da/b/0/Q ;
-katkoida+V:katkoi V_da/b/0/Q ;
-kiruhtida+V:kiruhti V_da/b/0/Q ;
-kiškoida+V:kiškoi V_da/b/0/Q ;
-konservoida+V:konservoi V_da/b/0/Q ;
-konsultoida+V:konsultoi V_da/b/0/Q ;
-kopiruida+V:kopirui V_da/b/0/Q ;
-kärmehtida+V:kärmehti V_da/b/0/Q ;
-ladida+V:ladi V_da/b/0/Q ;
-laida+V:lai V_da/b/0/Q ;
-longoida+V:longoi V_da/b/0/Q ;
-lotoida+V:lotoi V_da/b/0/Q ;
-lükkida+V:lükki V_da/b/0/Q ;
-naida+V:nai V_da/b/0/Q ;
-naprida+V:napri V_da/b/0/Q ;
-navedida+V:navedi V_da/b/0/Q ;
-noiduida+V:noidui V_da/b/0/Q ;
-noroida+V:noroi V_da/b/0/Q ;
-oppida+V:oppi V_da/b/0/Q ;
-pakuida+V:pakui V_da/b/0/Q ;
-praznuida+V:praznui V_da/b/0/Q ;
-prostida+V:prosti V_da/b/0/Q ;
-purehtida+V:purehti V_da/b/0/Q ;
-rigehtida+V:rigehti V_da/b/0/Q ;
-rouhida+V:rouhi V_da/b/0/Q ;
-rügida+V:rügi V_da/b/0/Q ;
-segloida+V:segloi V_da/b/0/Q ;
-segoida+V:segoi V_da/b/0/Q ;
-sekoida+V:sekoi V_da/b/0/Q ;
-serviruida+V:servirui V_da/b/0/Q ;
-sudida+V:sudi V_da/b/0/Q ;
-tahtoida+V:tahtoi V_da/b/0/Q ;
-takaida+V:takai V_da/b/0/Q ;
-travida+V:travi V_da/b/0/Q ;
-uradida+V:uradi V_da/b/0/Q ;
-vesoida+V:vesoi V_da/b/0/Q ;
-voida+V:voi V_da/b/0/Q ;
-zatrida+V:zatri V_da/b/0/Q ;
-zavodida+V:zavodi V_da/b/0/Q ;
-zvängida+V:zvängi V_da/b/0/Q ;
-čipoida+V:čipoi V_da/b/0/Q ;
-čokkoida+V:čokkoi V_da/b/0/Q ;
-čongoida+V:čongoi V_da/b/0/Q ;
-čudida+V:čudi V_da/b/0/Q ;
-špaleruida+V:špalerui V_da/b/0/Q ;
+aidoida+V:aidoi V_da/b/0/gaha ;
+annuliruida+V:annulirui V_da/b/0/gaha ;
+arboida+V:arboi V_da/b/0/gaha ;
+blahoslovida+V:blahoslovi V_da/b/0/gaha ;
+buhvostida+V:buhvosti V_da/b/0/gaha ;
+capnida+V:capni V_da/b/0/gaha ;
+cukoida+V:cukoi V_da/b/0/gaha ;
+deklamiruida+V:deklamirui V_da/b/0/gaha ;
+demonstriruida+V:demonstrirui V_da/b/0/gaha ;
+diskuitiruida+V:diskuitirui V_da/b/0/gaha ;
+dumaida+V:dumai V_da/b/0/gaha ;
+glumida+V:glumi V_da/b/0/gaha ;
+gorʼuida+V:gorʼui V_da/b/0/gaha ;
+grazida+V:grazi V_da/b/0/gaha ;
+gulʼaida+V:gulʼai V_da/b/0/gaha ;
+hakkida+V:hakki V_da/b/0/gaha ;
+haugoida+V:haugoi V_da/b/0/gaha ;
+hüppida+V:hüppi V_da/b/0/gaha ;
+hüväksida+V:hüväksi V_da/b/0/gaha ;
+katkoida+V:katkoi V_da/b/0/gaha ;
+kiruhtida+V:kiruhti V_da/b/0/gaha ;
+kiškoida+V:kiškoi V_da/b/0/gaha ;
+konservoida+V:konservoi V_da/b/0/gaha ;
+konsultoida+V:konsultoi V_da/b/0/gaha ;
+kopiruida+V:kopirui V_da/b/0/gaha ;
+kärmehtida+V:kärmehti V_da/b/0/gaha ;
+ladida+V:ladi V_da/b/0/gaha ;
+laida+V:lai V_da/b/0/gaha ;
+longoida+V:longoi V_da/b/0/gaha ;
+lotoida+V:lotoi V_da/b/0/gaha ;
+lükkida+V:lükki V_da/b/0/gaha ;
+naida+V:nai V_da/b/0/gaha ;
+naprida+V:napri V_da/b/0/gaha ;
+navedida+V:navedi V_da/b/0/gaha ;
+noiduida+V:noidui V_da/b/0/gaha ;
+noroida+V:noroi V_da/b/0/gaha ;
+oppida+V:oppi V_da/b/0/gaha ;
+pakuida+V:pakui V_da/b/0/gaha ;
+praznuida+V:praznui V_da/b/0/gaha ;
+prostida+V:prosti V_da/b/0/gaha ;
+purehtida+V:purehti V_da/b/0/gaha ;
+rigehtida+V:rigehti V_da/b/0/gaha ;
+rouhida+V:rouhi V_da/b/0/gaha ;
+rügida+V:rügi V_da/b/0/gaha ;
+segloida+V:segloi V_da/b/0/gaha ;
+segoida+V:segoi V_da/b/0/gaha ;
+sekoida+V:sekoi V_da/b/0/gaha ;
+serviruida+V:servirui V_da/b/0/gaha ;
+sudida+V:sudi V_da/b/0/gaha ;
+tahtoida+V:tahtoi V_da/b/0/gaha ;
+takaida+V:takai V_da/b/0/gaha ;
+travida+V:travi V_da/b/0/gaha ;
+uradida+V:uradi V_da/b/0/gaha ;
+vesoida+V:vesoi V_da/b/0/gaha ;
+voida+V:voi V_da/b/0/gaha ;
+zatrida+V:zatri V_da/b/0/gaha ;
+zavodida+V:zavodi V_da/b/0/gaha ;
+zvängida+V:zvängi V_da/b/0/gaha ;
+čipoida+V:čipoi V_da/b/0/gaha ;
+čokkoida+V:čokkoi V_da/b/0/gaha ;
+čongoida+V:čongoi V_da/b/0/gaha ;
+čudida+V:čudi V_da/b/0/gaha ;
+špaleruida+V:špalerui V_da/b/0/gaha ;
 abittuda+V:abittu V_da/b/i/gaha ;
 alenzuda+V:alenzu V_da/b/i/gaha ;
 alištuda+V:alištu V_da/b/i/gaha ;
@@ -905,14 +905,14 @@ sugida+V:sugi V_da/b/0/gaha ;
 kaida+V:kai V_da/vab/voi/gaha ;
 kazda+V:kaz V_da/vab/voi/gaha ;
 ühthekazda+V:ühthe#kaz V_da/vab/voi/gaha ;
-erineda+V:erin V_eda/eb/i/kaha ;
-ezineda+V:ezin V_eda/eb/i/kaha ;
-imeda+V:im V_eda/eb/i/kaha ;
-levineda+V:levin V_eda/eb/i/kaha ;
-lugeda+V:lug V_eda/eb/i/kaha ;
-ruskneda+V:ruskn V_eda/eb/i/kaha ;
-tervneda+V:tervn V_eda/eb/i/kaha ;
-ühtneda+V:ühtn V_eda/eb/i/kaha ;!ühtnegoi?
+erineda+V:erin V_eda/eb/i/egaha ;
+ezineda+V:ezin V_eda/eb/i/egaha ;
+imeda+V:im V_eda/eb/i/egaha ;
+levineda+V:levin V_eda/eb/i/egaha ;
+lugeda+V:lug V_eda/eb/i/egaha ;
+ruskneda+V:ruskn V_eda/eb/i/egaha ;
+tervneda+V:tervn V_eda/eb/i/egaha ;
+ühtneda+V:ühtn V_eda/eb/i/egaha ;!ühtnegoi?
 andelta+V:and V_elta/leb/li/elkaha ;
 kacelta+V:kac V_elta/leb/li/elkaha ;
 katelta+V:kat V_elta/leb/li/elkaha ;
@@ -1480,11 +1480,11 @@ väheta+Hom1+V:vähe V_ta/ndab/nzi/kaha ;
 välleta+Hom1+V:välle V_ta/ndab/nzi/kaha ;
 värohjata+V:vär#ohja V_ta/ndab/nzi/kaha ;
 ületa+V:üle V_ta/ndab/nzi/kaha ;
-elegata+V:elega V_ta/ndeb/nzi/Q ;
-erigata+V:eriga V_ta/ndeb/nzi/Q ;
-helegata+V:helega V_ta/ndeb/nzi/Q ;
-heregata+V:herega V_ta/ndeb/nzi/Q ;
-hüdegata+V:hüdega V_ta/ndeb/nzi/Q ;
+elegata+V:elega V_ta/ndeb/nzi/kaha ;
+erigata+V:eriga V_ta/ndeb/nzi/kaha ;
+helegata+V:helega V_ta/ndeb/nzi/kaha ;
+heregata+V:herega V_ta/ndeb/nzi/kaha ;
+hüdegata+V:hüdega V_ta/ndeb/nzi/kaha ;
 aleta+Hom1+V:ale V_ta/neb/ni/kaha ;
 edeta+V:ede V_ta/neb/ni/kaha ;
 harjeta+V:harje V_ta/neb/ni/kaha ;
@@ -1528,7 +1528,7 @@ hihtta+V:hiht V_ta/äb/i/kaha ;
 !#V_tta/cheb/chi/tkaha ;_abidoitta+V:abidoi V_tta/cheb/chi/tkaha ;
 !#V_tta/cheb/chi/tkaha ;_beregoitta+V:beregoi V_tta/cheb/chi/tkaha ;
 !#V_tta/cheb/chi/tkaha ;_besedoitta+V:besedoi V_tta/cheb/chi/tkaha ;
-erigoitta+V:erigoit V_ta/ab/i/tkaha ;!CHECKME
+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 ;