Skip to content

Commit

Permalink
Ändrat i affixen för v3-verb, två nya sublexica v3_jä och v3_ja
Browse files Browse the repository at this point in the history
  • Loading branch information
@linalejdebro
linalejdebro committed Dec 18, 2023
1 parent 495a9b2 commit 2ad2268
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 70 deletions.
97 changes: 72 additions & 25 deletions src/fst/affixes/verbs.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
!! * v3_kaya = käyä:kä
!! * v3_nahha = nähhä:nä
!! * v3_tehha = tehhä:te
!! * **v3_jua** ! Stem ju-, short inf, otherwise like v3_j
!! * **v3_syä** ! Stem sy-, short inf, otherwise like v3_j

!! ## The verb lexica themselves

Expand Down Expand Up @@ -56,6 +58,9 @@ LEXICON OLLA !!≈ * **@CODE@**
+V+Act+Ind+Prt+Pl3:oli K ;

+V+Act+Cond:olis 2cond ;
+V+Act+Cond+Pl1:olis%>imm^A K ;
+V+Act+Cond+Pl3:olis%>it K ;


! tsekkaa loput olla-muodot, ne on ottetu fkv-tiedostosta.
+V+Pass+Ind+Prs:olhaan K ;
Expand Down Expand Up @@ -137,6 +142,7 @@ LEXICON v1_tietaa !RENSAD
+V+Act+Cond+Pl1:e%>simm^A K ;
+V+Act+Cond+Pl2:e%>sitt^A K ;
+V+Act+Cond+Pl3:e%>sit K ;
+V+Act+Cond+Pl3:e%>siv^A K ;
+V+Act+Cond+ConNeg:e%>isi K ;
+V+Pass+Cond:e%>tt^A%>i4s K ;

Expand Down Expand Up @@ -203,6 +209,7 @@ LEXICON v1 !!≈ * **@CODE@** sanoa, lukea, antaa !RENSAD
+V+Act+Cond+Pl1:%>isimm^A K ;
+V+Act+Cond+Pl2:%>isitt^A K ;
+V+Act+Cond+Pl3:%>isit K ;
+V+Act+Cond+Pl3:%>isiv^A K ;
+V+Pass+Cond:%^AE%^WG%>tt^A%>i4s K ;
+V+Act+Cond+ConNeg:%>isi K ;

Expand Down Expand Up @@ -283,6 +290,8 @@ LEXICON v2 !!≈ * **@CODE@** huomata, haluta övriga former !RENSAD
+V+InfMa+Abe:%>^Am^Att^A K ;

+V+Act+Cond:%>i4s 2cond ;
+V+Act+Cond+Pl1:i4s%>imm^A K ;
+V+Act+Cond+Pl3:i4s%>it K ;
+V+Pass+Cond:tt%>^Ai4s K ;

+V+Act+PrsPrc+Sg+Nom:%>^Av^A K ;
Expand Down Expand Up @@ -383,65 +392,85 @@ LEXICON ptc_obl
+Pl+Abe:%>itt^A PxK ;


LEXICON SYA !!≈ * **@CODE@** syä, myä, lyä .#.
LEXICON v3_syä !!≈ * **@CODE@** syä, myä, lyä .#.
+V+Inf:%>ä KK ;
+V+Inf:y%>ä KK ;
+V+Inf:y%>jä KK ;
:ö v3_other ;
:ö v3_inf ;

+V+InfMa:ö 3infcase ;
+V+Inf+Tra:%>^Akse PxK ;
+V+InfE+Ins:ö%>en K ; ! xxx
+V+InfE+Ine:ö%>ess^A K ;
+V+InfMa+Ill:öm^HMET2%>h^A^An K ; ! also hm

LEXICON JUA !!≈ * **@CODE@** jua, lua, sua, tua .#.
LEXICON v3_jua !!≈ * **@CODE@** jua, lua, sua, tua .#.
+V+Inf:%>a KK ;
+V+Inf:o%>a KK ;
+V+Inf:o%>ja KK ;
:o v3_other ;
:o v3_inf ;

+V+InfMa:o 3infcase ;
+V+InfMa+Ill:om^HMET2%>h^A^An K ; ! also hm
+V+Inf+Tra:%>j^Akse PxK ;
+V+InfE+Ins:%>jen K ;
+V+InfE+Ine:%>jess^A K ;
+V+InfMa+Ill:om^HMET2%>h^A^An K ; ! also hm

LEXICON v3_saaa
LEXICON v3_ja !for inf with ’a; saaja !!HOW to solve this?
+V+Inf:’a K ;
+V+InfE+Ine:%>’essa K ;
+V+Pass+PrfPrc+Pl+Nom:%>’ut K ;
v3_j ;

LEXICON v3_jä !for inf with ’ä; viejä !!HOW to solve this with ^A?
+V+Inf:’ä K ;
+V+InfE+Ine:%>’essä K ;
+V+Pass+PrfPrc+Pl+Nom:%>’yt K ;
v3_j ;
+V+Act+Ind+Prs+ConNeg+Sg:^HMETA%>i3s K ;

LEXICON v3_j !!≈ * **@CODE@**
+V+Inf:%>j^A KK ;

!+V+Inf:’%>^A KK ; !not working, why?
v3_other ;
v3_inf ;
+V+Act+Ind+Prt+Sg3:t%>i3 K ; !CHECK
+V+Act+Ind+Prs+ConNeg+Sg:^HMETA%>i3s K ; !CHECK!
!+V+Act+Ind+Prt+Sg3:t%>i3 K ; !CHECK
!+V+InfMa: 3infcase ;
+V+InfMa+Ill:%>^HMETAmh^A^An K ; !
+V+InfMa+Ine:%>m^Ass^A K ;
+V+InfMa+Ela:%>m^Ast^A K ;
+V+InfMa+Ade:%>m^Al^A K ; !-la!
+V+InfMa+Abe:%>m^Att^A K ;

+V+InfMa+Ill:h%>m^A^An K ; !viehmään en gång
!+V+InfMa+Ill:m^HMET2%>h^A^An K ; ! HÄR 3 ggr
+V+Inf+Tra:%>j^Akse PxK ;
+V+InfE+Ins:%>jen K ;
+V+InfE+Ins:%>’en K ;
+V+InfE+Ine:%>jess^A K ;

LEXICON v3 !!≈ * **@CODE@**
v3_inf ;
+V+InfMa: 3infcase ;
v3_other ;

LEXICON v3_inf
+V+InfMa: 3infcase ;
LEXICON v3_viä !!≈ * **@CODE@**
+V+Inf:ä KK ;
:e v3_j ;

!LEXICON v3_inf
!+V+InfMa: 3infcase ;

LEXICON v3_other !RENSAD
+V+Act+Ind+Prs+Sg1:%>n K ;
+V+Act+Ind+Prs+Sg2:%>t K ;
+V+Act+Ind+Prs+Sg3: K ;
+V+Act+Ind+Prs+Sg3:%>pi K ;
+V+Act+Ind+Prs+Sg3+Use/NG:%>pii K ;
+V+Act+Ind+Prs+Sg3:%>pii K ;
+V+Act+Ind+Prs+Pl1:%>m^A K ;
+V+Act+Ind+Prs+Pl2:%>tt^A K ;
+V+Act+Ind+Prs+Pl3:%>v^A K ;
+V+Act+Ind+Prs+Pl3+Err/Orth:%>v^At K ;
+V+Pass+Ind+Prs:%^WG%>th^A^An K ;
+V+Pass+Ind+Prs:%^WG%>h^A^An K ; !NY
+V+Pass+Ind+Prs+ConNeg:%>^A K ;

+V+Act+Ind+Prt+Sg1:%>i3n K ;
Expand All @@ -454,24 +483,28 @@ LEXICON v3_other !RENSAD
+V+Pass+Ind+Prt+ConNeg:%>t^U K ;

+V+Act+PrsPrc:%>v^A x3 ;
+V+Pass+PrsPrc:%>tt^Uv^A x3 ;
+V+Pass+PrsPrc+Sg+Nom:%>t^Av^A K ;
+V+Pass+PrsPrc+Pl+Nom:%>t^Av^At K ;

+V+Act+PrfPrc+Sg+Nom:%>^N^U K ;
+V+Act+PrfPrc:%>h^Nee x3_oblique ;

+V+Act+PrfPrc+Sg+Nom:%>n^U K ;
+V+Act+PrfPrc+Pl+Nom:%>n^HMET2%>heet K;
+V+Pass+PrfPrc+Sg+Nom:%>t^U K ;
+V+Pass+PrfPrc:%>thvee x3_oblique ;
+V+Pass+Cond:%>i4si K ;
+V+Pass+PrfPrc+Pl+Nom:%>t^Ut K ;
+V+Pass+PrfPrc+Pl+Nom:%>^Ut K ;
+V+Pass+Cond:%>i3s K ;

+V+Imprt+Sg2: # ;
+V+Imprt+Sg:%>kh^O^On # ;
+V+Imprt+Pl2:%>kh^A^A # ;
+V+Imprt+Pl3:%>kh^O^Ot # ;
+V+Act+Ind+Prs+ConNeg: K ;

+V+Act+Cond:%>is 2cond ;
+V+Act+Cond:%>i3s 2cond ; !NY
+V+Act+Cond+Pl1:%>i3s%>im^A K ;
+V+Act+Cond+Pl3:%>i3s%>it K ;

+V+Der+Der/minen+N:mi xnen ;

Expand All @@ -486,7 +519,7 @@ LEXICON v3_kaya !!≈ @CODE@ käyđä:kä from fkv
+V+Act+Ind+Prs:y^WG v12pers_short ;
+V+Act+Ind+Prt:v%>i3^WG v12pers_short ;
+V+Act+Ind+Prs+Sg3:y%>pi K ;
+V+Act+Ind+Prs+Sg3+Use/NG:y%>pii K ;
+V+Act+Ind+Prs+Sg3:y%>pii K ;
+V+Act+Ind+Prs+Pl3:y%>hään K ; ! đ
+V+Act+Ind+Prs+Pl3+Err/Orth:y%>hään K ; ! d
+V+Act+Ind+Prt+Sg3:v%>i3 K ;
Expand All @@ -508,8 +541,8 @@ LEXICON v3_kaya !!≈ @CODE@ käyđä:kä from fkv


+V+Act+Cond:v%>i4s 2cond ;

+V+Act+Cond+Pl3:y%>t^A%>i4s K ;
+V+Act+Cond+Pl1:v%>i4s%>im^A K ;
+V+Act+Cond+Pl3:y%>t^A%>i4s K ; !CHECK!
+V+Pass+Cond:y%>t^A%>i4s K ;

+V+Act+Imprt+Sg2:y K ;
Expand Down Expand Up @@ -557,7 +590,8 @@ LEXICON v3_nahha !!≈ @CODE@ nähđä:nä = from fkv
+V+Act+Ind+Prs+ConNeg:e K ;

+V+Act+Cond:%>kis 2cond ;
+V+Act+Cond+Pl3:%>htäis K ;
+V+Act+Cond+Pl1:%>kis%>im^A K ;
+V+Act+Cond+Pl3:%>htäis K ; !CHECK!

+V+Pass+Cond:%>htäis K ;

Expand Down Expand Up @@ -606,6 +640,8 @@ LEXICON v3_tehha !!≈ @CODE@ tehđä:te from fkv
+V+Act+Ind+Prs+ConNeg:he K ;

+V+Act+Cond:k%>i4s 2cond ;
+V+Act+Cond+Pl1:k%>i4s%>imm^A K ;
+V+Act+Cond+Pl3:k%>i4s%>it K ;
+V+Pass+Cond:htä%>i4s K ;

+V+Act+Imprt+Sg2:he K ;
Expand Down Expand Up @@ -681,6 +717,8 @@ LEXICON v4 !!≈ * **@CODE@**
+V+Act+Ind+Prt+Pl3:%>iv^A K ;
+V+Act+Ind+Prt+Pl3+Err/Orth:%>thiin K ; !CHECK GEO
+V+Act+Cond:%>i4s 2cond ;
+V+Act+Cond+Pl1:%>i4s%>imm^A K ;
+V+Act+Cond+Pl3:%>i4s%>it K ;

+V+Der+Der/minen+N:emi xnen ;

Expand Down Expand Up @@ -741,6 +779,8 @@ LEXICON v4_julkasta !!≈ * **@CODE@**
+V+Act+Ind+Prt+Pl3+Err/Orth:%>thiin K ; !CHECK! GEO

+V+Act+Cond:%>i4s 2cond ;
+V+Act+Cond+Pl1:%>i4s%>imm^A K ;
+V+Act+Cond+Pl3:%>i4s%>it K ;

+V+Der+Der/minen+N:emi xnen ;

Expand Down Expand Up @@ -801,6 +841,8 @@ LEXICON v4_3la !!≈ * **@CODE@** varjela:varjel
+V+Act+Ind+Prt+Pl3:%>i3t K ;

+V+Act+Cond:%>i4s 2cond ;
+V+Act+Cond+Pl1:%>i4s%>im^A K ;
+V+Act+Cond+Pl3:%>i4s%>it K ;

+V+Der+Der/minen+N:emi xnen ;

Expand Down Expand Up @@ -857,6 +899,8 @@ LEXICON v4_4lla !!≈ * **@CODE@**
+V+Act+Ind+Prt+Pl3:%>i3t K ;

+V+Act+Cond:%>i4s 2cond ;
+V+Act+Cond+Pl1:%i4s%>imm^A K ;
+V+Act+Cond+Pl3:%>i4s%>it K ;

+V+Der+Der/minen+N:emi xnen ;

Expand Down Expand Up @@ -915,7 +959,8 @@ LEXICON v5 !!≈ * **@CODE@** kehitä:kehi
+V+Act+Ind+Prt+Pl2:t%>itt^A K ;
+V+Act+Ind+Prt+Pl3:t%>it K ;
+V+Act+Cond:t%>^A%>i4s 2cond ;

+V+Act+Cond+Pl1:t%>^A%>i4s%>imm^A K ;
+V+Act+Cond+Pl3:t%>^A%>i4s%>it K ;
+V+Der+Der/minen+N:t%>^Ami xnen ;


Expand Down Expand Up @@ -968,6 +1013,8 @@ LEXICON v6 !!≈ * **@CODE@** = paeta:pake
+V+Act+Ind+Prt+Pl3:n%>it K ;

+V+Act+Cond:%>ni4s 2cond ;
+V+Act+Cond+Pl1:%>ni4s%>imm^A K ;
+V+Act+Cond+Pl3:%>ni4s%>it K ;

+V+Der+Der/minen+N:nemi xnen ;

Expand All @@ -979,8 +1026,8 @@ LEXICON 2cond !!≈ **@CODE@** kehitä:kehi
+Sg1:%>in K ; ! kävisin
+Sg2:%>it K ;
+Sg3: K ;
+Sg3:%>i K ;
+Pl1:%>imm^A K ;
!+Sg3:%>i K ; !CHECK! Not for v3_j iaf
!+Pl1:%>imm^A K ;
+Pl2:%>itt^A K ;
+Pl3:%>iv^A K ;

Expand Down
Loading

0 comments on commit 2ad2268

Please sign in to comment.