Skip to content

Commit

Permalink
Work with nouns: re-establishing original continuation lexica where e…
Browse files Browse the repository at this point in the history 
…ach type is treated separately.
  • Loading branch information
@rueter
rueter committed Feb 18, 2024
1 parent c63eca4 commit 9c15148
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 25 deletions.
60 changes: 42 additions & 18 deletions src/fst/morphology/affixes/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1128,14 +1128,14 @@ LEXICON N_ĀNKAŖ-PL !!≈ * **@CODE@** ānkaŗ:ānkaŗ 240
N_TARĪĻ-PL ;

LEXICON N_VIRPÕĻ !!≈ * **@CODE@** virpõļ:virpõļ 241
N_TARĪĻ ;
NMN_VIRPÕĻ ;
!LEXICON N_VIRPÕĻ-PL !!≈ * __@CODE@__ virpõļ:virpõļ 241
! N_TARĪĻ-PL ;

LEXICON N_ǬʼBIĻ !!≈ * **@CODE@** ǭʼbiļ:ǭbiļ 242
N_TARĪĻ ;
NMN_ǬʼBIĻ ;
LEXICON N_ǬʼBIĻ-PL !!≈ * **@CODE@** ǭʼbiļ:ǭbiļ 242
N_TARĪĻ-PL ;
NMN_ǬʼBIĻ-PL ;

LEXICON N_GOLĀTÕKS !!≈ * **@CODE@** golātõks:golātõks 244 found in Liv-est-lat dictionary
N_KĒRATÕKS ; !!
Expand Down Expand Up @@ -2206,11 +2206,11 @@ LEXICON NMN_LILLA-SG !!≈ * **@CODE@** lilla:lilla 56
SG-ILL_z ;
SG-INS_ks ;
SG-NOM ;
SG-PAR_ZERO ;
:z SG-PAR_t ;

LEXICON NMN_LILLA-PL !!≈ * **@CODE@** lilla:lilla 56
PL-INS_DÕKS-STEM ;
:%^VowsRM PL-ELA/INE_išt ;
:%^VowsRM PL-ELA/INE_ist ;
:%^VowsRM PL-ILL_iž ;
:%^VowsRM PL-PAR_idi ;

Expand Down Expand Up @@ -2926,14 +2926,14 @@ LEXICON NMN_KAND !!≈ * **@CODE@** : 94
NMN_KAND-PL ;
LEXICON NMN_KAND-SG !!≈ * **@CODE@** : 94
SG-DAT_õn ;
SG-ELA/INE_stõ ;
:õ SG-ELA/INE_stõ ;
SG-GEN ;
SG-ILL_õ ;
SG-INS_kõks ;
SG-NOM ;
SG-PAR_õ ;
LEXICON NMN_KAND-PL !!≈ * **@CODE@** : 94
:%^VowsLI1 PL-ELA/INE_ist ;
:%^VowsLI1 PL-ELA/INE_õst ;
:%^VowsLI1 PL-ILL_iž ;
:%^VowsLI1 PL-INS_ÕDÕKS-STEM ;
:%^VowsLI1 PL-PAR_idi ;
Expand Down Expand Up @@ -3531,7 +3531,7 @@ LEXICON NMN_KIM
NMN_KIM-PL ;
LEXICON NMN_KIM-SG
:%{XC%} SG-DAT_õn ;
SG-ELA/INE_stõ ;
:%{XC%}%>õ SG-ELA/INE_stõ ;
SG-GEN ;
:%{XC%} SG-ILL_õ ;
! SG-INE ;
Expand Down Expand Up @@ -5640,17 +5640,41 @@ LEXICON NMN_ĀNKAŖ !!≈ * **@CODE@** ānkaŗ:ānkaŗ 240
!LEXICON NMN_ĀNKAŖ-PL !!≈ * __@CODE@__ ānkaŗ:ānkaŗ 240
! NMN_TARĪĻ-PL ;

!LEXICON NMN_VIRPÕĻ !!≈ * __@CODE@__ virpõļ:virpõļ 241
! NMN_TARĪĻ ;
LEXICON NMN_VIRPÕĻ !!≈ * __@CODE@__ virpõļ:virpõļ 241
NMN_VIRPÕĻ-SG ;
NMN_VIRPÕĻ-PL ;
LEXICON NMN_VIRPÕĻ-SG !!≈ * __@CODE@__ virpõļ:virpõļ 241
SG-DAT_õn ;
SG-ELA/INE_št ;
SG-GEN ;
SG-ILL_õ ;
SG-INS_õks ;
SG-NOM ;
SG-PAR_t ;

!LEXICON NMN_VIRPÕĻ-PL !!≈ * __@CODE@__ virpõļ:virpõļ 241
! NMN_TARĪĻ-PL ;
LEXICON NMN_VIRPÕĻ-PL !!≈ * __@CODE@__ virpõļ:virpõļ 241
PL-INS_DÕKS-STEM ;
:%^PalatalizeLeft PL-ELA/INE_ist ;
:%^PalatalizeLeft PL-ILL_iž ;
:%^PalatalizeLeft PL-PAR_i ;

LEXICON NMN_ǬʼBIĻ !!≈ * **@CODE@** ǭʼbiļ:ǭbiļ 242
NMN_TARĪĻ ;
NMN_ǬʼBIĻ-SG ;
NMN_ǬʼBIĻ-PL ;
LEXICON NMN_ǬʼBIĻ-SG !!≈ * __@CODE@__ ǭʼbiļ:ǭbiļ 242
SG-DAT_õn ;
SG-ELA/INE_št ;
SG-GEN ;
SG-ILL_õ ;
SG-INS_õks ;
SG-NOM ;
SG-PAR_t ;

!LEXICON NMN_ǬʼBIĻ-PL !!≈ * __@CODE@__ ǭʼbiļ:ǭbiļ 242
! NMN_TARĪĻ-PL ;
LEXICON NMN_ǬʼBIĻ-PL !!≈ * __@CODE@__ ǭʼbiļ:ǭbiļ 242
PL-INS_DÕKS-STEM ;
PL-ELA/INE_ist ;
PL-ILL_iž ;
PL-PAR_i ;

!LEXICON NMN_GOLĀTÕKS !!≈ * __@CODE@__ golātõks:golātõks 244 found in Liv-est-lat dictionary
! NMN_KĒRATÕKS ; !!
Expand Down Expand Up @@ -5867,9 +5891,9 @@ LEXICON PL-ELA/INE_st
PL-ELA_st ;
PL-INE_s ;

!LEXICON PL-ELA/INE_õst
! PL-ELA_õst ;
! PL-INE_õs ;
LEXICON PL-ELA/INE_õst
PL-ELA_õst ;
PL-INE_õs ;

LEXICON PL-ELA/INE_Ist
PL-ELA_Ist ;
Expand Down
4 changes: 2 additions & 2 deletions src/fst/morphology/phonology.twolc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ a:õ <=> _ ( %^ConsL:0 ) [ %^Stress2to1:0 | %^VowsShU1: ] [ # | %> ] ;

"õ:i"
!! **Rule: @RULENAME@**
õ:i <=> [ Vow | ʼ: | :ʼ ]+ :Cns+ _ [ n: | l: | z: ] %^PalatalizeLeft: ;
õ:i <=> [ Vow | ʼ: | :ʼ ]+ :Cns+ _ [ n: | l: | z: | ļ:] %^PalatalizeLeft: ;
! # Cns* [ Vow | ʼ: | :ʼ ]+ :Cns+ _ [ n: | l: | z: ] %^PalatalizeLeft: ;
[ Vow | ʼ: | :ʼ ]+ :Cns+ _ r %^VowsõToi:0 ;
! # Cns* [ Vow | ʼ: | :ʼ ]+ :Cns+ _ r %^VowsõToi:0 ;
Expand Down Expand Up @@ -695,7 +695,7 @@ s:š <=> _ %^PalatalizeLeft:0 [ # | %> ] ;

"a:ä palatalization"
!! **Rule: @RULENAME@**
a:ä <=> # Cns* _ ( 0: | ʼ: ) [p:|m:]+ [%^PalatalizeLeft:0 | Vow: %^PalatalizeLeft:0 (%^ConsSh:) %^VowsRM: ] [ # | %> ] ;
a:ä <=> # Cns* _ ( 0: | ʼ: ) [p:|m:] Cns* [%^PalatalizeLeft:0 | Vow: %^PalatalizeLeft:0 (%^ConsSh:) %^VowsRM: ] [ # | %> ] ;

!!€# aʼmā%^PalatalizeLeft%^ConsSh%^VowsRM%>ḑi
!!€# äʼm00000ḑi
Expand Down
4 changes: 2 additions & 2 deletions src/fst/morphology/stems/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7665,7 +7665,7 @@ ukskīela+N:uks#kīela N_KĒRA "ovikello" ;
uksvȱidaji+N:uks#vȱidaji N_SĒJI "ovenvartija" ;
uktāmi+N:uktāmi N_AʼBLI "houkutteleminen" ;
ukāz+N:ukāz N_ALĪZ "kerskailija" ;
ukš+N:ukš N_UKŠ "ovi" ;
ukš+N:uks N_UKŠ "ovi" ;
ulkuodā+N:ul#kuoʼd N_PADĀ "hourula" ;
ullõm+N:ullõm N_KǬRAND "mielipuolisuus" ;
ultīe+N:ul#tīʼe N_TĪE "YY" ;
Expand Down Expand Up @@ -7856,7 +7856,7 @@ vaņtlimi+N:vaņtlimi N_AʼBLI "katselu" ;
vaņīm+N:vaņīm N_KULTŪR "vanhin" ;
vaņțlimi+N:vaņțlimi N_AʼBLI "näkymä" ;
vaŗtiji+N:vaŗtiji N_AKKIJI "vahti" ;
vaŗīkš+N:vaŗīkš N_VARĪKŠ "varis" ;
varīkš+N:varīkš N_VARĪKŠ "varis" ;
vaŗž+N:vaŗž N_VAŖŽ "varsi" ;
vašk+N:vašk N_VAŠK "kupari" ;
vaškidrōț+N:vaški#drǭț N_VIĻȚ "kuparilanka" ;
Expand Down
6 changes: 3 additions & 3 deletions src/fst/morphology/stems/nouns.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202803,7 +202803,7 @@
<lg>
<l pos="N">ukš</l>
<stg>
<st Contlex="N_UKŠ">ukš</st>
<st Contlex="N_UKŠ">uks</st>
</stg>
<orig>ukš</orig>
</lg>
Expand Down Expand Up @@ -207844,9 +207844,9 @@
</e>
<e>
<lg>
<l pos="N">vaŗīkš</l>
<l pos="N">varīkš</l>
<stg>
<st Contlex="N_VARĪKŠ">vaŗīkš</st>
<st Contlex="N_VARĪKŠ">varīkš</st>
</stg>
<orig>vaŗīkš</orig>
</lg>
Expand Down

0 comments on commit 9c15148

Please sign in to comment.