Skip to content

Commit

Permalink
Endra RAFI til -RAFI, fordi bare cmp skal dit. La til sti til -heapme…
Browse files Browse the repository at this point in the history 
… og -huvvat, og bygde om GADDILONG til RAFI, med sti til -RAFI. Fra RAFI går nå ellers bare stier til Der/Comp og Der/Superl. La til Gen+Allegro med -e (tidligere var det ikke endring i stammevokal), men som Err/Orth.
  • Loading branch information
@leneantonsen
leneantonsen committed Feb 18, 2024
1 parent 303184e commit 1e382e6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 51 deletions.
49 changes: 16 additions & 33 deletions src/fst/morphology/affixes/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,28 +888,6 @@ LEXICON VALDI !!≈ * **@CODE@** words on -váldi. Short nom-compound-forms, lon
DenominalNounsV ;


LEXICON RAFI !!≈ * **@CODE@** words on -ráfi. Long nom-compound-forms, long gen. short heapmi-caritive
:%> GOAHTILONGCMP ;
+Sg+Nom: K ;
+Sg+Nom:%> NPx3Vflag ;
+Sg+Gen+Allegro+Use/NG: K ;
+Der+Der/viđá+Adv+Use/-PLX:»X7viđá K ;
+Der+Der/viđi+Adv+Use/-PLX:»X7viđi K ;
:%> EssV ;
:%>X2 GOAHTA- ; ! Px sublexicon
:%>X3 GOAHTAI ; ! Ill sublexicon
+Err/Orth:%> GOAHTAI ; ! Ill sublexicon ráfii
:%>X4 GOADI- ; ! weak grade decl
! +Err/Orth:%>X5 GODII- ; ! weak gr dipth simpl
:%>%^DISIMP GODII- ; ! weak gr dipth simpl
:%>X6 GOADA- ; ! AG Px
+Cmp/SgGen+Err/Orth:%>X8 R ; ! !Note! Same entry under GOADE-
! +Sg+Gen:%>X8 K ; ! ^NG^
! DenominalAdjsV1Short ;
DenominalAdjsV2 ;
DenominalNounsV ;


LEXICON LOTLOHKU !!≈ * **@CODE@** words on -lotlohku. Long/SHORT nom-compound-forms, long gen.
:%> GOAHTILONGCMP ;
:%> GOAHTICMP ;
Expand Down Expand Up @@ -1388,27 +1366,32 @@ LEXICON RIDDU !!≈ * **@CODE@** Bisyll. V-Nouns with Comparative Forms. Short
DenominalAdjsV1Long ;
! DenominalAdjsV2 ;

LEXICON RAFI !!≈ * **@CODE@** ráfit, ráfimus
+Der2+Der/Comp+A:%>X4b BUStem ;
+Der2+Der/Superl+A:%>X4muss BUOREMUS ;
-RAFI ;


LEXICON GADDILONG !!≈ * **@CODE@** long compound forms, short -heapme
LEXICON -RAFI !!≈ * **@CODE@** words on -ráfi. Long nom-compound-forms, long gen. short heapmi-caritive
:%> GOAHTILONGCMP ;
+Sg+Nom: K ;
+Sg+Nom:%> NPx3Vflag ;
+Der+Der/viđá+Adv+Use/-PLX:»viđá K ;
+Der+Der/viđi+Adv+Use/-PLX:»viđi K ;
+Sg+Gen+Allegro+Err/Orth:%>X7 K ;
+Der+Der/viđá+Adv+Use/-PLX:»X7viđá K ;
+Der+Der/viđi+Adv+Use/-PLX:»X7viđi K ;
:%> EssV ;
:%>X2 GOAHTA- ; ! Px sublexicon
:%>X3 GOAHTAI ; ! Ill sublexicon
+Err/Orth:%> GOAHTAI ; ! Ill sublexicon
+Err/Orth:%> GOAHTAI ; ! Ill sublexicon ráfii
:%>X4 GOADI- ; ! weak grade decl
! +Err/Orth:%>X5 GODII- ; ! weak gr dipth simpl
:%>%^DISIMP GODII- ; ! weak gr dipth simpl
:%>X6 GOADA- ; ! AG Px
+Cmp/SgGen+Err/Orth:%>X8 R ; ! !Note! Same entry under GOADE-
+Der2+Der/Comp+A:%>X4b BUStem ;
+Der2+Der/Superl+A:%>X4muss BUOREMUS ;
! DenominalAdjsV1Short ;
! DenominalAdjsV2 ;
! DenominalNounsV ;
+Cmp/SgGen+Err/Orth:%>X7 R ; !
! +Sg+Gen:%>X8 K ; ! ^NG^
DenominalAdjsV2 ;
DenominalNounsV ;
DenominalAdjsV1 ;


LEXICON GADDILONGSHORT !!≈ * **@CODE@** NB! No SgIll and SgLoc (not directed to GOADI-, GODII- or GOAHTAI) because *davvi* is the only word this far Bisyll. V-Nouns with Comp. Forms, long-short nomcmp, long gencmp
:%> GOAHTILONGCMP ;
Expand Down
36 changes: 18 additions & 18 deletions src/fst/morphology/stems/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3180,6 +3180,8 @@ LEXICON Noun !!= * **@CODE@** dividing in NounNoPx, NounPx (with a P.Px.add fla

LEXICON NounNoPx !!= * **@CODE@** here goes nouns not taking Px.

álli+N+Sem/Dummytag:álli VALDI ;
álli+N+G3+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:álºli AIGI-I ;
haida+N+Sem/Hum:haida STAHTA ;
tlingit+N+Sem/Hum:tlingit9 GAHPIR ;
borderline+N+Sem/State-sick:borderline GOAHTI ;
Expand Down Expand Up @@ -4266,7 +4268,7 @@ ruvkeindustriija+N+CmpN/SgN+CmpN/PlG+Sem/Org:ruvke#indu^stri IIJA ;
rádiologiija+N+Err/Orth-a-á+Sem/Domain:radiologi IIJA ;
rádiologiija+N+Sem/Domain:rádiologi IIJA ;
ráffi+N+G7+Sem/Obj-clo:ráffi¤ AIGI-I ;
ráfi+N+Sem/State:ráfi GADDILONG ;
ráfi+N+Sem/State:ráfi RAFI ;
rámmadirektiiva+N+Sem/Dummytag:rámma#direkt IIVA ;
rápmadirektiiva+N+Sem/Dummytag:rápma#direkt IIVA ;
ráŋggáštanriekteteoriija+N+Sem/Dummytag:ráŋggáštan#riekte#te^ori IIJA ;
Expand Down Expand Up @@ -8700,7 +8702,7 @@ barganeaktu+N+Sem/Semcon:bargan#eakºtu GOAHTI-U ;
bargangeatnegasvuohta+N+CmpN/SgG+Sem/Rule:bargan#geatnegasvuohºta LUONDU ;
barganjoavku+N+CmpN/SgN+CmpN/PlG+Sem/Group_Hum:bargan#joavºku GOAHTI-U ;
barganmiella+N+CmpN/SgN+Sem/Perc-emo:bargan#miella GOAHTI-A ;
barganráfi+N+CmpN/SgN+Sem/State:bargan#ráfi RAFI ;
barganráfi+N+CmpN/SgN+Sem/State:bargan#ráfi -RAFI ;
bargansadji+N+Sem/Pos:bargan#sadºji ALBMI ;
barganvuohki+N+Sem/Feat:bargan#vuohºki AIGI-I ;
barganáigi+N+CmpN/SgN+CmpN/SgG+Sem/Time:bargan#ájºgi AIGI-I ;
Expand Down Expand Up @@ -9130,7 +9132,7 @@ bargoreaisu+N+Sem/Act:bargo#reajºsu GOAHTI-U ;
bargoriekti+N+Sem/Rule:bargo#riekºti ALBMI ;
bargoruhta+N+Sem/Money:bargo#ruhºta GOAHTI-A ;
bargorutiidna+N+Sem/Act:bargo#rut ADRENALIN ;
bargoráfi+N+CmpN/SgN+Sem/State:bargo#ráfi RAFI ;
bargoráfi+N+CmpN/SgN+Sem/State:bargo#ráfi -RAFI ;
bargoráidalas+N+Sem/Dummytag:bargo#ráidalass JOHTOLAT ;
bargoráidaras+N+Sem/Dummytag:bargo#ráidarass JOHTOLAT ;
bargoráidu+N+Sem/Act_Group:bargo#rájºdu GOAHTI-U ;
Expand Down Expand Up @@ -22534,7 +22536,7 @@ dálueamitskuvla+N+Sem/Org:dálu#eamit#skuvºla GOAHTI-A ;
dáluisit+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:dálu#isid GAHPIRLONG ;
dáluolmmoš+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:dálu#olbmož FALIS ;
dáluolmmái+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:dálu#olbmáj FALIS ;
dáluráfi+N+CmpN/SgN+Sem/State:dálu#ráfi RAFI ;
dáluráfi+N+CmpN/SgN+Sem/State:dálu#ráfi -RAFI ;
dáluássi+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:dálu#ássi¤ ACTOR ;
dálvadas+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:dálvadass JOHTOLAT ;
dálveadjágas+N+CmpN/SgN+CmpN/SgG+Sem/Time:dálve#adjágass JOHTOLAT ;
Expand Down Expand Up @@ -23859,7 +23861,7 @@ eallinpoliisa+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Group_Hum:eallin#polijºsa GOAHTI
eallinreantu+N+Sem/Money:eallin#reanºtu ALBMI ;
eallinruhta+N+Sem/Money:eallin#ruhºta GOAHTI-A ;
reaidnaruhta+N+Sem/Money:reaidna#ruhºta GOAHTI-A ;
eallinráfi+N+Sem/State:eallin#ráfi RAFI ;
eallinráfi+N+Sem/State:eallin#ráfi -RAFI ;
eallinráva+N+Sem/Dummytag:eallin#rávvag8 SEAMU ;
eallinsadji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:eallin#sadºji ALBMI ;
eallinstandárda+N+Sem/Dummytag:eallin#standárºda GOAHTI-A ;
Expand Down Expand Up @@ -35858,7 +35860,7 @@ govdafierpmádatdilli+N+Sem/State:govda#fierpmádat#dilli ALBMILONGSHORT ;
guohtonriekti+N+Sem/Rule:guohton#riekºti GOAHTI-I ;
guohtonrihkkun+CmpN/SgN:guohton#rihkkum BOAHTIN ;
guohtonriidu+N+Sem/Act:guohton#rijºdu ALBMI ;
guohtonráfi+N+CmpN/SgN+Sem/State:guohton#ráfi RAFI ;
guohtonráfi+N+CmpN/SgN+Sem/State:guohton#ráfi -RAFI ;
guohtonráfáidahttin+CmpN/SgN:guohton#ráfáidahttim BOAHTIN ;
guohtonráfáiduhttin+CmpN/SgN:guohton#ráfáiduhttim BOAHTIN ;
guohtonsadji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:guohton#sadºji ALBMI ;
Expand Down Expand Up @@ -35948,7 +35950,7 @@ guohtunresursadilli+N+Sem/State:guohtun#resursa#dilli ALBMILONGSHORT ;
guohtunriekti+N+Sem/Rule:guohtun#riekºti GOAHTI-I ;
guohtunrihkkun+CmpN/SgN:guohtun#rihkkum BOAHTIN ;
guohtunriidu+N+Sem/Act:guohtun#rijºdu ALBMI ;
guohtunráfi+N+CmpN/SgN+Sem/State:guohtun#ráfi RAFI ;
guohtunráfi+N+CmpN/SgN+Sem/State:guohtun#ráfi -RAFI ;
guohtunráfáidahttin+CmpN/SgN:guohtun#ráfáidahttim BOAHTIN ;
guohtunráfáiduhttin+CmpN/SgN:guohtun#ráfáiduhttim BOAHTIN ;
guohtunsadji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:guohtun#sadºji ALBMI ;
Expand Down Expand Up @@ -41655,7 +41657,7 @@ idjaloddi+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Ani:idja#loddi AIGI-I ;
idjamárkanat+N+CmpN/SgN+Sem/Event:idja#márkan ALIMAT ;
idjamátkkošteapmi+N+CmpN/SgN:idja#mátkkošt EAPMI_default_sem ;
idjanagir+N+Sem/State:idja#nahºkir MALISLONG ;
idjaráfi+N+CmpN/SgN+Sem/State:idja#ráfi RAFI ;
idjaráfi+N+CmpN/SgN+Sem/State:idja#ráfi -RAFI ;
idjarávga+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:idja#rávºga GOAHTI-A ;
idjarávgaovddasteaddji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:idja#rávga#ovddast EADDJI-NomAg ;
idjasadji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:idja#sadºji ALBMI ;
Expand Down Expand Up @@ -44936,7 +44938,7 @@ juovlaruohtaeahket+N+CmpN/SgN+CmpN/SgG+Sem/Time:juovla#ruohta#eahked GAHPIR ;
juovlaruohtta+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Time:juovla#ruohtta GOAHTI-A ;
juovlaruohttabeaivi+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Time:juovla#ruohtta#beajºvi GOAHTI-I ;
juovlaruohttaeahket+N+CmpN/SgN+CmpN/SgG+Sem/Time:juovla#ruohtta#eahked GAHPIR ;
juovlaráfi+N+Sem/State:juovla#ráfi RAFI ;
juovlaráfi+N+Sem/State:juovla#ráfi -RAFI ;
juovlaráhkkaneapmi+N+CmpN/SgN:juovla#ráhkkan EAPMI_default_sem ;
eksámenráhkkaneapmi+N+CmpN/SgN:eksámen#ráhkkan EAPMI_default_sem ;
juovlaskeaŋka+N+Sem/Obj:juovla#skeaŋºka GOAHTI-A ;
Expand Down Expand Up @@ -51802,7 +51804,7 @@ luondduroassu+N+Sem/Event:luonddu#roassu GOAHTI-U ;
luondduruovttudoallu+N+Sem/Dummytag:luonddu#ruovttu#doallu GOAHTI-U ;
luondduruska+N+Sem/Dummytag:luonddu#rusºka GOAHTI-A ;
luondduráfehuhttin+CmpN/SgN:luonddu#ráfehuhttim BOAHTIN ;
luondduráfi+N+CmpN/SgN+Sem/State:luonddu#ráfi RAFI ;
luondduráfi+N+CmpN/SgN+Sem/State:luonddu#ráfi -RAFI ;
luondduráfi+N+Err/Orth+Sem/State:luonddu#ráffi¤ GOAHTI-I ;
ráfi+N+Err/Orth+Sem/State:rafi RAFI ;
luonddusealli+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Ani:luonddus#ealli¤ ACTOR ;
Expand Down Expand Up @@ -55193,7 +55195,7 @@ miellajohtalus+N+Sem/Act:miella#johtaluss JOHTOLAT ;
miellajohtolat+N+Sem/Act:miella#johtolahºk JOHTOLAT ;
miellaláhki+N+Sem/Dummytag:miella#láhºki LAHKI ;
miellamáššu+N+Sem/Dummytag:miella#máššu AIGI ;
miellaráfi+N+CmpN/SgN+Sem/State:miella#ráfi RAFI ;
miellaráfi+N+CmpN/SgN+Sem/State:miella#ráfi -RAFI ;
miellaráfihisvuohta+N+CmpN/SgG+Sem/Feat:miella#ráfihisvuohºta LUONDU ;
miellasuvvan+CmpN/SgN:miellasuvvam BOAHTALADDAN ;
miellavádjet+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:miella#vádjed GAHPIR ;
Expand Down Expand Up @@ -63671,7 +63673,7 @@ oađđenlatnja+v1+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Build-room:oađđen#latnja GO
oađđenlatnja+v2+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Build-room:oađđin#latnja GOAHTI-A ;
oađđenloavdda+N+Sem/Obj-clo:oađđen#loavºdag8 SEAMU ;
oađđenloavdda+N+Sem/Obj-clo:oađđin#loavºdag8 SEAMU ;
oađđenráfi+N+Sem/State:oađđen#ráfi RAFI ;
oađđenráfi+N+Sem/State:oađđen#ráfi -RAFI ;
oađđensadji+v1+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:oađđen#sadºji ALBMI ;
oađđensadji+v2+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:oađđin#sadºji ALBMI ;
heaŋgaoađđensadji+v1+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:heaŋga#oađđen#sadºji ALBMI ;
Expand Down Expand Up @@ -63699,7 +63701,7 @@ oađđinduollji+N+Sem/Obj-clo:oađđin#duollji GOAHTI-I ;
oađđindálkkas+N+Sem/Food-med:oađđin#dálºkas MALIS ;
oađđindárbu+N+Sem/Perc-phys:oađđin#dárºbu ALBMI ;
oađđinjietna+N+Sem/Prod-audio:oađđin#jietna GOAHTI-A ;
oađđinráfi+N+Sem/State:oađđin#ráfi RAFI ;
oađđinráfi+N+Sem/State:oađđin#ráfi -RAFI ;
oađđinsále+N+Sem/Build-room:oađđin#sále GOAHTI ;
oađđinsálla+N+Sem/Build-room:oađđin#sálla GOAHTI-A ;
oađđinvovdna+N+Sem/Veh:oađđin#vovdna GOAHTI-A ;
Expand Down Expand Up @@ -65303,7 +65305,7 @@ orjjelsámegiella+N+Sem/Lang:orjjel#sáme# XGIELLA ;
orjjelsápmi+N+CmpN/SgG+CmpN/PlG+Sem/Hum_Lang:orjjel#sápmi SAPMI ;
orjješbiegga+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Wthr:orjješ#biegga GOAHTI-A ;
orjješdavvebiegga+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Wthr:orjješ#davve#biegga GOAHTI-A ;
orjješdavvi+N+Err/Orth+Sem/Dummytag:oarješ#davvi GADDILONG ;
orjješdavvi+N+Err/Orth+Sem/Dummytag:oarješ#davvi LULLI ;
orjješmáttabiegga+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Wthr:orjješ#mátta#biegga GOAHTI-A ;
orjješdavvi+N+Sem/Dummytag:orjješ#davvi LULLI ;
orjješdavábealli+N+Sem/Plc+Sg+Nom+Err/Orth:orjješ#davá#bealle K ;
Expand Down Expand Up @@ -75096,7 +75098,7 @@ sieludilli+N+Sem/State:sielu#dilli ALBMILONGSHORT ;
sielueallin+CmpN/SgN:sielu#eallim BOAHTIN ;
sielumoraš+N+Sem/Perc-emo:sielu#morraš MALIS ;
sielumorašteaddji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:sielu#morašt EADDJI-NomAg ;
sieluráfi+N+Sem/State:sielu#ráfi RAFI ;
sieluráfi+N+Sem/State:sielu#ráfi -RAFI ;
sielusorbmejeaddji+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:sielu#sorbmej EADDJI-NomAg ;
siema+N+Sem/Plantpart:siepman8 BEANA ;
siemagoahti+N+Sem/Build:siema#goahºti AIGI-I ;
Expand Down Expand Up @@ -85792,7 +85794,7 @@ viessopolitihkka+N+Sem/Act:viesso#politihkka GOAHTI-A ;
viessoprojeakta+N+Sem/Act:viesso#projeakºta GOAHTI-A ;
viessoprošeakta+N+Sem/Act:viesso#prošeakºta GOAHTI-A ;
viessoriedja+N+Sem/Dummytag:viesso#riedºja GOAHTI-A ;
viessoráfi+N+CmpN/SgN+Sem/State:viesso#ráfi RAFI ;
viessoráfi+N+CmpN/SgN+Sem/State:viesso#ráfi -RAFI ;
viessorássi+N+CmpN/SgN+CmpN/SgG+Sem/Plant:viesso#rássi AIGI-I ;
viessosadjehaddi+N+Sem/Money:viesso#sadje#haddi AIGI-I ;
viessosadjeláigoheapmi+N+CmpN/SgN:viesso#sadje#láigoh EAPMI_default_sem ;
Expand Down Expand Up @@ -91453,7 +91455,6 @@ nuolesvuohta+N+Err/Orth+Sem/State:nuolisvuohºta LUONDU ;
állat+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Ani:állah GAHPIR ;
állat+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Use/NG+Sem/Ani:állap GAHPIR ;
állegeađgi+N+Sem/Obj:álle#geađºgi AIGI-I ;
álli+N+Sem/Dummytag:álli VALDI ;
állu+N+CmpN/SgN+CmpN/SgG+Sem/Plant:állu GOAHTI-U ;
álmmas+N+Sem/Dummytag:álbmas MALIS ;
álon+N+Sem/Dummytag:álon GAHPIR ;
Expand Down Expand Up @@ -98499,7 +98500,6 @@ vázzinjorrit+N+CmpN/SgN+Sem/Dummytag:vázzin#jorºri BUVSSAT ;
álgoálbmotášši+N+Sem/Semcon:álgo#álbmot#ᚺši ALBMI ;
álgoášši+N+Sem/Semcon:álgo#ᚺši ALBMI ;
álgošaddansealla+N+Sem/Body:álgo#šaddan#sealºla GOAHTI-A ;
álli+N+G3+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Plc:álºli AIGI-I ;
ámtamánni+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:ámta# MANNI ;
ámtamánni+N+Err/Orth-nom-gen+Sem/Hum:ámtta# MANNI ;
ántamánni+N+CmpN/SgN+CmpN/SgG+CmpN/PlG+Sem/Hum:ánta# MANNI ;
Expand Down

0 comments on commit 1e382e6

Please sign in to comment.