Skip to content

Commit

Permalink
Uppdaterad dokumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
linalejdebro committed Jul 9, 2024
1 parent d611080 commit 2826e43
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 65 deletions.
8 changes: 4 additions & 4 deletions src/fst/morphology/affixes/nouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ LEXICON 3x_ue_sg
+Sg+Par:t%>t^A PxK ;
+Sg+Ill:t%>hee n_PxK ;
+Sg+Ine:e%>ss^A PxK ;
+Sg+Ine+Err/Orth:ve%>ss^A PxK ; !CHECK!
+Sg+Ine+Err/Orth:ve%>ss^A PxK ;
+Sg+Ela:e%>st^A PxK ;
+Sg+All:e%>lle PxxK ;
+Sg+Ade:e%>ll^A PxK ;
Expand Down Expand Up @@ -1027,19 +1027,19 @@ LEXICON xnas_pl
+Pl+Abe:^HMETA%>h^Vitt^A PxK ;
+Pl+Abe:^HMET2%>h^Vitt^A PxK ;

LEXICON nas_h ! saappas !CHECK ELINA ser nas rätt ut? Fler såna här?
LEXICON nas_h ! saappas !CHECK EK ser rätt ut?
!! **LEXICON @LEXNAME@**
nas_h_sg ;
nas_h_pl ;

LEXICON nas_h_sg ! saaphaat !CHECK ELINA ser nas rätt ut? Fler såna här?
LEXICON nas_h_sg ! saaphaat !CHECK EK
!! **LEXICON @LEXNAME@**
+N: xnas_sg ;
+N+Sg+Nom:^WGs R ;
+N+Sg+Gen:%>^Vn R ;
+N+Sg+Nom:^HMETA%>h^V^V t_PxK ;

LEXICON nas_h_pl ! saaphaat !CHECK ELINA ser nas rätt ut? Fler såna här?
LEXICON nas_h_pl ! saaphaat !CHECK EK
!! **LEXICON @LEXNAME@**
+N: xnas_pl ;
+N+Pl+Nom:^HMETA%>h^V^V t_PxK ;
Expand Down
76 changes: 36 additions & 40 deletions src/fst/morphology/affixes/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@

!! ## Overview over the continuation classes

!! ### Overview over the Regular verbs
!! * v1 = antaa; sanoa:sano
!! * v1_tietaa = tietää:ti
!! * v1_odd = odd-syll-stem, like v1 except PrfPrc+Sg: tapahtua>tapahtunnu
!! * v2_ata = masinata:masina (+^A i Sg3, InfMa+Ade masinaamala)
!! * v2_ata_odd = huomata, tryykätä:tryykkä (+^A i Sg3, InfMa+Ade huomaamalla)!! * v2_uta = leipota:leippo (+^A^A i Sg3)
!! * v2 = continuationlexicon for v2_ata, v2_ata_odd and v2_uta
!! * v3 = myyta:myy
!! * v3_j = viejä, saaja
!! * v4 = nousta; tulla:tul
!! * v4_3la = varjela, varjelee
!! * v4_4lla = ajatella, ajattellee
!! * v5 = tarvita:tarv
!! * v6 = paeta:pake
!! * v_vanheta = vanheta
!! * vx = unassigned

!! ### Overview over the Irregular verbs
!! * OLLA = olla:olla
!! * 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

!! ### Continuation lexica for regular verbs
!! * **v1** = antaa-type; sanoa:sano
!! * **v1_tietaa** = tietää:ti
!! * **v1_odd** = odd-syll-stem, like v1 except PrfPrc+Sg: tapahtua>tapahtunnu
!! * **v2_ata** = -ata-verbs; masinata:masina (+^A i Sg3, InfMa+Ade masinaamala)
!! * **v2_ata_odd** = odd-syll -ata-verbs; huomata, tryykätä:tryykkä (+^A i Sg3, InfMa+Ade huomaamalla)
!! * **v2_uta** = Vta-verbs; leipota:leippo (+^A^A i Sg3)
!! * **v2** = continuationlexicon for v2_ata, v2_ata_odd and v2_uta
!! * **v3** = syö'ä:syö
!! * **v4** = nousta; tulla:tul
!! * **v4_3la** = varjela, varjelee
!! * **v4_4lla** = ajatella, ajattellee
!! * **v5** = tarvita:tarv
!! * **v6** = paeta:pake
!! * **v_vanheta** = vanheta
!! * **vx** = unassigned

!! ### Continuation lexica for irregular verbs
!! * **v3_tehha**
!! * **v3_nahha**
!! * **v3_kaya**
!! * **OLLA**
!! * **NEG**
!! * **v3_jua** ! No juoJa-form, stem ju-, otherwise like v3
!! * **v3_syä** ! No syöJä-form, stem sy-, otherwise like v3
!! ## The verb lexica themselves


Expand All @@ -46,7 +46,7 @@ LEXICON OLLA !!≈ * **@CODE@**
+V+Act+Ind+Prs+Sg1:olen K ;
+V+Act+Ind+Prs+Sg2:olet K ;
+V+Act+Ind+Prs+Sg3:oon K ;
+V+Act+Ind+Prs+Sg3+Err/Orth:soon K ; ! CHECK ELINA
+V+Act+Ind+Prs+Sg3+Err/Orth:soon K ; ! CHECK EK
+V+Act+Ind+Prs+Pl1:olema K ;
+V+Act+Ind+Prs+Pl2:oletta K ;
+V+Act+Ind+Prs+Pl3:oon K ;
Expand All @@ -59,7 +59,7 @@ LEXICON OLLA !!≈ * **@CODE@**
+V+Act+Ind+Prt+Sg3:oli K ;
+V+Act+Ind+Prt+Pl1:olima K ;
+V+Act+Ind+Prt+Pl2:olitta K ;
+V+Act+Ind+Prt+Pl3:oli K ; !CHECK ELINA fler former?
+V+Act+Ind+Prt+Pl3:oli K ; !CHECK EK fler former?

+V+Act+Cond:olis 2cond ;
+V+Act+Cond+Pl1:olis%>imm^A K ;
Expand Down Expand Up @@ -174,11 +174,11 @@ LEXICON v1_tietaa !!≈ * **@CODE@** tietää-lexicon
+V+Act+PrsPrc:e%>v^A x3 ;
+V+Pass+PrsPrc:e%>tt^Av^A x3 ;

+V+Act+PrfPrc+Sg+Nom:e%>^N^U K ; !variantform
+V+Act+PrfPrc+Sg+Nom:e%>^N^U K ;
+V+Act+PrfPrc+Sg+Nom:et%>^A^N^U K ;
+V+Act+PrfPrc+Pl+Nom:e%>hneet K ;
+V+Act+PrfPrc+Pl+Nom:e%>nheet K ; !HÄR CHECK HMET2
+V+Act+PrfPrc+Pl+Nom:et%>^Ahneet K ; !variantform
+V+Act+PrfPrc+Pl+Nom:e%>nheet K ;
+V+Act+PrfPrc+Pl+Nom:et%>^Ahneet K ;
+V+Act+PrfPrc+Pl+Nom:et%>^Anheet K ;
+V+Pass+PrfPrc+Sg+Nom:e%>tt^U K ;
+V+Pass+PrfPrc+Pl+Nom:e%>t^Ut K ;
Expand Down Expand Up @@ -206,8 +206,8 @@ LEXICON v1 !!≈ * **@CODE@** sanoa, lukea, antaa

+V+Act+Ind+Prt+Sg1:^WG%>i3n K ;
+V+Act+Ind+Prt+Sg2:^WG%>i3t K ;
+V+Act+Ind+Prt+Sg3:%>i3 K ; ! antoi, äänesti, pieksi
+V+Act+Ind+Prt+Sg3:%>i8 K ; ! anto, äänesti, pieksi !CHECK vilka??
+V+Act+Ind+Prt+Sg3:%>i3 K ;
+V+Act+Ind+Prt+Sg3:%>i8 K ;
+V+Act+Ind+Prt+Pl1:^WG%>i3m^A K ;
+V+Act+Ind+Prt+Pl2:^WG%>i3tt^A K ;
+V+Act+Ind+Prt+Pl3:^WG%>i3t K ;
Expand Down Expand Up @@ -252,14 +252,13 @@ LEXICON v1 !!≈ * **@CODE@** sanoa, lukea, antaa
+V+Pass+PrsPrc:^AE^WG%>tt^Av^A x3 ;

+V+Act+PrfPrc+Sg+Nom:%>^N^U K ;
!+V+Act+PrfPrc+Sg+Nom:%>^N^N^U K ; !CHECK EK hur göra med detta?
+V+Act+PrfPrc:%>^Nhee x3_oblique ;
+V+Act+PrfPrc+Pl+Nom:%>n^HMET2%>heet K;
+V+Pass+PrfPrc+Sg+Nom:^AE^WG%>tt^U K ;
+V+Pass+PrfPrc+Pl+Nom:^AE^WG%>tt^Ut K ;

+V+Act+Imprt+Sg2:^WG # ;
+V+Act+Imprt+Sg2+Err/Orth: # ; !armahta? CHECK ELINA
+V+Act+Imprt+Sg2+Err/Orth: # ; !armahta? CHECK EK
+V+Act+Imprt+Sg:%>kh^O^On # ;
+V+Act+Imprt+Pl2:%>k^A^A # ;
+V+Act+Imprt+Pl3:%>kh^O^Ot # ;
Expand Down Expand Up @@ -344,7 +343,7 @@ v2 ;
+V+InfMa+Ade:%>^Am^All^A K ; ! TODO -la / -lla


!LEXICON v2_uta_odd !!≈ * **@CODE@** haluta etc, Prs+Sg3 halu/aa !NOT NEEDED?
!LEXICON v2_uta_odd !!≈ * **@CODE@** haluta etc, Prs+Sg3 halu/aa !LEXICON NOT NEEDED?
!v2 ;
!+V+Act+Ind+Prs+Sg3:%>^A^A K ;
!+V+InfMa+Ade:%>^Am^Al^A K ;
Expand Down Expand Up @@ -647,8 +646,6 @@ LEXICON v3_nahha !!≈ * **@CODE@** nähä:nä
+V+Pass+Ind+Prt:h%>thiin K ;

+V+Act+Cond:%>ki4s 2cond ;
!+V+Act+Cond+Pl1:%>ki4s%>imm^A K ; !tillfälligt bort
!+V+Act+Cond+Pl3:%>htäi4s K ; !CHECK!
+V+Pass+Cond:%>htäis K ;
+V+Inf+Tra:h%>h^Akse PxK ; !
+V+Inf+Err/Orth:h%>h^A K ; !
Expand Down Expand Up @@ -743,7 +740,7 @@ LEXICON v4 !!≈ * **@CODE@** tulla, mennä etc
+V+Inf+Tra:%>^N^Akse PxK ;
+V+InfE+Ins:%>^Nen K ; !tullen
+V+InfE+Ine:%>^Ness^A K ; !tullessa, mennässä MEN noustessa ACT
+V+InfE+Ine:%>t^Ae%>ss^A K ; !CHECK! PASS
+V+InfE+Ine:%>t^Ae%>ss^A K ; !CHECK
+V+InfMa+Ill:e%>^HMETAmh^A^An K ;
+V+InfMa+Ill:e%>%^HMET2mh^A^An K ;
+V+InfMa+Ill:%>heen K ; !tulheen
Expand Down Expand Up @@ -1127,7 +1124,7 @@ LEXICON v6 !!≈ * **@CODE@** = paeta:pake
+V+InfE+Ins:^WG%>t^Aen K ;
+V+InfE+Ine:^WG%>t^Aess^A K ;
!+V+InfMa:%>nem^A 3infcase ;
+V+InfMa:ne 3infcase ; !CHECK vilken är rätt??
+V+InfMa:ne 3infcase ; !CHECK this or line above?
+V+InfMa+Ill:ne%>m^HMET2h^A^An K ; !

+V+Act+Ind+Prs+ConNeg:^WG%>t^A K ;
Expand Down Expand Up @@ -1186,7 +1183,6 @@ LEXICON 2cond !!≈ **@CODE@** for -imm^A
+Sg1:%>in K ; !
+Sg2:%>it K ;
+Sg3: K ;
!+Sg3:%>i K ; !CHECK! Not for v3_j iaf
+Pl1:%>imm^A K ;
+Pl2:%>itt^A K ;
+Pl3:%>iv^A K ;
Expand Down
9 changes: 1 addition & 8 deletions src/fst/morphology/phonology.twolc
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ t:j <=> [.#.|#:] Cns:* Vow:* i _ i WeakGrade ;

"t:l"
!! **RULE: @RULENAME@** for lt:ll
t:l <=> Vow:+ l: (%>) _ :Vow WeakGrade ; ! CHECK feb
t:l <=> Vow:+ l: (%>) _ :Vow WeakGrade ;
!Vow:+ l: (%>) _ :Vow WeakGrade [s|%> [\i2:i|\i3:i]|.#.] ; ! kulta : kullan

!! **Tests:**
Expand All @@ -318,7 +318,6 @@ t:l <=> Vow:+ l: (%>) _ :Vow WeakGrade ; ! CHECK feb
"t:n"
!! **RULE: @RULENAME@** for nt:nn
t:n <=> (Cns:*) Vow:+ [n:|n9:n] (%>) _ :Vow WeakGrade ; ! kanta : kannan
!(Cns:*) Vow:+ n: (%>) _ :Vow WeakGrade [s|%>|#] ; ! [s|%> [\i2:i|\i3:i]|.#.] ; ! CHECK feb

!! **Tests:**

Expand All @@ -328,7 +327,6 @@ t:n <=> (Cns:*) Vow:+ [n:|n9:n] (%>) _ :Vow WeakGrade ; ! kanta : kannan
"t:r"
!! **RULE: @RULENAME@** for rt:rr
t:r <=> Vow:+ r: _ :Vow WeakGrade ; ! kerta : kerran
!Vow:+ r: _ :Vow WeakGrade (%^HMET2 %>) [s|%> [\i2:i|i3:i]|.#.] ; ! CHECK feb

!! **Tests:**

Expand Down Expand Up @@ -393,7 +391,6 @@ v:0 <=> Vow v _ Vow: [%^HMETA: |%^HMET2:] ;
[.#.|#] Cns:* Vow h _ :y (Dummy:) %> (h) :y ;
[.#.|#] Cns:* Vow h _ :ä (Dummy:) %> (h) :ä ;
[.#.|#] Cns:* Vow h _ :ö (Dummy:) %> (h) :ö ;
!Vow Vow _ [l|m|n|r|v|%^N:] e: %^WG: %> h: e e : ; ! huo0ne^WG>een : huohne0>een !CHECK needed?
!Rules for metathesis type two, position 1 in Kuoppa (efter två tonande Cns)
Vow l _ [j| m|n|r|v|%^N:] Vow: %^HMET2: ; ! ilhmaa lm, lv,
Vow r _ [j| m|n |v|%^N:] Vow: %^HMET2: ; ! varhmaan, Norhjaan
Expand Down Expand Up @@ -520,7 +517,6 @@ h:0 <=> Vow [p|t|k] _ e WeakGrade ;
[.#.|Cns] Vow s :s Vow: %^HMETA: %> _ %^V: %^V: ; ! issoon
Vow h _ Vow: (%^WG:) [%^HMETA: |%^HMET2:] ;
!Cns _ Vow: [%^HMETA: |%^HMET2:] %> h ; !vanha >vanhaan ! TEST jan remove to get vanhhaan
!Vow Vow :h [l|m|n|r|v] e: %^WG: %> _ e e ; ! CHECK NEEDED?
!Rules for metathesis type two, position 1 in Kuoppa/Mantila (efter två tonande Cns)
Vow l :h [j| m|n|r|v|%^N:] Vow: %^HMET2: %> _ ; ! ilhmaa lm, lv,
Vow r :h [j| m|n |v|%^N:] Vow: %^HMET2: %> _ ; ! Norhjaan
Expand Down Expand Up @@ -892,9 +888,6 @@ UnroundedVowel (Vow) (:h) Cns:+ a: [%^HMETA:|%^HMET2:] %> h: _ [:a|i] ; ! was: :
[.#.|#|Cns] [a|e|i] (Vow:) (:h) Cns:* a: [%^HMETA:|%^HMET2:] %> (h:) _ i2: ; !saunhoin/saunhoin
[.#.|#] (Cns:*) Vow:+ Cns:+ Cns:+ Vow:+ Cns: Cns: (Cns:) a: [%^HMETA:|%^HMET2:] %> (h:) _ i2: ; !Pl+Ill för >2-syll-nouns: a>o efter två Cns (almunakka>almunakhoin) **conflict**
[.#.|#] (Cns:*) Vow:+ Cns:+ Cns:+ Vow:+ [l|n|r] a: [%^HMETA:|%^HMET2:] %> (h:) _ i2: ; !Pl+Ill för >2-syll-nouns: a>o efter lnr (ikkuna) **conflict**
! previuos right context was [:i|i2:]
![.#.|#|Cns] [a|e|i] Cns:* (:h) (Cns:) a: [%^HMETA:|%^HMET2:] %> h: _ [:i|i2:] ; !CHECK för vad??
![.#.|#] Cns:* UnroundedVowel:+ u Cns:+ Vow: (%^HMETA:|%^HMET2:) %> h _ [i2:|i3:|i8:|j|i:] ; !CHECK för vad??

!! **Tests:**

Expand Down
10 changes: 3 additions & 7 deletions src/fst/morphology/stems/nouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -9742,7 +9742,7 @@ laittomuus:laittomuu n_uus ;
kurittomuus:kurittomuu n_uus ;
mahottomuus:mahottomuu n_uus ;
varmuus:varmuu n_uus ;
evankeeljum:evankeeljum nc ; !CHECK!
evankeeljum:evankeeljum nc ;
evankeeljumi:evankeeljumi n5_troppi ;
vaanuus:vaanuu n_uus ;
morsian:morsia 3n_ime ;
Expand All @@ -9767,7 +9767,6 @@ koskuskymmen:koskuskymmen 3n_lnr ;
kämmen:kämmen 3n_lnr ;
karhunkämmen:karhun#kämmen 3n_lnr ;
vesen:vesen 3n_lnr ;
!uposen:uposen 3n_lnr ; !CHECK!
joutsen:joutsen 3n_lnr ;
jäsen:jäsen 3n_lnr ;
nilkkajäsen:nilkka#jäsen 3n_lnr ;
Expand All @@ -9782,7 +9781,6 @@ ahven:ahven 3n_lnr ;
meriahven:meri#ahven 3n_lnr ;
norjanahven:norjan#ahven 3n_lnr ;
nylkyahven:nylky#ahven 3n_lnr ;
!valkeakiven:valkeakiven nx ; !CHECK!
riven:riven 3n_lnr ;
kyven:kyven 3n_lnr ;
pillainuus:pillainuu n_uus ;
Expand All @@ -9800,8 +9798,6 @@ lehmälaijun:lehmälaiju 3n_ime ;
kesälaijun:kesälaiju 3n_ime ;
laitun:lait2u 3n_ime ;
istun:istu 3n_ime ;
!järryn:järryn nx ; !CHECK
!isämeijän:isämeijän nx ; !CHECK
turvakkao:turvakkao n1 ;
teos:teo 3n_ks ;
kangonen:kango 3nen ;
Expand Down Expand Up @@ -11610,7 +11606,7 @@ muurasmätäs:muuras#mättä nas ;
matkaeväs:matka#evä nas ;
kusieväs:kusi#evä nas ;
seiväs:seivä nas ;
varasseiväs:varas#seivä nas ; !CHECK varan-seiväs?
varanseiväs:varan#seivä nas ;
pylväs:pylvä nas ;
vuosisaaphaat:vuosisaappa nas_h_pl ;
vareksensaaphaat:vareksensaappa nas_h_pl ;
Expand Down Expand Up @@ -15497,7 +15493,7 @@ farisealainen:farisealai nen ;
covid-19 n_nomorph ;
jpg n_nomorph ;
sapatti:sapatti n5_troppi_odd ;
säänö:säänö n1 ; !CHECK plural?
säänö:säänö n1 ;
tarina:tarina n3 ;
kuolu:kuolu n1 ;
kuollu:kuollu n1 ;
Expand Down
11 changes: 5 additions & 6 deletions src/fst/morphology/stems/verbs.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
!! ## Overview over the continuation lexica

!! ### Continuation lexica for regular verbs
!! * **v1** = antaa; sanoa:sano
!! * **v1** = antaa-type; sanoa:sano
!! * **v1_tietaa** = tietää:ti
!! * **v1_odd** = odd-syll-stem, like v1 except PrfPrc+Sg: tapahtua>tapahtunnu
!! * **v2_ata** = masinata:masina (+^A i Sg3, InfMa+Ade masinaamala)
!! * **v2_ata_odd** = huomata, tryykätä:tryykkä (+^A i Sg3, InfMa+Ade huomaamalla)
!! * **v2_uta** = leipota:leippo (+^A^A i Sg3)
!! * **v2_ata** = -ata-verbs; masinata:masina (+^A i Sg3, InfMa+Ade masinaamala)
!! * **v2_ata_odd** = odd-syll -ata-verbs; huomata, tryykätä:tryykkä (+^A i Sg3, InfMa+Ade huomaamalla)
!! * **v2_uta** = Vta-verbs; leipota:leippo (+^A^A i Sg3)
!! * **v2** = continuationlexicon for v2_ata, v2_ata_odd and v2_uta
!! * **v3** = syö'ä:syö ! ', ’
!! * **v3** = syö'ä:syö
!! * **v4** = nousta; tulla:tul
!! * **v4_3la** = varjela, varjelee
!! * **v4_4lla** = ajatella, ajattellee
!! * **v2** = tryykätä:tryykkä
!! * **v5** = tarvita:tarv
!! * **v6** = paeta:pake
!! * **v_vanheta** = vanheta
Expand Down

0 comments on commit 2826e43

Please sign in to comment.