Add Dimin for Der/Dimin

As in NomAg vs Der/NomAg
giellalt · Mar 13, 2024 · 1e35209 · 1e35209
1 parent dbfc20b
commit 1e35209
Show file tree

Hide file tree

Showing 5 changed files with 342 additions and 334 deletions.
diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
@@ -307,6 +307,7 @@ LIST Der/PassL = Der/PassL ;
 LIST Der/NomAg = Der/NomAg ;
 LIST Actor = NomAg Der/NomAg ;
 LIST NomAct = NomAct ;
+LIST Dimin = Dimin ;#exist as its own entity
 LIST VAbess = VAbess ;
 
 #!! * Sets for Derivation
@@ -408,6 +409,8 @@ LIST Err/Orth = Err/Orth ;
 LIST Err/Orth-lowered-final-e-2-ja = Err/Orth-lowered-final-e-2-ja ;
 LIST Err/MissingSpace = Err/MissingSpace ;
 
+LIST ERRSORTH = Err/Orth Err/Orth-lowered-final-e-2-ja ;# all Err/Orth...
+
 # Phrasal groups
 # --------------
 
@@ -482,6 +485,7 @@ SUBSTITUTE (Sem/Plc) (*) TARGET (*) ;
 
 SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET ("ков" N SP Prl Indef);
 SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET (Use/NG);
+SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET (ERRSORTH);
 SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET WEIRDCOMP;
 SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET NAMBPROP IF (-1 BOS);
 SUBSTITUTE (<W:0.0>) (<W:1.0>) TARGET Abl IF (0 Nom) (0* (ScSg3) BARRIER BOS OR EOS OR CLB ) (NOT 0* QNTSETSGNOM BARRIER BOS OR EOS OR CLB ) (NOT 1 ("меле") OR ("инголе") OR ("башка"));
@@ -509,7 +513,8 @@ MAP:NnPron (@CNP) TARGET CC IF (-1 N) (1* ("эрьва") BARRIER CLB OR EOS OR C
 
 
 REMOVE Der/MWN ; # If any other reading is possible.
-REMOVE Der/Dimin ; # If any other reading is possible.
+#REMOVE Der/Dimin ; # If any other reading is possible.
+REMOVE:NoDerDiminWhenDimin Der/Dimin IF (0 Dimin) ; # If any other reading is possible.
 
 #!! N ABBR not ABBR
 #SELECT N IF (0 ABBR) ; 

diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
@@ -59,6 +59,8 @@ LEXICON N_AVA-PL
 ! ава:ава
 !: NMN_AVA-SG/PL ;
 
+LEXICON N_VAL1MIA_IS_KIA_DIMIN
++Dimin: N_VAL1MIA ;
 LEXICON N_VAL1MIA
 ! вальмя:вальмя
 : NMN_VAL1MIA ;

diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
@@ -249,6 +249,7 @@ Multichar_Symbols !!≈!!@CODE@ / Analysis symbols
 
  +NomAg
  +NomAct
+ +Dimin
 
 ! Abbreviated words are classified with:
  +ABBR 	!!= @CODE@ Abbreviation