Proper noun contlexes,

having problems with conversion script. Will check it later.
giellalt · Aug 8, 2024 · 84d1988 · 84d1988
1 parent 7628869
commit 84d1988
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/src/fst/morphology/affixes/propernouns.lexc b/src/fst/morphology/affixes/propernouns.lexc
@@ -159,22 +159,34 @@ LEXICON Deriv-RUS-YJ_SURMAL
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! PLACE NAMES FROM TEMPLATES !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-LEXICON PROP-PLC_KEL1 !should depricate 2023-08-30, wait for src/scripts/urj-Cyrl-udm-conversion.pl
-PROP-PLC_KAL;
-LEXICON PROP-PLC_KAL
+!LEXICON PROP_KEL1_PLC !should depricate 2023-08-30, wait for src/scripts/urj-Cyrl-udm-conversion.pl
+!PROP_KAL_PLC;
+LEXICON PROP_KAL_PLC
 +Sem/Plc+Sg: CASEPOSSLEX ;
 
-LEXICON PROP-PLC_KIT
-+Sem/Plc+Sg: CASEPOSSLEX ;
+LEXICON PROP_KAL
+ PROP_ ;
+LEXICON PROP_KAL_SUR
+ PROP_ ;
+LEXICON PROP_KUDO
+ PROP_ ;
+LEXICON PROP_OSH
+ PROP_ ;
+LEXICON PROP_OSH_PLC
+ PROP_ ;
+
 
-LEXICON PROP-PLC_VELE !should depricate	2023-08-30, wait for src/scripts/urj-Cyrl-udm-conversion.pl
-	PROP-PLC_KUDO ;
-LEXICON PROP-PLC_KUDO
+!LEXICON PROP_KIT_PLC
+!+Sem/Plc+Sg: CASEPOSSLEX ;
+
+!LEXICON PROP_VELE_PLC !should depricate	2023-08-30, wait for src/scripts/urj-Cyrl-udm-conversion.pl
+!	PROP_KUDO_PLC ;
+LEXICON PROP_KUDO_PLC
 +Sg:%^RusJa CASEPOSSLEX ;
 +Sg+Err/Orth:%^RusJaErr CASEPOSSLEX ;
 +Sg:%^NotRusJa CASEPOSSLEX ;
 
-!2018-10-21!LEXICON PROP-PLC_OSH
+!2018-10-21!LEXICON PROP_OSH_PLC
 !2018-10-21!+Sem/Plc+Sg: CASEPOSSLEX ;
 
 !! These are vowel-final stems
@@ -192,12 +204,12 @@ LEXICON PROP_KAL_FEM
 +Sem/Fem+Sg: CASEPOSSLEX ;
 LEXICON PROP_KAL_MAL
 +Sem/Mal+Sg: CASEPOSSLEX ;
-LEXICON PROP_KIT_FEM
-+Sem/Fem+Sg: CASEPOSSLEX ;
-LEXICON PROP_KIT_MAL
-+Sem/Mal+Sg: CASEPOSSLEX ;
-LEXICON PROP_KIT_SUR
-+Sem/Sur+Sg: CASEPOSSLEX ;
+!LEXICON PROP_KIT_FEM
+!+Sem/Fem+Sg: CASEPOSSLEX ;
+!LEXICON PROP_KIT_MAL
+!+Sem/Mal+Sg: CASEPOSSLEX ;
+!LEXICON PROP_KIT_SUR
+!+Sem/Sur+Sg: CASEPOSSLEX ;
 
 
 LEXICON PROP_KUDO_FEM

diff --git a/src/fst/scripts/urj-Cyrl-udm-conversion.pl b/src/fst/scripts/urj-Cyrl-udm-conversion.pl
@@ -17,8 +17,13 @@ BEGIN
 while(<>) {
 	# Continuation lexicon substitutions:
 	s/ия\ +PROP-PLC_KUDO\ +\"Z\"\ *\;/ия\ PROP_RUS_JA\ \"Z\"\ \;/g ;
-	s/PROP-PLC_VELE/PROP-PLC_KUDO/g ;
-	s/PROP-PLC_KEL1/PROP-PLC_KAL/g ;
+	s/PROP-PLC_VELE/PROP_KUDO_PLC/g ;
+	s/PROP-PLC_KEL1/PROP_KAL_PLC/g ;
+	s/PROP_OSH_PLC/PROP_KAL_PLC/g ;
+	s/PROP_KAL/PROP_/g ;
+	s/PROP_KAL_SUR/PROP_/g ;
+	s/PROP_KUDO/PROP_/g ;
+	s/PROP_OSH/PROP_/g ;
 #	s/л\ +CYRL-CONS_SUR\ +\"Z\"\ *\;/л\ CYRL-Л_SUR\ \"Z\"\ \;/g ;
 #	s/ C-FI-NEN/nen LONDON/g ;
 #	s/SUND/BERN/g ;