diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 0a018a6e6..4a963eb3f 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -17931,7 +17931,7 @@ foot_V2 = mkWV2 (k58 "laskea") "yhteen" ; foot_race_N = mkWN (compoundN "juoksu" (k9 "kisa")) ; foot_rot_N = mkWN (compoundN "sorkka" (k10A "mätä")) ; footage_N = mkWN (compoundN "kuva" (k5 "materiaali")) ; -football_N = mkWN (compoundN "jalka" (k1 "pallo")) "australialainen" ; +football_N = mkN "jalka" (mkN "pallo") ; footballer_N = mkWN (k10 "pelaaja") "amerikkalaisen" "jalkapallon" ; footbath_N = mkWN (compoundN "jalka" (k1A "kylpy")) ; footboard_N = mkWN (k1A "pääty") ; @@ -25191,7 +25191,7 @@ laden_A = mkWA (k10 "oleva") "täynnä" ; lading_N = mkWN (k39 "lähetys") ; ladle_V2 = mkWV2 (k54A "ammentaa") ; lady's_maid_N = mkWN (compoundN "kamari" (k5A "neiti")) ; -lady_N = mkWN (k5 "daami") ; +lady_N = mkN "lady" "ladyja" ; ---mkWN (k5 "daami") ; lady_chapel_N = mkWN (k6 "kappeli") ; lady_killer_N = mkWN (k12 "viettelijä") ; ladybird_N = mkWN (k1A "leppäpirkko") ; @@ -26477,8 +26477,8 @@ longboat_N = mkWN (compoundN "pitkä" (k48 "vene")) ; longbow_N = mkWN (compoundN "käsi" (k26 "jousi")) ; longbowman_N = mkWN "pitkäjousimies" ; longest_Adv = mkWAdv (k99 "kauimmin") ; -longevity_N = mkWN (k40 "vanhemmuus") ; -longhand_A = mkWA (compoundA "käsi" (k38 "nkirjoittaminen")) ; +longevity_N = mkN "pitkä" (mkN "ikäisyys") ; +longhand_A = mkA "kursivoitu" ; longhand_N = mkWN (k5 "kursiivi") ; longhorn_N = mkWN (k9A "nauta") "pitkäsarvinen" ; longing_N = mkWN (k17 "kaipuu") ; @@ -26922,14 +26922,14 @@ macumba_N = mkWN "macumba" ; macushla_N = mkWN (compoundN "kullan" (k1A "nuppu")) ; madagascan_A = mkWA (compoundA "madagaskari" (k38 "lainen")) ; madagascan_N = mkWN (compoundN "madagaskari" (k38 "lainen")) ; -madam_N = mkWN (k5 "daami") ; +madam_N = mkN "rouva" ; madame_N = mkWN (k10 "rouva") ; madcap_N = mkWN (k1A "uskalikko") ; madden_V2 = mkWV2 (k53A "raivostuttaa") ; madder_N = mkWN (k13 "matara") ; madderwort_N = mkWN (compoundN "matara" (k5 "kasvi")) ; madeira_N = mkWN (k13 "madeira") ; -mademoiselle_N = mkWN (k32 "ahven") ; +mademoiselle_N = mkN "neiti" ; ---WN (k32 "ahven") --- why an earth AR madhouse_N = mkWN (k3 "sanatorio") ; madman_N = mkWN (k1 "hullu") ; madness_N = mkWN (k40 "mielettömyys") ; @@ -52980,7 +52980,7 @@ zymotic_A = mkWA "tsymoosiin" "liittyvä" ; german_A = mkA "saksalainen" ; --CHECKED give_V = mkV "antaa" ; --CHECKED go_VA = mkVA (mkV "käydä") (casePrep translative) ; --CHECKED - good_A = mkA (mkN "hyvä")(mkN "parempi")(mkN "paras") "hyvin" "paremmin" "parhaiten" ; --CHECKED + good_A = L.good_A ; ---have_V2 ---have_VV --hear_V2 = mkV2 (mkV "kuulla") partitive ; --CHECKED --- accusative ? @@ -53113,7 +53113,7 @@ far_reaching_A = mkA "kauaskantoinen" ; --CHECKED --MAN feel_VS = mkVS "tuntea" ; --CHECKED --MAN feel_V = mkV "tuntea" ; --CHECKED --MAN feude_V = mkV "vihoitella" ; --CHECKED --MAN -finland_PN = mkPN "Suomi" ; --CHECKED --MAN +finland_PN = mkPN (mkN "Suomi" "Suomia") ; --CHECKED --MAN first_rate_A = mkA "ensiluokkainen" ; --CHECKED --MAN florida_PN = mkPN "Florida" ; --CHECKED --MAN for_starters_Adv = mkAdv "alkajaisiksi" ; --CHECKED --MAN diff --git a/lib/src/finnish/LexiconFin.gf b/lib/src/finnish/LexiconFin.gf index aab8d8b6c..65ebc21e9 100644 --- a/lib/src/finnish/LexiconFin.gf +++ b/lib/src/finnish/LexiconFin.gf @@ -8,6 +8,7 @@ flags lin airplane_N = mkN "lentokone" ; + alas_Interj = mkInterj "voi" ; answer_V2S = mkV2 (mkV "vastata") (casePrep allative) ; apartment_N = mkN "asunto" ; apple_N = mkN "omena" ; --- omenia, not omenoita @@ -88,7 +89,7 @@ lin girl_N = mkN "tyttö" ; glove_N = mkN "käsine" ; gold_N = mkN "kulta" ; - good_A = mkA (mkN "hyvä") "parempi" "parhain" ; --- paras + good_A = mkA (mkN "hyvä") (mkN "parempi" "paremman" "parempia") (exceptNomN (mkN "parhas" "parhaan" "parhaita" "parasta") "paras") "hyvin" "paremmin" "parhaiten" ; go_V = mkV "mennä" ; green_A = mkA (mkN "vihreä") "vihreämpi" "vihrein" ; harbour_N = mkN "satama" "sataman" "satamia" ; diff --git a/lib/src/finnish/ParadigmsFin.gf b/lib/src/finnish/ParadigmsFin.gf index 8d4888315..3fa89647d 100644 --- a/lib/src/finnish/ParadigmsFin.gf +++ b/lib/src/finnish/ParadigmsFin.gf @@ -338,6 +338,9 @@ mkVS = overload { = \isNeg,nu,noun,_ -> MorphoFin.mkDetPol isNeg nu (snoun2nounBind noun) ; } ; + mkInterj : Str -> Interj + = \s -> lin Interj {s = s} ; + --. -- THE definitions should not bother the user of the API. So they are -- hidden from the document. diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index 46cc11d45..49bf04f08 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -12239,7 +12239,7 @@ lin lad_N = pojke_nn_1_N ; -- comment=3 lin ladder_N = stege_nn_1_N ; -- comment=4 lin ladle_N = skopa_nn_1_N ; -- comment=2 lin ladle_V2 = mkV2 (mkV "slev") ; -- status=guess, src=wikt -lin lady_N = fru_nn_1_N ; -- comment=4 +lin lady_N = mkN "dam" "damer" ; lin ladybird_N = nyckelpiga_nn_1_N ; -- comment=1 lin ladybug_N = nyckelpiga_nn_1_N ; -- comment=1 lin lag_N = tidsfoerskjutning_nn_1_1_N ; -- comment=3 @@ -12853,7 +12853,7 @@ lin logion_N = mkN "logion" ; -- status=guess lin logistics_N = logistik_nn_1_N ; -- comment=1 lin logo_N = logotyp_nn_1_N ; -- comment=1 lin loin_N = fransyska_nn_1_N ; -- comment=1 -lin loins_N = land_nn_1_N ; -- comment=2 +lin loins_N = mkN "njurtrakt" "njurtrakter" ; lin loiter_V = soela_vb_1_1_V ; -- comment=1 lin lollipop_N = klubba_nn_1_N ; -- comment=2 lin london_PN = mkPN "London" neutrum ; -- @@ -13073,8 +13073,8 @@ lin magnitude_N = omfattning_nn_1_N ; -- comment=3 lin magnolia_N = magnolia_nn_1_N ; -- comment=1 lin magpie_N = skata_nn_1_N ; -- comment=1 lin maid_N = ungmoe_nn_1_1_N ; -- comment=6 -lin maiden_A = mkA "jungfru-" ; -- status=guess -lin maiden_N = jungfru_nn_1_N ; -- comment=1 +lin maiden_A = mkA "jungfrulig" ; +lin maiden_N = jungfru_nn_1_N ; lin mail_N = postverk_nn_1_N ; -- comment=9 lin mail_V2 = mkV2 (posta_vb_1_V) ; -- status=guess, src=wikt lin mailbox_N = brevlaada_nn_1_1_N ; -- comment=2