From 4a12ecd9d347cd0cc4c50196eb7a0a957907c444 Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Tue, 30 Jan 2024 16:00:59 +0100 Subject: [PATCH] plural inflection of Fin LN --- src/arabic/wiktionary/WordNetAra.gf | 4 ++-- src/finnish/ParadigmsFin.gf | 4 ++-- src/finnish/StemFin.gf | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/arabic/wiktionary/WordNetAra.gf b/src/arabic/wiktionary/WordNetAra.gf index 992775b6..dd3d7206 100644 --- a/src/arabic/wiktionary/WordNetAra.gf +++ b/src/arabic/wiktionary/WordNetAra.gf @@ -243,8 +243,8 @@ lin kilometre_1_N = 'كَمّ_N' ; -- 647 [['quantity, multitude'], ['quantum']] -- lin kilometre_1_N = 'كِمّ_N' ; -- 6304 [['calyx of a flower, the envelope or spathe of a palm-tree or the like']] -- lin kilometre_1_N = 'كُمّ_N' ; -- 16436 [['sleeve of a garment']] lin kina_N = mkN "كينا" ; --- guess from كينا -lin king_1_N = 'مَلَك_N' ; -- 1462 [['angel']] --- lin king_1_N = 'مَلِك_N' ; -- 11923 [['king, sovereign, monarch']] +-- lin king_1_N = 'مَلَك_N' ; -- 1462 [['angel']] +lin king_1_N = 'مَلِك_N' ; -- 11923 [['king, sovereign, monarch']] -- lin king_1_N = 'مَلَك_1_N' ; -- 14484 [['possession, property'], ['food and water, resources; anything which regulates, maintains, or sustains; essentials, supplies, utilities'], ['foundation of ones existence'], ['foundation of ones existence', 'agent or effective cause']] -- lin king_1_N = 'مِلْك_N' ; -- 117902 [['verbal noun of مَلَكَ (malaka) (form I)'], ['property, possession, goods and chattels, fortune, wealth'], ['estate'], ['real estate, landed property']] -- lin king_1_N = 'مُلْك_N' ; -- 117903 [['verbal noun of مَلَكَ (malaka) (form I)'], ['rule, reign, supreme authority, dominion, dominance, sway, power'], ['sovereignty, kingship, royalty'], ['monarchy']] diff --git a/src/finnish/ParadigmsFin.gf b/src/finnish/ParadigmsFin.gf index 2d4c9ca9..87d0028b 100644 --- a/src/finnish/ParadigmsFin.gf +++ b/src/finnish/ParadigmsFin.gf @@ -844,9 +844,9 @@ mkVS = overload { mkLN = overload { mkLN : Str -> LN = \s -> lin LN (snoun2spn (mk1N s) ** {n = Sg}) ; - mkLN : Str -> Number -> LN = \s,n -> lin LN (snoun2spn (mk1N s) ** {n = n}) ; + mkLN : Str -> Number -> LN = \s,n -> lin LN (snoun2spnGen (mk1N s) n ** {n = n}) ; mkLN : N -> LN = \noun -> lin LN (snoun2spn noun ** {n = Sg}) ; - mkLN : N -> Number -> LN = \noun,n -> lin LN (snoun2spn noun ** {n = n}) ; + mkLN : N -> Number -> LN = \noun,n -> lin LN (snoun2spnGen noun n ** {n = n}) ; } ; mkGN = overload { diff --git a/src/finnish/StemFin.gf b/src/finnish/StemFin.gf index 00eb3558..5237e55b 100644 --- a/src/finnish/StemFin.gf +++ b/src/finnish/StemFin.gf @@ -38,7 +38,9 @@ oper SPN : Type = {s : Case => Str} ; - snoun2spn : SNoun -> SPN = \n -> {s = \\c => n.s ! NCase Sg c} ; + + snoun2spn : SNoun -> SPN = \n -> snoun2spnGen n Sg ; + snoun2spnGen : SNoun -> Number -> SPN = \n,nb -> {s = \\c => n.s ! NCase nb c} ; exceptNomSNoun : SNoun -> Str -> SNoun = \noun,nom -> { s = table {