Integrate nouns-russian-homographs into regular nouns.

giellalt · Feb 10, 2024 · 3513527 · 3513527
1 parent 35a553d
commit 3513527
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 314 deletions.
diff --git a/src/fst/morphology/Makefile.am b/src/fst/morphology/Makefile.am
@@ -48,8 +48,7 @@ GT_LEXC_SRCS_L1_L2=\
 		stems/exceptions.lexc                         \
 		stems/gerunds.lexc                            \
 		stems/interjections.lexc                      \
-		stems/nouns-russian-homographs.lexc           \
-		stems/nouns-regular.lexc                      \
+		stems/nouns.lexc                      \
 		stems/nouns_newwords.lexc                     \
 		stems/numerals.lexc                           \
 		stems/particles.lexc                          \

diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
@@ -28,12 +28,19 @@ LEXICON N_LA
 LEXICON N-VYV ! тулысвыв The Russian is an adverbial phrase
 +Der+Der/выв: NMN_ ;
 
-LEXICON Noun1-F !
+LEXICON N_rus100 ! Homographs
 +Src/F: NMN_ ;
+LEXICON N_ruskpv ! Komi-like Russian words
++Src/F: NMN_ ;
+
+LEXICON N_rus100_hasnat ! Homographs
++Src/F: NMN_ ;
+LEXICON N_ruskpv_hasnat ! Komi-like Russian words
++Src/F: NMN_ ;
+
 
-LEXICON Noun1-R-RY !
-+Use/NG+Err/Orth:ь NMN_ ;  ! This deals with январь
-           NMN_ ; ! This is the new proper spelling январ
+LEXICON N_ruskpv_R_RY_hasnat !
++Use/NG+Err/Orth: NMN_ ;  ! This deals with январь
 
 LEXICON Noun1-SYT-STY !
 +Use/NG+Err/Orth:ть NMN_ ;  ! This deals with гӧсть

diff --git a/src/fst/morphology/affixes/propernouns.lexc b/src/fst/morphology/affixes/propernouns.lexc
@@ -27,7 +27,7 @@ LEXICON PROP_
 @U.Cap.Obl@+Pl:@U.Cap.Obl@%>ъяс CASEPOSSLEX ; !Reinstalling plural morphology 2019-06-03
 
 LEXICON Prop-R-RY
-: Noun1-R-RY ; ! This will bring about problems with ordering 2012-02-07
+: N_ruskpv_R_RY_hasnat ; ! This will bring about problems with ordering 2012-02-07
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! ## Russian type Surnames 

diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
@@ -857,7 +857,7 @@ LEXICON Root
               interjections                      ; !!≈ * @CODE@ 
 !              nouns-deverbal                     ; !!≈ * @CODE@ 
               nouns                              ; !!≈ * @CODE@ 
-              nouns-russian-homographs           ; !!≈ * @CODE@ 
+!              nouns-russian-homographs           ; !!≈ * @CODE@ 
               numerals                           ; !!≈ * @CODE@ 
               particles                          ; !!≈ * @CODE@ 
               pronouns                           ; !!≈ * @CODE@ 
@@ -907,7 +907,6 @@ LEXICON ABS_
 LEXICON R
 !! @LEXNAME@
 +Cmp#:%-# nouns ;
-+Cmp#:%-# nouns-russian-homographs ;
 !+Cmp#:%-# nouns-deverbal ;
 
 LEXICON Serial-Verbs

diff --git a/src/fst/morphology/stems/nouns-russian-homographs.lexc b/src/fst/morphology/stems/nouns-russian-homographs.lexc