diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index 3e808d956..9b4d25606 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -66,8 +66,8 @@ lin monthAdv m = SyntaxFin.mkAdv in_Prep (mkNP m) ; yearAdv y = SyntaxFin.mkAdv (prePrep nominative "vuonna") y ; ----- dayMonthAdv d m = ParadigmsFin.mkAdv (d.s ! R.NPCase R.Nom ++ BIND ++ "." ++ m.s ! R.NCase R.Sg R.Part) ; ----- monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ; + dayMonthAdv d m = ParadigmsFin.mkAdv ((mkUtt d).s ++ BIND ++ "." ++ (mkUtt (mkNP m)).s) ; + monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ; ---- dayMonthYearAdv d m y = ---- lin Adv {s = d.s ! R.NPCase R.Nom ++ BIND ++ "." ++ m.s ! R.NCase R.Sg R.Part ++ y.s ! R.NPCase R.Nom} ; @@ -84,6 +84,10 @@ lin InLanguage l = SyntaxFin.mkAdv (mkPrep translative) (mkNP l) ; lin weekdayN w = w.noun ; monthN m = m ; + + weekdayPN w = mkPN w.noun ; + monthPN m = mkPN m ; + languageNP l = mkNP l ; languageCN l = mkCN l ; diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 0cabb7440..24f26e91d 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -3126,7 +3126,7 @@ fun approx_PN : PN ; fun approximate_A : A ; fun approximate_V : V ; fun approximate_V2 : V2 ; -fun approximately_A : A ; +fun approximately_Adv : Adv ; fun approximation_N : N ; fun appurtenance_N : N ; fun apr_PN : PN ; @@ -13307,7 +13307,7 @@ fun cougar_N : N ; fun cough_N : N ; fun cough_V : V ; fun cough_up_V2 : V2 ; -fun could_N : N ; +----* fun could_N : N ; fun coulisse_N : N ; fun coulomb_N : N ; fun coulter_N : N ; @@ -20185,7 +20185,7 @@ fun expectable_A : A ; fun expectancy_N : N ; fun expectant_A : A ; fun expectation_N : N ; -fun expectations_N : N ; +----* fun expectations_N : N ; fun expected_A : A ; fun expectedness_N : N ; fun expectorant_N : N ; @@ -23748,7 +23748,7 @@ fun gesticulation_N : N ; fun gestural_A : A ; fun gesture_N : N ; fun gesture_V : V ; -fun get_N : N ; +----* fun get_N : N ; fun get_V2 : V2 ; fun get_V2V : V2V ; fun get_VV : VV ; @@ -34480,7 +34480,7 @@ fun masque_N : N ; fun masquerade_N : N ; fun masquerade_V : V ; fun masquerader_N : N ; -fun mass_A : A ; +----* fun mass_A : A ; fun mass_N : N ; fun mass_V : V ; fun mass_V2 : V2 ; @@ -37828,7 +37828,7 @@ fun newtonian_A : A ; fun newtonian_N : N ; fun newtown_PN : PN ; fun next_A : A ; -fun next_N : N ; +----* fun next_N : N ; fun next_Prep : Prep ; fun next_to_Prep : Prep ; fun nexus_N : N ; @@ -61819,7 +61819,7 @@ fun untidy_A : A ; fun untie_V : V ; fun untie_V2 : V2 ; fun untied_A : A ; -fun until_Adv : Adv ; +----* fun until_Adv : Adv ; fun until_Prep : Prep ; fun until_Subj : Subj ; fun untilled_A : A ; @@ -63951,7 +63951,7 @@ fun when_Subj : Subj ; fun whence_Adv : Adv ; fun whencesoever_A : A ; fun whenever_Adv : Adv ; -fun where_Adv : Adv ; +----* fun where_Adv : Adv ; fun where_IAdv : IAdv ; fun where_Subj : Subj ; fun where_as_Prep : Prep ; @@ -64699,7 +64699,7 @@ fun worshipful_A : A ; fun worshipper_N : N ; fun worst_A : A ; fun worst_Adv : Adv ; -fun worst_N : N ; +----* fun worst_N : N ; fun worst_V2 : V2 ; fun worsted_N : N ; fun wort_N : N ; @@ -64714,7 +64714,7 @@ fun worthwhile_A : A ; fun worthwhileness_N : N ; fun worthy_A : A ; fun worthy_N : N ; -fun would_N : N ; +----* fun would_N : N ; fun would_be_A : A ; fun wound_N : N ; fun wound_V2 : V2 ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 3d96c1287..c3efd0317 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -3141,7 +3141,7 @@ lin approx_PN = mkPN "Approx"; lin approximate_A = compoundA (mkA "approximate"); lin approximate_V = mkV "approximate" "approximates" "approximated" "approximated" "approximating"; lin approximate_V2 = mkV2 (mkV "approximate" "approximates" "approximated" "approximated" "approximating"); -lin approximately_A = mkA "approximately" ; +lin approximately_Adv = mkAdv "approximately" ; lin approximation_N = mkN "approximation" "approximations"; lin appurtenance_N = mkN "appurtenance" "appurtenances"; lin apr_PN = mkPN "Apr"; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 73b0b1941..40411a0fc 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -453,7 +453,7 @@ lin accusative_A = mkWA "akkusatiivi-" ; --UNCHK lin accusative_N = mkWN (k9 "sija") "objektin" ; --UNCHK lin accusatorial_A = mkWA (compoundA "syy" (k38 "tepohjainen")) ; --UNCHK lin accuse_V2 = mkWV2 (k53A "syyttää") "rikoksesta" ; --f79 -lin accused_A = variants {} ; -- +lin accused_A = mkA "syytetty" ; lin accused_N = mkWN (k10 "vastaaja") ; --UNCHK lin accuserFem_N = mkWN (k10 "syyttäjä") ; --UNCHK lin accuserMasc_N = mkWN (k10 "syyttäjä") ; --UNCHK @@ -622,6 +622,7 @@ lin act_upon_V2 = mkWV2 (k63 "saada") "aikaan" ; --UNCHK lin actable_A = mkWA (k10 "oleva") "näyteltävissä" ; --UNCHK lin actin_N = mkWN "aktiini" ; --UNCHK lin actinal_A = mkWA (compoundA "aktina" (k38 "alinen")) ; --UNCHK +lin acting_A = mkA (mkN "virkaa" (mkN "tekevä")) ; lin acting_N = mkWN (compoundN "näyttelijän" (k19 "työ")) ; --UNCHK lin actinia_N = mkWN (compoundN "meri" (k1A "vuokko")) ; --UNCHK lin actinic_A = mkWA (compoundA "valo" (k38 "kemiallinen")) ; --UNCHK @@ -910,7 +911,7 @@ lin adumbrative_A = mkWA (k38 "enteellinen") ; --UNCHK lin advance_N = mkWN (compoundN "eteenpäin" (k1 "meno")) ; --f75 lin advance_V = mkV "edetä" ; lin advance_V2 = mkV2 "edistää" ; -lin advanced_A = variants {} ; -- +lin advanced_A = mkA "edistynyt" ; lin advancement_N = mkWN (k39 "kehitys") ; --UNCHK lin advancer_N = mkWN (k12 "etenijä") ; --UNCHK lin advantage_N = mkN "etu" ; @@ -1014,6 +1015,7 @@ lin aerophile_N = mkWN (k10 "harrastaja") "ilmailun" ; --UNCHK lin aeroplane_N = mkWN (compoundN "lento" (k48 "kone")) ; --UNCHK lin aerosol_N = mkWN (k5 "aerosoli") ; --UNCHK lin aerosolized_A = mkWA (k10 "oleva") "aerosolimuodossa" ; --UNCHK +lin aerospace_A = mkA "ilmailullinen" ; lin aerospace_N = mkWN (k40 "avaruus") "ilmakehä" "ja" ; lin aertex_N = mkWN "Aertex" ; --UNCHK lin aery_N = mkWN (k1A "asunto") "korkealla" "sijaitseva" ; --UNCHK @@ -1035,7 +1037,7 @@ lin affair_N = mkN "liiketoimi" | mkWN (k1A "juttu") ; --- split lin affect_N = mkWN (k5 "affekti") ; --UNCHK lin affect_V2 = mkV2 "vaikuttaa" illative ; lin affectation_N = mkWN (k40 "teennäisyys") ; --UNCHK -lin affected_A = variants {} ; +lin affected_A = mkA "vaikutettu" ; lin affectedness_N = mkWN (k40 "teennäisyys") ; --UNCHK lin affecting_A = mkWA (k10 "liikuttava") ; --UNCHK lin affection_N = mkWN (k1A "lämpö") ; --UNCHK @@ -1559,7 +1561,7 @@ lin allay_V2 = mkWV2 (k53A "tyydyttää") ; --UNCHK lin allegation_N = mkWN (k48A "väite") ; lin allege_V2 = mkV2 "väittää" ; lin allege_VS = mkVS (mkV "väittää") ; -lin alleged_A = variants {} ; -- +lin alleged_A = mkA "väitetty" ; lin allegedly_AdA = mkAdA "muka" ; lin allegedly_AdV = mkAdV "väitetysti" ; lin allegiance_N = mkWN (k5A "lojaliteetti") ; --UNCHK @@ -1723,6 +1725,7 @@ lin alterability_N = mkWN (k40 "muuttuvuus") ; --UNCHK lin alterable_A = mkWA (k10 "oleva") "muutettavissa" ; --UNCHK lin alteration_N = mkWN (compoundN "muu" (k38 "ttaminen")) ; --UNCHK lin altercation_N = mkWN (k14A "rytäkkä") ; --UNCHK +lin altered_A = mkA "muutettu" ; lin alternate_A = mkWA (k38 "vuoroittainen") ; --UNCHK lin alternate_V = mkWV (k67A "vuorotella") ; --UNCHK lin alternate_V2 = mkWV2 (k67A "vuorotella") ; --UNCHK @@ -2285,6 +2288,7 @@ lin aniline_N = mkWN (k5 "aniliini") ; --UNCHK lin anima_N = mkWN "anima" ; --UNCHK lin animadversion_N = mkWN (k48A "moite") ; --UNCHK lin animadvert_V = mkWV (k67 "arvostella") ; --UNCHK +lin animal_A = mkA "eläimellinen" ; lin animal_N = L.animal_N ; lin animalcule_N = mkWN (k33 "eläin") "mikroskooppinen" ; --UNCHK lin animalism_N = mkWN (k40 "fyysisyys") ; --UNCHK @@ -2336,6 +2340,7 @@ lin anna_N = mkWN "anna" ; --UNCHK lin annalist_N = mkWN "annalisti" ; --UNCHK lin annalistic_A = mkWA "annalistinen" ; --UNCHK lin annan_PN = foreignPN "Annan" ; +lin anne_PN = mkPN "Anne" ; lin anneal_V2 = mkWV2 (k62 "normalisoida") ; --UNCHK lin annealing_N = mkWN (k1 "päästö") ; --UNCHK lin annelid_A = mkWA "nivelmatojen" ; --UNCHK @@ -2883,7 +2888,7 @@ lin applicant_N = mkN (lin NK {s = d12 "hakija"}) ; lin application_N = mkN "sovellus" ; lin applicative_A = mkWA (k10 "oleva") "sovellettavissa" ; --UNCHK lin applicator_N = mkWN (k33A "levitin") ; --UNCHK -lin applied_A = variants {} ; -- +lin applied_A = mkA "sovellettu" ; lin applique_N = mkWN (k5A "applikointi") ; --UNCHK lin applique_V2 = mkWV2 (k62 "applikoida") ; --UNCHK lin apply_1_V2 = mkV2 "soveltaa" partitive ; @@ -2941,13 +2946,13 @@ lin appropriator_N = mkWN (k10 "anastaja") ; --UNCHK lin approval_N = mkN "hyväksyntä" ; lin approve_V = mkWV (k52 "hyväksyä") ; --f63 lin approve_V2 = mkV2 "hyväksyä" ; -lin approved_A = variants {} ; -- +lin approved_A = mkA "hyväksytty" ; lin approver_N = mkWN (k10 "hyväksyjä") ; --UNCHK lin approvingly_Adv = mkWAdv (compoundAdv "hyväk" (k99 "syvästi")) ; --UNCHK lin approximate_A = mkA "likimääräinen" ; lin approximate_V = mkWV (k62 "estimoida") ; --UNCHK lin approximate_V2 = mkWV2 (k62 "estimoida") ; --UNCHK -lin approximately_A = variants {} ; +lin approximately_Adv = mkAdv "suunnilleen" ; lin approximation_N = mkWN (k38 "tuominen") "yhteen" ; --UNCHK lin appurtenance_N = mkWN (k48 "varuste") ; --UNCHK lin apractic_A = mkWA "apraksinen" ; --UNCHK @@ -3202,7 +3207,7 @@ lin armamentarium_N = mkWN (k1 "välineistö") ; --UNCHK lin armature_N = mkWN (k6 "ankkuri") ; --UNCHK lin armband_N = mkWN (compoundN "käsivarsi" (k9 "nauha")) ; --UNCHK lin armchair_N = mkWN (compoundN "noja" (k5 "tuoli")) ; --UNCHK -lin armed_A = variants {} ; -- +lin armed_A = mkA "aseistettu" ; lin armenian_N = mkWN (k2 "aakkosto") "armenialainen" ; --UNCHK lin armful_N = mkWN (k39 "sylys") ; --UNCHK lin armhole_N = mkWN (compoundN "hihan" (k10A "reikä")) ; --UNCHK @@ -3288,6 +3293,7 @@ lin arsine_N = mkWN (compoundN "arseeni" (k5 "hybridi")) ; --UNCHK lin arson_N = mkWN (compoundN "murha" (k1A "poltto")) ; --UNCHK lin arsonist_N = mkWN (k5 "pyromaani") ; --UNCHK lin art_N = L.art_N ; +lin art_PN = mkPN "Art" ; lin artefact_N = mkWN (k48 "esine") ; --UNCHK lin artemisia_N = mkWN (k11 "maruna") ; --UNCHK lin arterial_A = mkWA "valtimo-" ; --UNCHK @@ -3558,7 +3564,9 @@ lin assist_N = mkWN (k1A "syöttö") ; --UNCHK lin assist_V = mkWV (k53 "avustaa") ; --UNCHK lin assist_V2 = mkWV2 (k53 "avustaa") ; --UNCHK lin assistance_N = mkWN (k7A "tuki") ; --f56 -lin assistant_A = variants {} ; -- +lin assistantFem_N = mkN "apulainen" ; +lin assistantMasc_N = mkN "apulainen" ; +lin assistant_A = mkA "avustava" ; lin assistant_N = mkWN (k10 "avustaja") ; lin assistive_A = mkWA "avustava" ; --UNCHK lin assize_N = mkWN "käräjä-" ; --UNCHK @@ -3568,7 +3576,7 @@ lin associate_A = mkWA "vara-" ; --UNCHK lin associate_N = mkN "liittolainen" ; lin associate_V = mkV "assosioitua" ; lin associate_V2 = mkWV2 (k62 "assosioida") ; -lin associated_A = variants {} ; -- +lin associated_A = mkA "liitännäinen" ; lin associateship_N = mkWN "kumppani-" ; --UNCHK lin association_N = mkN "järjestö" | mkN "assosiaatio" ; ---- split lin associational_A = mkWA "assosiaatioon" "liittyvä" ; --UNCHK @@ -3674,6 +3682,7 @@ lin asynergy_N = mkWN "asynergia" ; --UNCHK lin asystole_N = mkWN (compoundN "sydän" (k39 "pysähdys")) ; --UNCHK lin at_N = mkWN "kip" ; --UNCHK lin at_Prep = casePrep adessive | casePrep inessive ; ---- | mkPrep "luona" | mkPrep "tykönä" ; ---- split +lin at_all_Adv = mkAdv "ollenkaan" ; lin at_home_Adv = mkAdv "kotona" ; lin at_home_N = mkWN (compoundN "vastaan" (k1A "otto")) ; --UNCHK lin at_least_AdN = S.at_least_AdN ; @@ -3769,6 +3778,8 @@ lin attainable_A = mkWA (k10 "oleva") "saatavilla" ; --UNCHK lin attainder_N = mkWN (compoundN "kansalais" (k10 "kuolema")) ; --UNCHK lin attainment_N = mkWN (compoundN "pää" (k38 "seminen")) ; --UNCHK lin attar_N = mkWN (compoundN "ruusu" (k1 "öljy")) ; --UNCHK +lin attempt_1_N = mkN "yritys" ; +lin attempt_2_N = mkN "yritys" ; lin attempt_N = mkN (lin NK {s = d39 "yritys"}) ; lin attempt_V2 = mkV2 "yrittää" partitive ; lin attempt_VV = mkVV (mkV "yrittää") ; @@ -3852,6 +3863,7 @@ lin auditor_N = mkWN (compoundN "tilin" (k10 "tarkastaja")) ; --UNCHK lin auditorium_N = mkWN (k2 "katsomo") ; --UNCHK lin auditory_A = mkWA (k38 "auditiivinen") ; --UNCHK lin audley_PN = foreignPN "Audley" ; +lin aug_PN = mkPN "Aug" ; lin augend_N = mkWN "yhteenlaskettava" ; --UNCHK lin auger_N = mkWN (k6 "näveri") ; --UNCHK lin aught_N = mkWN (k101 "mikään") "ei" ; --UNCHK @@ -3978,6 +3990,7 @@ lin autolysis_N = mkWN (compoundN "autoly" (k5 "ysi")) ; --UNCHK lin autolytic_A = mkWA (compoundA "auto" (k38 "lyyttinen")) ; --UNCHK lin automat_N = mkWN (compoundN "automaatti" (k12 "kahvila")) ; --UNCHK lin automate_V2 = mkWV2 (k71 "tehdä") "automaattiseksi" ; --UNCHK +lin automated_A = mkA "automatisoitu" ; lin automatic_A = mkWA (k38 "automaattinen") ; --UNCHK lin automatic_N = mkWN (compoundN "automaatti" (k6 "pistooli")) ; --UNCHK lin automatically_Adv = mkWAdv (k99 "automaattisesti") ; --UNCHK @@ -4217,7 +4230,7 @@ lin bachelorhood_N = mkWN (k1 "olo") "poikamiehenä" ; --UNCHK lin bacillar_A = mkWA "basilli-" ; --UNCHK lin bacillus_N = mkWN (k6 "basilli") ; --UNCHK lin bacitracin_N = mkWN (k5A "antibiootti") ; --UNCHK -lin back_A = variants {} ; -- +lin back_A = mkA (mkN "taaempi" "taaemman" "taaempia") ; lin back_Adv = mkAdv "takaisin" ; lin back_N = L.back_N ; lin back_V = mkWV (k52A "perääntyä") ; @@ -4712,6 +4725,7 @@ lin barrack_N = mkWN (k5A "parakki") ; --UNCHK lin barrack_V = mkWV (k67A "piikitellä") ; --UNCHK lin barrack_V2 = mkWV2 (k67A "piikitellä") ; --UNCHK lin barracking_N = mkWN (k39 "buuaus") ; --UNCHK +lin barracks_N = mkN "kasarmi" ; lin barracouta_N = mkWN (k10 "barrakuda") ; --UNCHK lin barracuda_N = mkWN (k10 "barrakuda") ; --UNCHK lin barrage_N = mkWN (k39 "pommitus") ; --UNCHK @@ -4922,6 +4936,7 @@ lin bayberry_N = mkWN (compoundN "suo" (k5A "myrtti")) ; --UNCHK lin bayonet_V2 = mkWV2 (k53 "lävistää") "pistimellä" ; --UNCHK lin bayou_N = mkWN (compoundN "suo" (k7 "järvi")) ; --UNCHK lin bazooka_N = mkWN (k1A "sinko") ; --UNCHK +lin bbc_PN = mkPN "BBC" ; lin bdellium_N = mkWN (compoundN "kumi" (k5 "hartsi")) "aromaattinen" ; --UNCHK lin beach_N = mkWN (k9A "ranta") ; --UNCHK lin beach_V2 = mkWV2 (k52A "rantautua") ; --UNCHK @@ -5120,7 +5135,7 @@ lin begin_V2 = mkV2 "aloittaa" ; lin begin_VV = mkVV (mkV "alkaa" "alkoi") ; lin begin_ing_VV = mkVV (mkV "alkaa" "alkoi") ; lin begin_to_VV = mkVV (mkV "alkaa" "alkoi") ; -lin begin_with_V = mkV "alkaa" "alkoi" ; +lin begin_with_V = mkV "alkaa" "alkoi" ; lin beginner_N = mkWN (k10 "aloittelija") ; --UNCHK lin beginning_N = mkN "alku" ; ---- END checked AR lin begonia_N = mkWN (k12 "begonia") ; --UNCHK @@ -5152,6 +5167,7 @@ lin beholder_N = mkWN (k10 "havainnoija") ; --UNCHK lin behove_V2 = mkWV2 (k67 "olla") "velvollisuus" ; --UNCHK lin beige_A = mkWA (k8 "beige") ; --UNCHK lin beige_N = mkWN (k34A "valkaisematon") ; --UNCHK +lin being_A = mkA "oleva" ; lin being_N = mkWN (k1A "olento") ; --UNCHK lin beirut_PN = foreignPN "Beirut" ; lin beith_PN = foreignPN "Beith" ; @@ -6927,6 +6943,7 @@ lin brewer_N = mkN "oluen" (mkN "panija") ; --mkWN (compoundN "panimo" (k6 "mest lin brewery_N = mkWN (k2 "panimo") ; --UNCHK lin brewing_N = mkWN (k1 "pano") ; --UNCHK lin brewpub_N = mkWN (compoundN "panimo" (k12 "ravintola")) ; --UNCHK +lin brian_PN = mkPN "Brian" ; lin briar_N = mkWN (compoundN "briar" (k1A "piippu")) ; --UNCHK lin briard_N = mkWN "brienpaimenkoira" ; --UNCHK lin briarroot_N = mkWN (compoundN "puu" (k10 "kanerva")) ; --UNCHK @@ -7592,6 +7609,7 @@ lin busyness_N = mkWN (k12 "hyörinä") ; --UNCHK lin busywork_N = mkWN (k2 "puuhastelu") ; --UNCHK lin but_Adv = mkWAdv (k99 "vain") ; lin but_Conj = mkConj "mutta" ; +lin but_N = mkN "mutta" ; lin but_PConj = S.but_PConj ; lin but_Prep = mkPrep "paitsi" nominative ; lin but_Subj = mkSubj "mutta" ; @@ -7663,7 +7681,7 @@ lin buy_off_V2 = mkWV2 (k52 "lahjoa") ; --UNCHK lin buy_out_V2 = mkWV2 (k53A "ottaa") "haltuunsa" ; --UNCHK lin buy_up_V2 = mkWV2 (k53A "ottaa") "haltuunsa" ; --UNCHK lin buyerFem_N = mkWN (k10 "ostaja") ; --f235 -lin buyerMasc_N = variants {} ; -- +lin buyerMasc_N = mkN "ostaja" ; lin buying_N = mkWN (k1 "osto") ; --UNCHK lin buyout_N = mkWN (compoundN "yritys" (k39 "valtaus")) ; --UNCHK lin buzz_N = mkWN (k12 "suhina") ; --UNCHK @@ -7909,6 +7927,7 @@ lin call_round_V = advV OP_call_V OP_round_Adv ; -- guess-p-verb lin call_up_N = mkWN (k9A "kutsunta") ; --UNCHK lin call_up_V2 = mkWV2 (k64 "tuoda") "mieleen" ; --UNCHK lin callable_A = mkWA "callable" ; --UNCHK +lin called_A = mkA "kutsuttu" ; lin caller_N = mkWN (k39 "jarrutus") ; --UNCHK lin calliandra_N = mkWN "kalliandra" ; --UNCHK lin calligrapher_N = mkWN (k10 "tekstaaja") ; --UNCHK @@ -8822,6 +8841,8 @@ lin cease_N = mkWN (k1A "tauko") ; lin cease_V = mkWV (k52A "loppua") ; --UNCHK lin cease_V2 = mkWV2 (k52A "loppua") ; --UNCHK lin cease_VS = mkWVS (k52A "loppua") ; --UNCHK +lin cease_fire_N = mkN "tulitauko" ; +lin ceasefire_N = mkN "tulitauko" ; lin ceaseless_A = mkWA (k38 "alituinen") ; --UNCHK lin cecal_A = mkWA "umpisuoli-" ; --UNCHK lin cecilia_PN = foreignPN "Cecilia" ; @@ -9019,6 +9040,7 @@ lin certificate_N = mkN (lin NK {s = d39 "todistus"}) ; lin certificate_V2 = mkWV2 (k56A "antaa") "todistus" ; --UNCHK lin certification_N = mkWN (k39 "todennus") ; --UNCHK lin certificatory_A = mkWA "todistus-" ; --UNCHK +lin certified_A = mkA "valtuutettu" ; lin certify_V = mkWV (k53 "todistaa") ; --UNCHK lin certify_V2 = mkV2 "varmentaa" ; --WV2 (k53 "todistaa") ; lin certiorari_N = mkWN (compoundN "certiorari-" (k39 "määräys")) ; --UNCHK @@ -9155,7 +9177,7 @@ lin changelessness_N = mkWN (k40 "muuttumattomuus") ; --UNCHK lin changeling_N = mkWN (k41A "vaihdokas") ; --UNCHK lin changeover_N = mkWN (k39 "muutos") ; --UNCHK lin changer_N = mkWN (compoundN "levyn" (k10 "vaihtaja")) ; --UNCHK -lin changing_A = variants {} ; -- +lin changing_A = mkA "vaihteleva" ; lin changsha_PN = foreignPN "Changsha" ; lin channel_N = mkWN (k10 "kanava") ; --UNCHK lin channel_V2 = mkWV2 (k53A "lähettää") ; --UNCHK @@ -9172,7 +9194,7 @@ lin chantry_N = mkWN (compoundN "sielumessu" (k6 "kappeli")) ; --UNCHK lin chaos_N = mkWN (k39 "kaaos") ; --UNCHK lin chaotic_A = mkWA (k38 "kaoottinen") ; lin chaotically_Adv = mkWAdv (compoundAdv "kaootti" (k99 "sen")) ; --UNCHK -lin chap_N = variants {} ; -- +lin chap_N = mkN "poika" "pojan" "poikia" ; lin chap_V = mkWV (k67 "halkeilla") ; --UNCHK lin chap_V2 = mkWV2 (k67 "halkeilla") ; --UNCHK lin chapatti_N = mkWN (k5A "chapatti") ; --UNCHK @@ -9385,7 +9407,7 @@ lin chemise_N = mkWN (k1A "mekko") "suora" ; --UNCHK lin chemisorption_N = mkWN (k3 "adsorptio") "kemiallinen" ; --UNCHK lin chemisorptive_A = mkWA "kemiallisesti" "adsorboituva" ; --UNCHK lin chemistFem_N = mkWN (k5 "kemisti") ; -lin chemistMasc_N = variants {} ; -- +lin chemistMasc_N = mkN "kemisti" ; lin chemistry_N = mkWN (k12 "kemia") ; lin chemoreceptive_A = mkWA "kemoreseptorin" ; --UNCHK lin chemosis_N = mkWN "kemoosi" ; --UNCHK @@ -9923,7 +9945,7 @@ lin citation_N = mkWN "Citation" ; --UNCHK lin cite_V2 = mkV2 "lainata" partitive ; lin citified_A = mkWA (k38 "kaupunkilainen") ; --UNCHK lin citizenFem_N = mkN "kansalainen" ; -lin citizenMasc_N = variants {} ; -- +lin citizenMasc_N = mkN "kansalainen" ; lin citizenry_N = mkWN (k2 "väestö") ; --UNCHK lin citizenship_N = mkWN (compoundN "kansalais" (k7A "henki")) ; --UNCHK lin citrate_N = mkWN "sitraatti" ; --UNCHK @@ -10258,7 +10280,7 @@ lin close_set_A = mkWA (k99 "kiinni") "tiukasti" ; --UNCHK lin close_to_Prep = mkPrep "lähellä" ; lin close_up_V = mkWV (k72 "hiljetä") ; --UNCHK lin close_up_V2 = mkWV2 (k72 "hiljetä") ; --UNCHK -lin closed_A = variants {} ; -- +lin closed_A = mkA "suljettu" ; lin closefisted_A = mkWA (k5 "pihi") ; --UNCHK lin closeness_N = mkWN (k40 "läheisyys") ; --UNCHK lin closeout_N = mkWN (compoundN "loppuun" (k5A "myynti")) ; --UNCHK @@ -10868,7 +10890,7 @@ lin comic_A = mkWA (k38 "koominen") ; --UNCHK lin comic_N = mkWN (k4A "koomikko") ; --UNCHK lin comical_A = mkWA (k1 "hassu") ; --UNCHK lin comicality_N = mkWN (k40 "koomisuus") ; --UNCHK -lin coming_A = variants {} ; -- +lin coming_A = mkA "tuleva" ; lin coming_N = mkWN "saapuminen" ; --UNCHK lin comity_N = mkWN (k1A "sopu") ; --UNCHK lin comma_N = mkWN (compoundN "herukka" (k38 "perhonen")) ; --UNCHK @@ -11123,7 +11145,7 @@ lin compulsion_N = mkWN (k1A "pakko") ; --UNCHK lin compulsive_A = mkWA (k41A "tarmokas") ; --UNCHK lin compulsive_N = mkWN (compoundN "pakko" (k4A "neurootikko")) ; --UNCHK lin compulsiveness_N = mkWN (compoundN "pakkomielte" (k40 "isyys")) ; --UNCHK -lin compulsory_A = variants {} ; -- +lin compulsory_A = mkA "pakollinen" ; lin compunction_N = mkWN (k39 "katumus") ; --UNCHK lin computable_A = mkWA (k10 "oleva") "arvioitavissa" ; --UNCHK lin computation_N = mkWN (k9A "laskenta") ; --UNCHK @@ -11131,6 +11153,7 @@ lin computational_A = mkWA "tietokone-" ; --UNCHK lin compute_V = mkWV (k58 "laskea") ; lin compute_V2 = mkWV2 (k58 "laskea") ; --UNCHK lin computer_N = L.computer_N ; +lin computer_science_N = mkN "tietojenkäsittelyoppi" ; lin computerization_N = mkWN (compoundN "tietojen" (k2 "käsittely")) "automaattinen" ; --UNCHK lin computerize_V2 = mkV2 "tietokoneistaa" ; lin computing_N = variants {} ; -- @@ -11161,6 +11184,7 @@ lin conceive_V2 = mkWV2 (k67 "tulla") "raskaaksi" ; --UNCHK lin concentrate_N = mkWN "malliesimerkki" ; --UNCHK lin concentrate_V = mkV "keskittyä" ; --WV (k53A "kiehuttaa") "vähiin" ; lin concentrate_V2 = mkWV2 (k53A "kiehuttaa") "vähiin" ; --UNCHK +lin concentrated_A = mkA "keskittynyt" ; lin concentration_N = mkN "keskittyminen" ; lin concentric_A = mkWA (compoundA "saman" (k38 "keskinen")) ; --UNCHK lin concentricity_N = mkWN (k40 "samankeskisyys") ; --UNCHK @@ -11348,7 +11372,7 @@ lin confrontational_A = mkWA "konfrontaatio-" ; --UNCHK lin confucian_A = mkWA (k38 "konfutselainen") ; --UNCHK lin confucian_N = mkWN (k38 "konfutselainen") ; --UNCHK lin confuse_V2 = mkWV2 (k52A "erehtyä") ; --UNCHK -lin confused_A = variants {} ; +lin confused_A = mkA "sekava" ; lin confusing_A = mkWA (k10 "sekava") ; --UNCHK lin confusion_N = mkWN (compoundN "seka" (k38 "antuminen")) ; --UNCHK lin confutation_N = mkWN (k48 "todiste") "kumoava" ; --UNCHK @@ -11434,6 +11458,7 @@ lin connate_A = mkWA (compoundA "yhteen" (k47 "kasvanut")) ; --UNCHK lin connatural_A = mkWA (k38 "luontainen") ; --UNCHK lin connect_V = mkWV (k63 "saada") "yhteys" ; --UNCHK lin connect_V2 = mkWV2 (k63 "saada") "yhteys" ; --UNCHK +lin connected_A = mkA "yhdistetty" ; lin connecticut_PN = mkPN "Connecticut" ; lin connection_N = mkWN (k40 "yhteys") ; lin connective_A = mkWA "yhdistävä" ; --UNCHK @@ -12257,8 +12282,9 @@ lin counteract_V2 = mkWV2 (k62 "sabotoida") ; --UNCHK lin counteraction_N = mkWN (compoundN "vasta" (k1 "isku")) ; --UNCHK lin counteractive_A = mkWA (k10 "vaikuttava") "vastaan" ; --UNCHK lin counterargument_N = mkWN (compoundN "vasta" (k48A "väite")) ; --UNCHK -lin counterattack_V = mkWV (k53 "julistaa") ; --UNCHK -lin counterattack_V2 = mkWV2 (k53 "julistaa") ; --UNCHK +lin counterattack_N = mkN "vasta" (mkN "hyökkäys") ; +lin counterattack_V = mkV (mkV "hyökätä") "takaisin" ; +lin counterattack_V2 = mkV2 (mkV (mkV "hyökätä") "takaisin") (mkPrep "kimppuun") ; lin counterattraction_N = mkWN (compoundN "veto" (k2 "numero")) "kilpaileva" ; --UNCHK lin counterbalance_N = mkWN (compoundN "vasta" (k1 "paino")) ; --UNCHK lin counterbalance_V2 = mkWV2 (k62 "mitätöidä") ; --UNCHK @@ -12852,6 +12878,7 @@ lin crowborough_PN = foreignPN "Crowborough" ; lin crowd_N = mkWN (k1A "joukko") ; lin crowd_V = mkWV (k61 "tungeksia") ; lin crowd_V2 = mkWV2 (k61 "tungeksia") ; --UNCHK +lin crowded_A = mkA "kansoitettu" ; lin crowding_N = mkWN (k39 "tungos") ; --UNCHK lin crown_N = mkWN (k1A "kupu") ; --UNCHK lin crown_V2 = mkWV2 (k67 "olla") "huippukohta" ; --UNCHK @@ -13817,7 +13844,7 @@ lin decimeter_N = mkWN (compoundN "desi" (k5 "metri")) ; --UNCHK lin decipherable_A = mkWA (k10 "luettava") ; --UNCHK lin decipherer_N = mkWN (k10 "purkaja") "salakirjoituksen" ; --UNCHK lin decision_N = mkN "päätös" ; -lin decision_making_N = variants {} ; -- +lin decision_making_N = mkN "päätöksenteko" ; lin decisive_A = mkWA (k10 "ratkaiseva") ; lin decisiveness_N = mkWN (k40 "lopullisuus") ; --UNCHK lin deck_N = mkN (lin NK {s = d28 "kansi"}) ; @@ -13961,6 +13988,7 @@ lin defendant_N = mkN (lin NK {s = d10 "vastaaja"}) ; lin defenderFem_N = mkWN (k5A "vahti") ; lin defenderMasc_N = variants {} ; -- lin defenestration_N = mkWN (compoundN "ikku" (k9 "nasta")) "heittäminen" "ulos" ; --UNCHK +lin defense_N = mkN "puolustus" ; lin defenseless_A = mkWA (k34A "aseeton") ; --UNCHK lin defenseless_Adv = mkWAdv "puolustuskyvyttömänä" ; --UNCHK lin defenselessness_N = mkWN (compoundN "puolustus" (k40 "kyvyttömyys")) ; --UNCHK @@ -14478,7 +14506,7 @@ lin desirability_N = mkWN (k40 "seksikkyys") ; --UNCHK lin desirable_A = mkWA (k10 "toivottava") ; lin desire_N = mkWN (k1 "himo") ; lin desire_V2 = mkV2 "haluta" partitive ; --mkWV2 (k61 "mieliä") ; -lin desired_A = variants {} ; -- +lin desired_A = mkA "haluttu" ; lin desirous_A = mkWA (k41A "toiveikas") ; --UNCHK lin desist_V = mkWV (k52A "pidättäytyä") ; --UNCHK lin desk_N = mkWN (compoundN "työ" (k10A "pöytä")) ; @@ -14616,9 +14644,9 @@ lin devastate_V2 = mkV2 "musertaa" ; --mkWV2 (k52A "musertua") ; lin devastation_N = mkN "tuho" ; --mkWN (compoundN "tuho" (k38 "aminen")) ; lin develop_V = mkV "kehittyä" ; lin develop_V2 = mkV2 "kehittää" ; -lin developed_A = variants {} ; -- +lin developed_A = mkA "kehittynyt" ; lin developer_N = mkN "kehittäjä" ; -lin developing_A = variants {} ; -- +lin developing_A = mkA "kehittyvä" ; lin development_N = mkN "kehitys" ; lin developmental_A = mkWA "kehitys-" ; --UNCHK lin deviant_A = mkWA (k10 "poikkeava") ; --UNCHK @@ -15772,7 +15800,7 @@ lin dogwatch_N = mkWN (compoundN "koiran" (k5A "vahti")) ; --UNCHK lin dogwood_N = mkWN (k14A "kanukka") ; --UNCHK lin doh_N = mkWN "do" ; --UNCHK lin doily_N = mkWN (compoundN "kakku" (k6 "paperi")) ; --UNCHK -lin doing_N = variants {} ; -- +lin doing_N = mkN "tekeminen" ; lin dol_N = mkWN (compoundN "työ" (k3 "ministeriö")) ; --UNCHK lin dolabriform_A = mkWA (k10 "kaareva") ; --UNCHK lin dolce_Adv = mkWAdv (k99 "suloisesti") ; --UNCHK @@ -15997,6 +16025,7 @@ lin downheartedness_N = mkWN (k1 "alakulo") ; --UNCHK lin downhill_Adv = mkWAdv (k99 "alas") ; --UNCHK lin downhill_N = mkWN (k5 "slalom") ; --UNCHK lin downiness_N = mkWN (k40 "pehmeys") ; --UNCHK +lin download_N = mkN "lataus" ; lin downmarket_A = mkWA (k9A "halpa") ; --UNCHK lin downplay_V2 = mkWV2 (k52 "väheksyä") ; --UNCHK lin downpour_N = mkWN (k10 "tulva") ; --UNCHK @@ -16253,7 +16282,7 @@ lin driverFem_N = mkWN (compoundN "puuykkös" (k9 "maila")) ; --UNCHK lin driverMasc_N = mkN "ajaja" ; lin driveshaft_N = mkWN (compoundN "käyttö" (k6 "akseli")) ; --UNCHK lin driveway_N = mkWN (k19 "tie") ; --UNCHK -lin driving_A = variants {} ; -- +lin driving_A = mkA "ajava" ; lin driving_N = mkWN "ajaminen" ; --UNCHK lin driving_belt_N = mkWN (compoundN "käyttö" (k9 "hihna")) ; --UNCHK lin driving_wheel_N = mkWN (compoundN "ohjaus" (k10 "pyörä")) ; --UNCHK @@ -16487,6 +16516,7 @@ lin dunker_N = mkWN "kastaja" ; --UNCHK lin dunkirk_PN = foreignPN "Dunkirk" ; lin dunoon_PN = foreignPN "Dunoon" ; lin dunstable_PN = foreignPN "Dunstable" ; +lin duo_N = mkN "duo" ; lin duodecimal_A = mkWA (compoundA "kaks" (k38 "itoistakantainen")) ; --UNCHK lin duodenal_A = mkWA "pohjukaissuolen" ; --UNCHK lin duodenum_N = mkWN (compoundN "pohjukais" (k26 "suoli")) ; --UNCHK @@ -16666,7 +16696,7 @@ lin earnest_A = mkWA (k38 "asiallinen") ; --UNCHK lin earnest_N = mkWN (k40 "vakuus") ; --UNCHK lin earnest_money_N = mkWN (compoundN "käsi" (k9 "raha")) ; --UNCHK lin earnestness_N = mkWN (k40 "vilpittömyys") ; --UNCHK -lin earning_N = variants {} ; -- +lin earning_N = mkN "ansio" ; lin earphone_N = mkWN (k48A "kuuloke") ; --UNCHK lin earpiece_N = mkWN (k48A "kuuloke") ; --UNCHK lin earplug_N = mkWN (compoundN "korva" (k10A "tulppa")) ; --UNCHK @@ -17195,6 +17225,7 @@ lin elysian_A = mkWA (compoundA "elysio" (k38 "lainen")) ; --UNCHK lin em_N = mkWN (k3 "neliö") ; --UNCHK lin emaciate_V2 = mkWV2 (k52A "riutua") ; --UNCHK lin emaciation_N = mkWN (k40 "laihuus") ; --UNCHK +lin email_N = mkN "sähköposti" ; lin emanate_V = mkWV (k52A "kantautua") ; --UNCHK lin emanation_N = mkWN (k1A "vuoto") ; --UNCHK lin emancipate_V2 = mkWV2 (k53A "vapauttaa") ; --UNCHK @@ -17265,6 +17296,7 @@ lin emerge_V = mkWV (k67 "tulla") "näkyviin" ; --f71 lin emergence_N = mkN "ilmaantuminen" ; ---ARB --mkN "nousu" ; --mkWN (compoundN "ulos" (k1 "tulo")) ; lin emergency_N = mkN "hätä" (mkN "jarru") ; --f96 lin emeritus_A = mkWA (k47 "täysinpalvellut") ; --UNCHK +lin emeritus_N = mkN "emeritus" ; lin emery_N = mkWN (k6 "smirgeli") ; --UNCHK lin emetic_N = mkWN (compoundN "oksetus" (k48 "aine")) ; --UNCHK lin emigrant_N = mkWN (k5A "emigrantti") ; --UNCHK @@ -17279,6 +17311,7 @@ lin emirate_N = mkWN (k1 "arvo") "emiirin" ; --UNCHK lin emissary_N = mkWN (k41 "lähettiläs") ; --UNCHK lin emission_N = mkN "päästö" ; --WN (k1A "vuoto") ; lin emit_V2 = mkWV2 (k53 "poistaa") ; --UNCHK +lin emitter_N = mkN "lähettäjä" ; lin emmenagogue_N = mkWN (k48A "lääke") "kuukautisia" "edistävä" ; --UNCHK lin emmer_N = mkWN (compoundN "kaksijyväis" (k10 "vehnä")) ; --UNCHK lin emmetropia_N = mkWN "oikeataittoisuus" ; --UNCHK @@ -18549,7 +18582,7 @@ lin expect_VV = mkVV (mkV "aikoa") ; lin expectable_A = mkWA (k10 "oleva") "odotettavissa" ; --UNCHK lin expectancy_N = mkWN (k39 "odotus") ; --UNCHK lin expectation_N = mkWN (k10 "näkymä") ; -lin expected_A = variants {} ; -- +lin expected_A = mkA "odotettu" ; lin expectedness_N = mkWN (compoundN "toden" (k40 "näköisyys")) ; --UNCHK lin expectorant_N = mkWN (k48A "lääke") "limaa" "poistava" ; --UNCHK lin expectorate_V = mkWV (k58A "sylkeä") ; --UNCHK @@ -18896,6 +18929,7 @@ lin faggot_N = mkWN (k1A "kimppu") ; --UNCHK lin fagot_N = mkWN (k1A "kimppu") ; --UNCHK lin fagoting_N = mkWN (k9A "kirjonta") ; --UNCHK lin faience_N = mkWN (k5 "fajanssi") ; --UNCHK +lin fail_N = mkN "epäonnistuminen" ; lin fail_V = mkV "epäonnistua" ; lin fail_V2 = mkV2 (mkV "epäonnistua") (mkPrep inessive) ; lin fail_VS = mkWVS (k72A "heiketä") ; --UNCHK @@ -19143,6 +19177,7 @@ lin fathead_N = mkWN (k5 "aasi") ; --UNCHK lin father_N = mkN "isä" ; lin father_N2 = L.father_N2 ; lin father_V2 = mkWV2 (k53A "siittää") ; --UNCHK +lin father_in_law_N = mkN "appi" ; lin fatherhood_N = mkWN (k40 "isyys") ; --UNCHK lin fatherland_N = mkWN (compoundN "synnyin" (k18 "maa")) ; --UNCHK lin fatherless_A = mkWA (k34A "isätön") ; --UNCHK @@ -19708,7 +19743,7 @@ lin finish_off_V2 = mkWV2 (k63 "saada") "valmiiksi" ; --UNCHK lin finish_up_V = mkWV (k52A "joutua") ; --UNCHK lin finish_up_with_V2 = prepV2 (advV OP_finish_V OP_up_Adv ) OP_with_Prep ; -- guess-p-verb lin finish_with_V2 = prepV2 OP_finish_V OP_with_Prep ; -- guess-p-verb -lin finished_A = variants {} ; -- +lin finished_A = mkA "päättynyt" ; lin finisher_N = mkWN (k10 "voittaja") ; --UNCHK lin finite_A = mkWA (k38 "äärellinen") ; --UNCHK lin finiteness_N = mkWN (k40 "rajallisuus") ; --UNCHK @@ -19872,7 +19907,7 @@ lin fix_up_V2 = mkWV2 (k53A "hoitaa") ; --UNCHK lin fixate_V2 = mkWV2 (k53A "kiinnittää") "katseensa" ; --UNCHK lin fixation_N = mkWN (k39 "fikseeraus") ; --UNCHK lin fixative_N = mkWN (k5 "fiksatiivi") ; --UNCHK -lin fixed_A = variants {} ; -- +lin fixed_A = mkA "kiinteä" ; lin fixedness_N = mkWN (k40 "muuttumattomuus") ; --UNCHK lin fixer_N = mkWN (k5 "heroiini") "synteettinen" ; --UNCHK lin fixture_N = mkWN (k1A "huolto") ; --UNCHK @@ -20412,7 +20447,7 @@ lin footwork_N = mkWN (k3 "kuvio") ; --UNCHK lin fop_N = mkWN (k12 "hienostelija") ; --UNCHK lin foppish_A = mkWA (compoundA "keikari" (k38 "mainen")) ; --UNCHK lin foppishness_N = mkWN (k5A "keikarointi") ; --UNCHK -lin for_Adv = variants {} ; -- S.for_Prep ; +lin for_Adv = mkAdv "puolesta" ; lin for_PConj = mkPConj "sillä" ; lin for_Prep = S.for_Prep ; lin for_example_Adv = mkAdv "esimerkiksi" ; --f225 @@ -20764,6 +20799,7 @@ lin frangipane_N = mkWN "mantelikermaleivos" ; --UNCHK lin frangipani_N = mkWN (k5 "jasmiini") "punainen" ; --UNCHK lin frank_A = mkWA (k34A "kursailematon") ; --UNCHK lin frank_N = mkWN (kH1 "nakki") ; --UNCHK +lin frank_PN = mkPN "Frank" ; lin frank_V2 = mkWV2 (k53A "lähettää") "vapaakirjeenä" ; --UNCHK lin frankfurt_PN = mkPN "Frankfurt" ; lin frankfurter_N = mkWN (kH1 "nakki") ; --UNCHK @@ -21000,7 +21036,7 @@ lin frowningly_Adv = mkWAdv (compoundAdv "paheksuv" (k99 "asti")) ; --UNCHK lin frowsty_A = mkWA (k38 "tunkkainen") ; --UNCHK lin frowsy_A = mkWA (k38 "sotkuinen") ; --UNCHK lin frowzy_A = mkWA (k38 "sotkuinen") ; --UNCHK -lin frozen_A = variants {} ; -- +lin frozen_A = mkA "jäätynyt" ; lin frs_N = mkWN (compoundN "keskus" (k5A "pankki")) "Yhdysvaltain" ; --UNCHK lin fructify_V = mkWV (k71 "tehdä") "hedelmää" ; --UNCHK lin fructify_V2 = mkWV2 (k71 "tehdä") "hedelmää" ; --UNCHK @@ -21124,8 +21160,9 @@ lin fundamentalism_N = mkWN (k5 "fundamentalismi") ; --UNCHK lin fundamentalist_A = mkWA (k38 "fundamentalistinen") ; --UNCHK lin fundamentalist_N = mkWN (k5 "fundamentalisti") ; --UNCHK lin fundamentals_N = mkWN (k10 "pohja") ; --UNCHK -lin funding_N = variants {} ; -- +lin funding_N = mkN "rahoitus" ; lin fundraiser_N = mkWN (compoundN "varainhankinta" (k40 "tilaisuus")) ; --UNCHK +lin fundraising_N = mkN "rahanhankinta" ; lin funds_N = mkWN (k38 "käteinen") ; --UNCHK lin fundus_N = mkWN (k14A "pohjukka") ; --UNCHK lin funeral_N = mkN "hautajaistilaisuus" ; @@ -21380,6 +21417,7 @@ lin gametophyte_N = mkWN "gametofyytti" ; --UNCHK lin gamey_A = mkWA (k15 "rohkea") ; --UNCHK lin gamine_N = mkWN (k1A "tyttö") "ilkikurinen" ; --UNCHK lin gaminess_N = mkWN (k40 "ruokottomuus") ; --UNCHK +lin gaming_N = mkN "pelaaminen" ; lin gaming_house_N = mkWN (compoundN "peli" (k10 "luola")) ; --UNCHK lin gaming_table_N = mkWN (compoundN "peli" (k10A "pöytä")) ; --UNCHK lin gamma_N = mkWN (k9 "gamma") ; --UNCHK @@ -22007,7 +22045,7 @@ lin give_way_to_V2 = prepV2 (advV OP_give_V OP_way_Adv ) OP_to_Prep ; -- guess-p lin give_yourself_up_V = variants {} ; -- guess-p-verb lin give_yourself_up_to_V2 = variants {} ; -- guess-p-verb lin giveaway_N = mkN "ilmais" (mkN "lahja") ; --mkWN (k2 "visailu") ; -lin given_A = variants {} ; -- +lin given_A = mkA "annettu" ; lin given_N = mkWN (k39 "oletus") ; --UNCHK lin givenness_N = mkWN "oletuksellisuus" ; --UNCHK lin giver_N = mkWN (k10 "antaja") ; --UNCHK @@ -23906,6 +23944,7 @@ lin heathen_A = mkWA (k38 "etninen") ; --UNCHK lin heathen_N = mkWN (k12 "pakana") ; --UNCHK lin heathenish_A = mkWA (k38 "etninen") ; --UNCHK lin heather_N = mkWN (k48A "sekoite") ; --UNCHK +lin heather_PN = mkPN "Heather" ; lin heather_mixture_N = mkWN (k48A "sekoite") ; --UNCHK lin heathlike_A = mkWA (compoundA "nummi" (k38 "mainen")) ; --UNCHK lin heating_N = mkWN (k33A "lämmitin") ; --UNCHK @@ -25456,6 +25495,7 @@ lin hysteroscopy_N = mkWN (compoundN "hysterosko" (k5A "oppi")) ; --UNCHK lin hythe_PN = foreignPN "Hythe" ; lin iFem_Pron = optProDrop S.i_Pron ; lin i_Pron = optProDrop S.i_Pron ; +lin i_e__Adv = mkAdv"so." ; lin iamb_N = mkWN (k5 "jambi") ; --UNCHK lin iambic_A = mkWA (compoundA "jambi" (k38 "nen")) ; --UNCHK lin iambic_N = mkWN (k48A "säe") "jambinen" ; --UNCHK @@ -26194,8 +26234,8 @@ lin incorruptness_N = mkWN (k40 "turmeltumattomuus") ; --UNCHK lin increase_N = mkN "nousu" ; lin increase_V = mkV "kasvaa" ; lin increase_V2 = mkV2 "lisätä" partitive ; -lin increased_A = variants {} ; -- -lin increasing_A = variants {} ; -- +lin increased_A = mkA "lisääntynyt" ; +lin increasing_A = mkA "lisääntyvä" ; lin increasingly_AdA = mkAdA "enenevästi" ; lin increasingly_AdV = mkAdV "enenevästi" ; lin increasingly_Adv = mkWAdv (k99 "enemmän") "yhä" ; --f80 @@ -26476,6 +26516,7 @@ lin infatuation_N = mkWN (k48A "kohde") "hullaantumisen" ; --UNCHK lin infeasibility_N = mkWN (compoundN "epä" (k40 "käytännöllisyys")) ; --UNCHK lin infect_V = mkV "tarttua" ; lin infect_V2 = mkV2 "tartuttaa" | mkWV2 (k53A "saastuttaa") ; +lin infected_A = mkA "tulehtunut" ; lin infection_N = mkWN (k9A "tartunta") ; lin infectious_A = mkWA "tarttuva" ; lin infective_A = mkWA (k38 "patogeeninen") ; --UNCHK @@ -26647,7 +26688,7 @@ lin injudicious_A = mkWA (compoundA "epä" (k41 "viisas")) ; --UNCHK lin injudiciousness_N = mkWN (k40 "tahdittomuus") ; --UNCHK lin injunction_N = mkWN (k1A "kielto") ; --UNCHK lin injure_V2 = mkWV2 (k53A "satuttaa") ; --UNCHK -lin injured_A = variants {} ; -- +lin injured_A = mkA "haavoittunut" ; lin injurious_A = mkWA (k38 "turmiollinen") ; --UNCHK lin injury_N = mkN "vamma" ; lin injustice_N = mkWN (k40 "vääryys") ; --UNCHK @@ -26932,6 +26973,7 @@ lin intelligible_A = mkWA (compoundA "helppo" (k38 "tajuinen")) ; --UNCHK lin intemperance_N = mkWN (k40 "harkitsemattomuus") ; --UNCHK lin intemperate_A = mkWA (k34A "harkitsematon") ; --UNCHK lin intend_VV = mkVV (mkV "aikoa") ; +lin intended_A = mkA "aiottu" ; lin intense_A = mkA "intensiivinen" ; lin intensification_N = mkWN (k39 "lisäys") ; --UNCHK lin intensifier_N = mkWN (k33 "vahvistin") ; --UNCHK @@ -27319,7 +27361,7 @@ lin involution_N = mkWN "kääriminen" ; --UNCHK lin involve_V = mkV "koskea" ; lin involve_V2 = mkV2 "koskea" partitive ; lin involve_VS = mkVS "sisältää" ; -lin involved_A = variants {} ; -- +lin involved_A = mkA "asiaanomainen" ; lin involvement_N = mkWN (compoundN "osan" (k1A "otto")) ; --UNCHK lin invulnerability_N = mkWN "haavoittumattomuus" ; --UNCHK lin invulnerable_A = mkWA (k10 "kestävä") ; --UNCHK @@ -27426,6 +27468,7 @@ lin irredenta_N = mkWN (compoundN "irredenta-" (k48 "alue")) ; --UNCHK lin irredentist_N = mkWN "irredentti" ; --UNCHK lin irrefutable_A = mkWA (k34A "kiistämätön") ; --UNCHK lin irregardless_Adv = mkWAdv (k99 "riippumatta") ; --UNCHK +lin irregular_A = mkA "epäsäännöllinen" ; lin irregular_N = mkWN (k5A "lehtoraatti") ; --UNCHK lin irregularity_N = mkWN (k40 "poikkeavuus") ; --UNCHK lin irrelevance_N = mkWN "merkityksettömyys" ; --UNCHK @@ -27632,6 +27675,7 @@ lin jailer_N = mkWN (kH1 "pamppu") ; --UNCHK lin jailor_N = mkWN (kH1 "pamppu") ; --UNCHK lin jaipur_PN = foreignPN "Jaipur" ; lin jakarta_PN = foreignPN "Jakarta" ; +lin jake_PN = mkPN "Jake" ; lin jakes_N = mkWN (k50 "kuivakäymälä") ; --UNCHK lin jalapeno_N = mkWN (k1 "jalapeno") ; --UNCHK lin jalopy_N = mkWN (k2 "kottero") ; --UNCHK @@ -28516,7 +28560,7 @@ lin knowingness_N = mkWN (k40 "tietoisuus") ; --UNCHK lin knowledge_N = mkN "tieto" ; lin knowledgeability_N = mkWN (k40 "perehtyneisyys") ; --UNCHK lin knowledgeable_A = mkWA (k47 "perehtynyt") ; -lin known_A = variants {} ; -- +lin known_A = mkA "tunnettu" ; lin knuckle_N = mkWN (k38 "rystynen") ; --UNCHK lin knuckle_V = mkWV (k52A "ampua") ; --UNCHK lin knuckle_down_V = mkWV (k67 "ponnistella") ; --UNCHK @@ -28622,6 +28666,7 @@ lin labial_A = mkWA (compoundA "labia" (k38 "alinen")) ; --UNCHK lin labiate_A = mkWA (compoundA "huuli" (k38 "mainen")) ; --UNCHK lin labile_A = mkWA (k5 "labiili") ; --UNCHK lin labium_N = mkWN (compoundN "häpy" (k24 "huuli")) ; --UNCHK +lin labor_N = mkN "työ" ; lin laboratory_N = mkWN (k3 "laboratorio") ; lin labored_A = mkWA (k41 "työläs") ; --UNCHK lin laborer_N = mkWN (k38 "työläinen") ; --UNCHK @@ -28885,7 +28930,7 @@ lin larch_N = mkWN (k24 "lehtikuusi") ; --UNCHK lin lard_N = mkWN (k5 "laardi") ; --UNCHK lin lard_V2 = mkWV2 (k53A "värittää") ; --UNCHK lin larder_N = mkWN (k6 "pentteri") ; --UNCHK -lin large_A = mkA "suuri" ; +lin large_A = mkA (mkN "suuri" "suuria") ; lin large_Adv = mkWAdv (k99 "leveästi") ; --UNCHK lin large_N = mkWN (kH1 "koko") "suuri" ; --UNCHK lin large_scale_A = mkA "laajamittainen" ; @@ -29130,7 +29175,7 @@ lin leaded_A = mkWA (compoundA "lyijypi" (k38 "toinen")) ; --UNCHK lin leaden_A = mkWA "lyijystä" "tehty" ; --UNCHK lin leader_N = mkN (lin NK {s = d10 "johtaja"}) ; lin leadership_N = mkWN (k40 "johtajuus") ; --f60 -lin leading_A = variants {} ; -- +lin leading_A = mkA "johtava" ; lin leading_N = mkWN (k40 "johtajuus") ; --UNCHK lin leadplant_N = mkWN "Amorpha" "canescens" ; --UNCHK lin leadwort_N = mkWN (compoundN "lyijy" (k10A "kukka")) ; --UNCHK @@ -29547,6 +29592,7 @@ lin libyan_A = mkWA (compoundA "liby" (k38 "alainen")) ; --UNCHK lin libyan_N = mkWN (compoundN "liby" (k38 "alainen")) ; --UNCHK lin licence_N = mkWN (k5 "lisenssi") ; --UNCHK lin licence_V2 = mkWV2 (k53 "laillistaa") ; --UNCHK +lin license_N = mkN "lisenssi" ; lin license_V2 = mkV2 "luvallistaa" ; lin licensee_N = mkWN (k12 "haltija") "luvan" ; --UNCHK lin licenser_N = mkWN (compoundN "lisenssin" (k10 "antaja")) ; --UNCHK @@ -31041,7 +31087,7 @@ lin manager_N = mkN "johtaja" | mkWN (compoundN "esi" (k42 "mies")) ; lin manageress_N = mkWN (k32A "johtajatar") ; --UNCHK lin managerial_A = mkWA "liikkeenjohdollinen" ; --UNCHK lin managership_N = mkWN (k40 "johtajuus") ; --UNCHK -lin managing_A = variants {} ; -- +lin managing_A = mkA "johtava" ; lin manakin_N = mkWN (k12 "tanssija") ; --UNCHK lin manana_N = mkWN (k40 "tulevaisuus") ; --UNCHK lin manatee_N = mkWN "Trichechus" "manatus" ; --UNCHK @@ -31320,7 +31366,7 @@ lin marquis_N = mkWN (k5 "markiisi") ; --UNCHK lin marriage_N = mkN "avioliitto" ; lin marriageability_N = mkWN (compoundN "naima" (k40 "kelpoisuus")) ; --UNCHK lin marriageable_A = mkWA (compoundA "avioliitto" (k38 "kelpoinen")) ; --UNCHK -lin married_A = variants {} ; -- +lin married_A = mkA "nainut" ; lin married_A2 = L.married_A2 ; lin married_N = mkWN (k38 "ihminen") "naimisissa" "oleva" ; --UNCHK lin marrow_N = mkWN (compoundN "luu" (k33A "ydin")) ; --UNCHK @@ -32300,6 +32346,7 @@ lin middling_Adv = mkWAdv (k99 "ihan") ; --UNCHK lin middling_N = mkWN (compoundN "keski" (k38 "nkertainen")) ; --UNCHK lin middy_N = mkWN (compoundN "merimies" (k2 "pusero")) ; --UNCHK lin midfield_N = mkWN (compoundN "keski" (k10A "kenttä")) ; --UNCHK +lin midfielder_N = mkN "keskikenttäpelaaja" ; lin midge_N = mkWN (k14A "itikka") ; --UNCHK lin midget_N = mkWN (k38 "ihminen") "lyhytkasvuinen" ; --UNCHK lin midgrass_N = mkWN (k1 "ruoho") "keskipitkä" ; --UNCHK @@ -32729,7 +32776,7 @@ lin miss_out_on_V2 = prepV2 (advV OP_miss_V OP_out_Adv ) OP_on_Prep ; -- guess-p lin missal_N = mkWN (compoundN "messu" (k9 "kirja")) ; --UNCHK lin misshapen_A = mkWA (k34A "muodoton") ; --UNCHK lin missile_N = mkWN (k39 "ohjus") ; -lin missing_A = variants {} ; -- +lin missing_A = mkA "puuttuva" ; lin mission_N = mkN "tehtävä" ; lin missionary_A = mkWA "käännytys-" ; --UNCHK lin missionary_N = mkWN (compoundN "käännytystyön" (k12 "tekijä")) ; --UNCHK @@ -33448,7 +33495,7 @@ lin mover_N = mkWN (compoundN "muutto" (k48A "liike")) ; --UNCHK lin movie_N = mkN "elokuva" ; lin moviegoer_N = mkWN (k10 "ystävä") "elokuvan" ; --UNCHK lin moviemaking_N = mkWN (k39 "filmaus") ; --UNCHK -lin moving_A = variants {} ; -- +lin moving_A = mkA "liikkuva" ; lin mow_N = mkWN (compoundN "heinä" (k10 "suova")) ; --UNCHK lin mow_V = mkWV (k53 "mutristaa") ; --UNCHK lin mow_V2 = mkWV2 (k53 "mutristaa") ; --UNCHK @@ -34216,6 +34263,7 @@ lin negroid_N = mkWN (k6 "neekeri") ; --UNCHK lin negus_N = mkWN (compoundN "viini" (k5 "toti")) ; --UNCHK lin neigh_N = mkWN (k12 "yninä") ; --UNCHK lin neigh_V = mkWV (k53A "hirnahtaa") ; --UNCHK +lin neighbor_N = mkN "naapuri" ; lin neighbour_N = mkWN (k6 "naapuri") ; --UNCHK lin neighbour_V = mkWV (k52A "rajoittua") ; --UNCHK lin neighbour_V2 = mkWV2 (k52A "rajoittua") ; --UNCHK @@ -35070,6 +35118,7 @@ lin note_VS = mkVS (mkV "huomauttaa") ; lin note_down_V2 = prepV2 OP_note_V OP_down_Prep ; -- guess-p-verb lin notebook_N = mkWN (compoundN "tieto" (k48 "kone")) "kannettava" ; --UNCHK lin notecase_N = mkWN (k4A "lompakko") ; --UNCHK +lin noted_A = mkA "huomattu" ; lin notepad_N = mkWN (compoundN "muisti" (k3 "lehtiö")) ; --UNCHK lin notepaper_N = mkWN (compoundN "kirje" (k6 "paperi")) ; --UNCHK lin noteworthy_A = mkWA (k10 "huomattava") ; --UNCHK @@ -35519,7 +35568,7 @@ lin offenceless_A = mkWA (compoundA "hyökkäys" (k34A "kyvytön")) ; --UNCHK lin offend_V = mkWV (k73A "loukata") ; --UNCHK lin offend_V2 = mkV2 "loukata" partitive ; lin offenderFem_N = mkWN (k38 "rikollinen") ; -lin offenderMasc_N = variants {} ; -- +lin offenderMasc_N = mkN "loukkaaja" ; lin offense_N = mkWN (k39 "rikos") ; --UNCHK lin offenseless_A = mkWA (compoundA "hyökkäys" (k34A "kyvytön")) ; --UNCHK lin offensive_A = mkWA (k10 "loukkaava") ; @@ -35721,6 +35770,7 @@ lin oneness_N = mkWN (k40 "ykseys") ; --UNCHK lin onerous_A = mkWA (k10 "vaativa") ; lin ongoing_A = mkWA (k10 "oleva") "käynnissä" ; --UNCHK lin onion_N = mkWN (k6 "sipuli") ; --UNCHK +lin online_A = mkA "kytketty" ; lin onlooker_N = mkWN (k10 "katsoja") ; --UNCHK lin only_Adv = mkAdv "vain" ; lin only_Predet = S.only_Predet ; @@ -35745,6 +35795,7 @@ lin ontogenetic_A = mkWA (compoundA "onto" (k38 "geneettinen")) ; --UNCHK lin ontological_A = mkWA "ontologinen" ; --UNCHK lin ontology_N = mkWN "ontologia" ; --UNCHK lin onus_N = mkWN (k17 "vastuu") ; --UNCHK +lin onward_A = mkA "jatkuva" ; lin onward_Adv = mkWAdv (k99 "edelleen") ; --UNCHK lin onwards_Adv = mkWAdv (k99 "edelleen") ; --UNCHK lin onycholysis_N = mkWN (compoundN "onykoly" (k5 "ysi")) ; --UNCHK @@ -35787,6 +35838,7 @@ lin openbill_N = mkWN (compoundN "rako" (k10A "nokka")) ; --UNCHK lin opencast_A = mkWA "avolouhos-" ; --UNCHK lin opener_N = mkWN (k10 "avaaja") ; --UNCHK lin openhearted_A = mkWA (compoundA "avo" (k38 "mielinen")) ; --UNCHK +lin opening_A = mkA "avaava" ; lin opening_N = mkWN (k39 "avaus") ; --f59 lin openness_N = mkWN (k40 "avoimuus") ; --UNCHK lin openwork_N = mkWN (compoundN "reikä" (k49A "ommel")) ; --UNCHK @@ -35855,7 +35907,7 @@ lin opportunist_A = mkWA (k38 "opportunistinen") ; --UNCHK lin opportunity_N = mkN (lin NK {s = d40 "tilaisuus"}) ; lin oppose_V = mkWV (k53 "vastustaa") ; lin oppose_V2 = mkWV2 (k53 "vastustaa") partitive ; -lin opposed_A = variants {} ; -- +lin opposed_A = mkA "vastustettu" ; lin opposite_A = mkWA (k38 "parillinen") ; --UNCHK lin opposite_Adv = variants {} ; -- mkPrep "vastapäätä" partitive ; lin opposite_N = mkWN (k10A "vastakohta") ; --UNCHK @@ -36091,6 +36143,7 @@ lin oryx_N = mkWN (compoundN "keihäs" (k5A "antilooppi")) ; --UNCHK lin orzo_N = mkWN "orzo" ; --UNCHK lin os_N = mkWN (k18 "luu") ; --UNCHK lin oscar_N = mkWN (compoundN "Oscar-" (k1A "palkinto")) ; --UNCHK +lin oscar_PN = mkPN "Oscar" ; lin oscheocele_N = mkWN (k39 "turvotus") "kivespussin" ; --UNCHK lin oscillate_V = mkWV (k67A "värähdellä") ; --UNCHK lin oscillate_V2 = mkWV2 (k67A "värähdellä") ; --UNCHK @@ -36572,7 +36625,7 @@ lin overweening_A = mkWA (compoundA "yli" (k38 "mielinen")) ; --UNCHK lin overweight_A = mkWA (k10 "pulska") ; --UNCHK lin overweight_N = mkWN (k40 "paksuus") ; --UNCHK lin overwhelm_V2 = mkV2 (mkV "pursuta") (mkPrep "yli") ; -lin overwhelming_A = variants {} ; -- +lin overwhelming_A = mkA "ylitsevuotava" ; lin overwork_N = mkWN (k19 "työ") "liika" ; --UNCHK lin overwork_V2 = mkV2 (mkV (mkV "antaa") "liikaa töitä") (casePrep allative) ; lin overwrought_A = mkWA (k99 "sekaisin") ; --UNCHK @@ -39015,7 +39068,7 @@ lin planking_N = mkWN (k39 "lankutus") ; --UNCHK lin plankton_N = mkWN (k2 "keijusto") ; --UNCHK lin planktonic_A = mkWA "plankton-" ; --UNCHK lin planless_A = mkWA (k34A "päämäärätön") ; --UNCHK -lin planned_A = variants {} ; -- +lin planned_A = mkA "suunniteltu" ; lin planner_N = mkN "suunnittelija" ; --f55 lin planning_N = mkWN (k2 "suunnittelu") ; lin planoconcave_A = mkWA (compoundA "taso" (k10 "kovera")) ; --UNCHK @@ -40373,6 +40426,7 @@ lin pressure_V2 = mkWV2 (k53 "painostaa") partitive ; lin pressure_V2V = mkWV2V (k53 "painostaa") ; --UNCHK lin pressure_cooker_N = mkWN (compoundN "paine" (k12 "kattila")) ; --UNCHK lin pressure_gauge_N = mkWN (compoundN "paine" (k6 "mittari")) ; --UNCHK +lin pressurized_A = mkA "paineistettu" ; lin prestatyn_PN = foreignPN "Prestatyn" ; lin prestidigitation_N = mkWN (k40 "näppäryys") ; --UNCHK lin prestidigitator_N = mkWN (k4A "maagikko") ; --UNCHK @@ -40533,7 +40587,7 @@ lin print_out_V2 = prepV2 OP_print_V OP_out_Prep ; -- guess-p-verb lin print_seller_N = mkWN (compoundN "painotuote" (k10 "myyjä")) ; --UNCHK lin print_shop_N = mkWN (k1 "paino") ; --UNCHK lin printable_A = mkWA (compoundA "paino" (k38 "kelpoinen")) ; --UNCHK -lin printed_A = variants {} ; -- +lin printed_A = mkA "painettu" ; lin printer_N = mkWN (k33 "tulostin") ; lin printing_N = mkWN (compoundN "kustannus" (k9A "toiminta")) ; lin printing_ink_N = mkWN (compoundN "paino" (k48 "muste")) ; --UNCHK @@ -40933,7 +40987,7 @@ lin propose_V = mkWV (k53A "esittää") ; lin propose_V2 = mkV2 "ehdottaa" partitive ; lin propose_VS = mkWVS (k53A "esittää") ; --UNCHK lin propose_VV = mkVV "ehdottaa" infPresPartAgr ; -lin proposed_A = variants {} ; -- +lin proposed_A = mkA "ehdotettu" ; lin proposer_N = mkWN (k10 "esittäjä") ; --UNCHK lin proposition_N = mkN "ehdotus" ; ---ARB --mkWN (k48A "hanke") ; lin proposition_V2 = mkWV2 (k53A "ehdottaa") "säädyttömiä" ; --UNCHK @@ -42161,7 +42215,7 @@ lin rainy_A = mkWA (k38 "sateinen") ; --UNCHK lin raisable_A = mkWA "kohotettava" ; --UNCHK lin raise_N = mkWN (k1 "nosto") ; --UNCHK lin raise_V2 = mkV2 "nostaa" ; -lin raised_A = variants {} ; -- +lin raised_A = mkA "kohotettu" ; lin raiser_N = mkWN (k10 "tuottaja") ; lin raisin_N = mkWN (k12 "rusina") ; --UNCHK lin raising_A = mkWA (compoundA "kor" (k10 "ottava")) ; --UNCHK @@ -43024,6 +43078,7 @@ lin regionalism_N = mkWN (k5 "regionalismi") ; --UNCHK lin register_N = mkWN (k9 "kassa") ; --UNCHK lin register_V = mkV "kirjoittautua" ; ---ARB --mkWV (k67 "tulla") "ymmärretyksi" ; lin register_V2 = mkV2 "rekisteröidä" ; +lin registered_A = mkA "rekisteröity" ; lin registrant_N = mkWN "rekisteröijä" ; --UNCHK lin registrar_N = mkWN (compoundN "pöytäkirjan" (k10 "pitäjä")) ; --UNCHK lin registration_N = mkWN (compoundN "kirjo" (k38 "ittautuminen")) ; --UNCHK @@ -43129,7 +43184,7 @@ lin relapse_V = mkWV (k52A "pahentua") ; --UNCHK lin relate_N = variants {} ; -- lin relate_V = mkV "liittyä" | mkV vOlla "yhteydessä" ; lin relate_V2 = mkV2 "liittää" | mkV2 "suhteuttaa" ; -lin related_A = variants {} ; -- +lin related_A = mkA "liittyvä" ; lin relatedness_N = mkWN (k40 "sukulaisuus") ; --UNCHK lin relation_N = mkWN (k48A "suhde") ; lin relational_A = mkWA (k38 "suhteellinen") ; --UNCHK @@ -43197,7 +43252,7 @@ lin rely_V = mkWV (k53A "luottaa") ; --f52 lin rely_V2 = variants {} ; -- mkWV (k53A "luottaa") ; --f52 lin rely_on_V = mkWV (k67 "olla") "riippuvainen" ; --UNCHK lin rely_on_V2V = mkWV2V (k67 "olla") "riippuvainen" ; --UNCHK -lin remain_N = variants {} ; -- +lin remain_N = mkN "jäännös" ; lin remain_V = mkV "jäädä" ; lin remain_V2 = mkV2 (mkV "pysyä") (mkPrep essive) ; lin remain_VA = mkVA (mkV "pysyä") (mkPrep essive) ; @@ -43357,7 +43412,7 @@ lin repeat_V = mkWV (k52 "toistua") ; lin repeat_V2 = mkV2 "toistaa" ; lin repeat_VS = mkVS (mkV "toistaa") ; lin repeatable_A = mkWA (k38 "arvoinen") "siteeraamisen" ; --UNCHK -lin repeated_A = variants {} ; -- +lin repeated_A = mkA "toistuva" ; lin repeater_N = mkWN "toistin" ; --UNCHK lin repechage_N = mkWN (compoundN "repechage-" (k10 "erä")) ; --UNCHK lin repel_V2 = mkWV2 (k53 "kiistää") ; --UNCHK @@ -43404,13 +43459,14 @@ lin reportable_A = mkWA "ilmoitettava" ; --UNCHK lin reportage_N = mkWN (compoundN "uuti" (k5A "sointi")) ; --UNCHK lin reportedly_Adv = mkWAdv (k99 "mukaan") "saatujen" "tietojen" ; --UNCHK lin reporterFem_N = mkWN (k10 "toimittaja") ; --f73 -lin reporterMasc_N = variants {} ; -- +lin reporterMasc_N = mkN "reportteri" ; lin repose_N = mkWN (k1A "lepo") ; --UNCHK lin repose_V = mkWV (k56A "laittaa") ; --UNCHK lin repose_V2 = mkWV2 (k56A "laittaa") ; --UNCHK lin reposeful_A = mkWA (k38 "levollinen") ; --UNCHK lin repositing_N = mkWN (k5A "varastointi") ; --UNCHK lin reposition_V2 = mkV2 (mkV (mkV "asettaa") "paikalleen") ; +lin repositioning_N = mkN "uudelleensijoittaminen" ; lin repository_N = mkWN (k1 "säilö") ; --UNCHK lin repossess_V2 = mkV2 (mkV (mkV "omistaa") "uudelleen") ; lin repossession_N = mkWN (compoundN "haltuun" (k1A "otto")) ; --UNCHK @@ -43513,7 +43569,7 @@ lin rescuerMasc_N = mkWN (k10 "pelastaja") ; --UNCHK lin research_N = mkN "tutkimus" ; lin research_V = mkWV (k58A "hakea") ; --UNCHK lin research_V2 = mkWV2 (k58A "hakea") ; --UNCHK -lin researcherMasc_N = variants {} ; -- +lin researcherMasc_N = mkN "tutkija" ; lin reseau_N = mkWN (compoundN "värimosaiikkiruud" (k1A "ukko")) ; --UNCHK lin resection_N = mkWN "resektio" ; --UNCHK lin reseda_N = mkWN "mignonette" ; --UNCHK @@ -43668,7 +43724,7 @@ lin restructure_V2V = mkWV2V (k53 "muodostaa") "uudelleen" ; --UNCHK lin result_N = mkN "tulos" ; lin result_V = mkV "seurata" ; ---- subcat lin resultant_N = mkWN (k5A "resultantti") ; --UNCHK -lin resulting_A = variants {} ; -- +lin resulting_A = mkA "tuloksenaoleva" ; lin resume_N = mkWN (compoundN "ansio" (k2 "luettelo")) ; --UNCHK lin resume_V = mkWV (k53 "käynnistää") "uudelleen" ; --UNCHK lin resume_V2 = mkWV2 (k53 "käynnistää") "uudelleen" ; @@ -43730,7 +43786,7 @@ lin retinopathy_N = mkWN (compoundN "verkkokalvo" (k40 "sairaus")) ; --UNCHK lin retinue_N = mkWN (k48 "seurue") ; --UNCHK lin retire_V = mkV "vetäytyä" ; lin retire_V2 = mkV2 (mkV (mkV "vetää") "pois") ; -lin retired_A = variants {} ; -- +lin retired_A = mkA "eläkkeelläoleva" ; lin retiree_N = mkWN (k38 "eläkeläinen") ; --UNCHK lin retirement_N = mkWN "vetäytyminen" ; lin retool_V2 = mkWV2 (k61 "uusia") "kalusto" ; --UNCHK @@ -44171,7 +44227,7 @@ lin ripon_PN = foreignPN "Ripon" ; lin riposte_N = mkWN (compoundN "vasta" (k1 "pisto")) ; --UNCHK lin riposte_V = mkWV (k54A "sivaltaa") ; --UNCHK lin ripper_N = mkWN "viiltäjä" ; --UNCHK -lin ripple_N = mkWN (k48 "väre") ; +lin ripple_N = mkWN (k48 "väre") ; lin ripple_V = mkV "väreillä" ; lin ripple_V2 = mkWV2 (k53A "värisyttää") ; --UNCHK lin ripsaw_N = mkWN (compoundN "halkaisu" (k9 "saha")) ; --UNCHK @@ -44184,7 +44240,7 @@ lin riser_N = mkWN (compoundN "varvas" (k9A "lauta")) ; --UNCHK lin rishton_PN = foreignPN "Rishton" ; lin risibility_N = mkWN (compoundN "naura" (k40 "vaisuus")) ; --UNCHK lin risible_A = mkWA (k1 "hassu") ; --UNCHK -lin rising_A = variants {} ; -- +lin rising_A = mkA "nouseva" ; lin rising_N = mkWN (k5A "kapinointi") ; --UNCHK lin risk_N = mkN "riski" ; lin risk_V2 = mkWV2 (k53A "ottaa") "riski" ; --UNCHK @@ -44755,7 +44811,7 @@ lin rung_N = mkWN (k9 "piena") ; --UNCHK lin runic_A = mkWA "riimu-" ; --UNCHK lin runnel_N = mkWN (k1 "puro") ; --UNCHK lin runner_N = mkWN "Caranx" "crysos" ; --UNCHK -lin running_A = variants {} ; -- +lin running_A = mkA "juokseva" ; lin running_N = mkWN (k1 "juoksu") ; --UNCHK lin running_board_N = mkWN (compoundN "astin" (k9A "lauta")) ; --UNCHK lin runny_A = mkWA (k10 "juokseva") ; --UNCHK @@ -46223,7 +46279,9 @@ lin selenology_N = mkWN (compoundN "kuun" (k39 "tutkimus")) ; --UNCHK lin self_A = mkWA "itse-" ; --UNCHK lin self_N = mkWN (k101 "minä") ; --UNCHK lin self_confessed_A = mkA "tunnustautunut" ; +lin self_confidence_N = mkN "itseluottamus" ; lin self_conscious_A = mkA "itsetietoinen" ; +lin self_defence_N = mkN "itsepuolustus" ; lin self_destruct_V = mkV (mkV "tuhota") "itsensä" ; lin self_employed_A = mkA "itsensätyöllistävä" ; lin self_explanatory_A = mkA (mkN "itsestään" (mkN "selvä")) ; @@ -46272,7 +46330,7 @@ lin semblance_N = mkWN (compoundN "ulko" (k1A "muoto")) ; --UNCHK lin semen_N = mkWN (kH1 "mälli") ; --UNCHK lin semester_N = mkWN (compoundN "puolivuotis" (k27 "kausi")) ; --UNCHK lin semestral_A = mkWA (compoundA "puoli" (k38 "vuosittainen")) ; --UNCHK -lin semi_final_N = variants {} ; -- +lin semi_final_N = mkN "semifinaali" ; lin semiabstract_A = mkWA (compoundA "puoli" (k5 "abstrakti")) ; --UNCHK lin semiannual_A = mkWA (compoundA "puoli" (k38 "vuosittainen")) ; --UNCHK lin semiaquatic_A = mkWA (compoundA "semi" (k38 "akvaattinen")) ; --UNCHK @@ -47626,6 +47684,7 @@ lin sit_back_V = mkWV (k52A "rentoutua") ; --UNCHK lin sit_by_V = advV OP_sit_V OP_by_Adv ; -- guess-p-verb lin sit_down_V2 = mkWV2 (k52A "istuutua") ; --UNCHK lin sit_for_V2 = prepV2 OP_sit_V OP_for_Prep ; -- guess-p-verb +lin sit_in_N = mkN "istunto" ; lin sit_in_V2 = mkWV2 (k68 "pullikoida") ; --UNCHK lin sit_in_for_V2 = prepV2 (advV OP_sit_V OP_in_Adv ) OP_for_Prep ; -- guess-p-verb lin sit_in_on_V2 = prepV2 (advV OP_sit_V OP_in_Adv ) OP_on_Prep ; -- guess-p-verb @@ -49354,7 +49413,7 @@ lin spotter_N = mkWN (k12 "tarkkailija") ; --UNCHK lin spotty_A = mkWA (k38 "rosoinen") ; --UNCHK lin spousal_A = mkWA "puolisoiden" ; --UNCHK lin spouseFem_N = mkWN (kH1 "siippa") ; --UNCHK -lin spouseMasc_N = variants {} ; -- +lin spouseMasc_N = mkN "puoliso" ; lin spout_N = mkWN (k33A "suutin") ; --UNCHK lin spout_V = mkWV (k73 "pauhata") ; --UNCHK lin spout_V2 = mkWV2 (k73 "pauhata") ; --UNCHK @@ -49795,6 +49854,7 @@ lin state_N = mkN "valtio" ; lin state_V2 = mkWV2 (k74A "todeta") ; lin state_VS = mkWVS (k74A "todeta") | mkVS "lausua" ; lin statecraft_N = mkWN (k12 "diplomatia") ; --UNCHK +lin statehood_N = mkN "valtiollisuus" ; lin statehouse_N = mkWN (compoundN "valtiopäivä" (k1 "talo")) ; --UNCHK lin stateless_A = mkWA (k34A "kansalaisuudeton") ; --UNCHK lin stateliness_N = mkWN (k40 "ylevyys") ; --UNCHK @@ -50019,6 +50079,7 @@ lin stew_V2 = mkWV2 (k53A "hauduttaa") ; --UNCHK lin steward_N = mkWN (k6 "pehtori") ; --UNCHK lin stewardess_N = mkWN (compoundN "lento" (k1 "emo")) ; --UNCHK lin stewardship_N = mkWN (k40 "edustajuus") ; --UNCHK +lin stewart_PN = mkPN "Stewart" ; lin stewing_N = mkWN (k1A "keitto") ; --UNCHK lin steyning_PN = foreignPN "Steyning" ; lin sthene_N = mkWN (compoundN "tuki" (k10 "voima")) ; --UNCHK @@ -50192,7 +50253,7 @@ lin stoke_V2 = mkWV2 (k54A "kohentaa") ; --UNCHK lin stokehold_N = mkWN (compoundN "kattila" (k48 "huone")) ; --UNCHK lin stokehole_N = mkWN (compoundN "kattila" (k48 "huone")) ; --UNCHK lin stole_N = mkWN (k10 "stoola") ; --UNCHK -lin stolen_A = variants {} ; -- +lin stolen_A = mkA "varastettu" ; lin stolid_A = mkWA (k34A "ilmeetön") ; --UNCHK lin stolidity_N = mkWN (k40 "tyyneys") ; --UNCHK lin stolidness_N = mkWN (k40 "tyyneys") ; --UNCHK @@ -51877,6 +51938,7 @@ lin take_in_V2 = mkWV2 (k54A "pienentää") ; --UNCHK lin take_it_V2 = variants {} ; -- guess-p-verb lin take_it_out_on_V2 = variants {} ; -- guess-p-verb lin take_it_upon_yourself_V = variants {} ; -- guess-p-verb +lin take_off_N = mkN "nousu" ; lin take_off_V = mkWV (k52 "riisua") ; --UNCHK lin take_off_V2 = mkWV2 (k52 "riisua") ; --UNCHK lin take_on_V = mkWV (k52 "omaksua") ; --UNCHK @@ -51897,6 +51959,7 @@ lin takeout_N = mkWN (compoundN "ilmaisu" (k39 "kahdennus")) ; --UNCHK lin takeover_N = mkWN (k39 "valtaus") ; --f363 lin taker_N = mkWN (k10 "ottaja") ; --UNCHK lin takin_N = mkWN "Budorcas" "taxicolor" ; --UNCHK +lin taking_N = mkN "otos" ; lin tala_N = mkWN "tala" ; --UNCHK lin talapoin_N = mkWN (compoundN "gabonin" (k5A "marakatti")) ; --UNCHK lin talc_N = mkWN (k5A "talkki") ; --UNCHK @@ -51930,7 +51993,7 @@ lin talk_yourself_out_V = variants {} ; -- guess-p-verb lin talkative_A = mkWA (k41 "puhelias") ; --UNCHK lin talker_N = mkWN (k10 "lausuja") ; --UNCHK lin talkie_N = mkWN "äänielokuva" ; --UNCHK -lin talking_N = variants {} ; -- +lin talking_N = mkN "puhuminen" ; lin talking_point_N = mkWN (k10A "näkökohta") "huomionarvoinen" ; --UNCHK lin talking_to_N = mkWN (k2 "nuhtelu") ; --UNCHK lin tall_A = mkWA (k41A "kookas") ; --UNCHK @@ -53352,7 +53415,7 @@ lin tire_N = mkWN (k41A "rengas") ; --UNCHK lin tire_V = mkWV (k52A "uupua") ; --UNCHK lin tire_V2 = mkV2 "uuvuttaa" ; --mkWV2 (k52A "uupua") ; lin tire_out_V2 = mkWV2 (k52A "uupua") ; --UNCHK -lin tired_A = variants {} ; -- +lin tired_A = mkA "väsynyt" ; lin tiredness_N = mkWN (k39 "väsymys") ; --UNCHK lin tireless_A = mkWA (k34A "uupumaton") ; --UNCHK lin tiresome_A = mkWA (k10 "rasittava") ; --UNCHK @@ -53398,7 +53461,8 @@ lin tiyin_N = mkWN "tenge" ; --UNCHK lin tizzy_N = mkWN (k39 "kiihtymys") ; --UNCHK lin tnt_N = mkWN (k6 "trotyyli") ; --UNCHK lin to_Adv = mkAdv "luo" ; ---- what is this? -lin to_Prep = mkPrep illative | mkPrep allative ; +lin to_Prep = mkPrep illative | mkPrep allative ; +lin to_date_Adv = mkAdv "tähän mennessä" ; lin toad_N = mkWN (k10 "konna") ; --UNCHK lin toadfish_N = mkWN (k18 "tau") "Opsanus" ; --UNCHK lin toadflax_N = mkWN (compoundN "kannus" (k1 "ruoho")) ; --UNCHK @@ -53893,7 +53957,7 @@ lin train_V2V = mkV2V "valmentaa" | mkV2V "harjoittaa" ; --valmensin häntä tai lin train_up_V2 = prepV2 OP_train_V OP_up_Prep ; -- guess-p-verb lin trainband_N = mkWN (k12 "komppania") ; --UNCHK lin trainbandsman_N = mkWN (k41 "sotilas") "parvariskaartin" ; --UNCHK -lin trained_A = variants {} ; -- +lin trained_A = mkA "treenattu" ; lin trainee_N = mkWN (k12 "harjoittelija") ; --UNCHK lin traineeship_N = mkWN (compoundN "harjoittelu" (k5 "stipendi")) ; --UNCHK lin trainer_N = mkN "valmentaja" ; @@ -54868,6 +54932,7 @@ lin ugly_A = L.ugly_A ; lin uh_Interj = mkInterj "uh" ; lin uh_huh_Interj = mkInterj "uhhuh" ; lin uh_uh_Interj = mkInterj "uhhuh" ; +lin uk_PN = mkPN "Iso-Britannia" ; lin ukase_N = mkWN (k6 "ukaasi") ; --UNCHK lin uke_N = mkWN (k8 "ukulele") ; --UNCHK lin ukulele_N = mkWN (k8 "ukulele") ; --UNCHK @@ -56509,6 +56574,7 @@ lin upbraider_N = mkWN (k12 "moittija") ; --UNCHK lin upbraiding_N = mkWN (k39 "läksytys") ; --UNCHK lin upbringing_N = mkWN (k39 "kasvatus") ; --UNCHK lin upcast_N = mkWN (compoundN "tuuletus" (k1 "kuilu")) ; --UNCHK +lin upcoming_A = mkA "tuleva" ; lin upcountry_A = mkWA "sisämaa-" ; --UNCHK lin upcurved_A = mkWA "ylöspäin" "kaartuva" ; --UNCHK lin update_N = mkWN (k39 "päivitys") ; --UNCHK @@ -56560,6 +56626,7 @@ lin upset_V = mkV "järkkyä" ; --mkWV (k53A "sekoittaa") ; lin upset_V2 = mkWV2 (k53A "sekoittaa") ; --UNCHK lin upsetter_N = mkWN (compoundN "yllätys" (k10 "voittaja")) ; --UNCHK lin upshot_N = mkWN (k39 "tulos") ; --UNCHK +lin upside_N = mkN "yläpuoli" ; lin upside_down_Adv = mkWAdv (k99 "ylösalaisin") ; --UNCHK lin upsilon_N = mkWN "ypsilon" ; --UNCHK lin upstage_A = mkWA "takanäyttämön" ; --UNCHK @@ -56657,6 +56724,8 @@ lin urtication_N = mkWN (compoundN "nokkos" (k39 "piiskaus")) ; --UNCHK lin uruguay_PN = foreignPN "Uruguay" ; lin uruguayan_A = mkWA (compoundA "uruguay" (k38 "lainen")) ; --UNCHK lin uruguayan_N = mkWN (compoundN "uruguay" (k38 "lainen")) ; --UNCHK +lin us_PN = mkPN "USA" ; +lin usa_PN = mkPN "USA" ; lin usable_A = mkWA (k17 "vapaa") ; --UNCHK lin usage_N = mkN "käyttö" ; --mkWN (k1A "käytäntö") ; lin usance_N = mkWN (k1A "käytäntö") ; --UNCHK @@ -57642,8 +57711,8 @@ lin wait_up_V = advV OP_wait_V OP_up_Adv ; -- guess-p-verb lin wait_up_for_V2 = prepV2 (advV OP_wait_V OP_up_Adv ) OP_for_Prep ; -- guess-p-verb lin wait_upon_V2 = prepV2 OP_wait_V OP_upon_Prep ; -- guess-p-verb lin waiter_N = mkWN (k12 "tarjoilija") ; --UNCHK -lin waiting_A = variants {} ; -- -lin waiting_N = variants {} ; -- +lin waiting_A = mkA "odottava" ; +lin waiting_N = mkN "odotus" ; lin waiting_list_N = mkWN (compoundN "jonotus" (k9 "lista")) ; --UNCHK lin waiting_room_N = mkWN (k9 "aula") ; --UNCHK lin waitress_N = mkWN (k12 "tarjoilija") ; --UNCHK @@ -57683,7 +57752,7 @@ lin walk_up_V = advV OP_walk_V OP_up_Adv ; -- guess-p-verb lin walkabout_N = mkWN (k39 "vaellus") ; --UNCHK lin walkaway_N = mkWN (k1A "voitto") "helppo" ; --UNCHK lin walker_N = mkWN (compoundN "kävely" (k1 "kärry")) ; --UNCHK -lin walking_A = variants {} ; -- +lin walking_A = mkA "kävelevä" ; lin walking_N = mkWN (k2 "kävely") ; --UNCHK lin walkout_N = mkWN (compoundN "ulos" (k5 "marssi")) ; lin walkover_N = mkWN (compoundN "silta" (k1A "kaato")) ; --UNCHK @@ -58077,12 +58146,15 @@ lin weave_V2 = mkWV2 (k52A "kutoa") "yhteen" ; --UNCHK lin weaver_N = mkWN (k10 "kutoja") ; --UNCHK lin weaverbird_N = mkWN (k10 "kutoja") ; --UNCHK lin weaving_N = mkWN (k9A "kudonta") ; --UNCHK +lin web_1_N = mkN "verkko" ; lin web_N = mkWN (k1A "verkko") ; --UNCHK lin webbed_A = mkWA "räpylä-" ; --UNCHK lin webbing_N = mkWN (compoundN "nauha" (k39 "kudos")) ; --UNCHK lin webcam_N = mkWN (compoundN "verkko" (k12 "kamera")) ; --UNCHK lin webfoot_N = mkWN (compoundN "räpylä" (k9A "jalka")) ; --UNCHK lin webmaster_N = mkWN (compoundN "yllä" (k10 "pitäjä")) "sivuston" ; --UNCHK +lin webpage_N = mkN "verkkosivu" ; +lin website_N = mkN "verkkosivu" ; lin webworm_N = mkWN (compoundN "perhosen" (k10A "toukka")) ; --UNCHK lin wed_A = mkWA "naitu" ; --UNCHK lin wed_V2 = mkV2 (mkV "avioitua") (mkPrep "kanssa") ; @@ -58633,7 +58705,7 @@ lin winkle_out_V2 = mkWV2 (k53A "nyhtää") "irti" ; --UNCHK lin winless_A = mkWA "voitoton" ; --UNCHK lin winner_N = mkN "voittaja" ; ---ARB mkWN "menestyjä" ; lin winnie_PN = foreignPN "Winnie" ; -lin winning_A = variants {} ; -- +lin winning_A = mkA "voittava" ; lin winning_N = mkWN (compoundN "voi" (k38 "ttaminen")) ; --UNCHK lin winning_post_N = mkWN (k9A "paikka") "voittajan" ; --UNCHK lin winnings_N = mkWN (k1A "voitto") ; --UNCHK @@ -58879,7 +58951,7 @@ lin workbook_N = mkWN (compoundN "työ" (k9 "kirja")) ; --UNCHK lin workbox_N = mkWN (compoundN "työkalu" (k1A "laukku")) ; --UNCHK lin workday_N = mkWN (compoundN "työ" (k10 "päivä")) ; --UNCHK lin worker_N = mkN "työläinen" ; -lin workforce_N = variants {} ; -- +lin workforce_N = mkN "työvoima" ; lin workhorse_N = mkWN (compoundN "työ" (k38 "hevonen")) ; --UNCHK lin workhouse_N = mkWN (compoundN "pakkotyö" (k39 "laitos")) ; --UNCHK lin working_A = mkA "toimiva" | mkA "työtätekevä" ; ---- split @@ -58909,7 +58981,7 @@ lin worldliness_N = mkWN "ulkopuolisuus" ; --UNCHK lin worldling_N = mkWN (k41A "asukas") "maan" ; --UNCHK lin worldly_A = mkWA (k38 "mainen") ; --UNCHK lin worldwide_A = mkWA (k5 "universaali") ; --UNCHK -lin worldwide_Adv = variants {} ; -- +lin worldwide_Adv = mkAdv "koko maailmassa" ; lin worm_N = L.worm_N ; lin worm_V2 = mkWV2 (k61A "vääntelehtiä") ; --UNCHK lin worm_gear_N = mkWN (compoundN "kierukka" (k2 "pyörästö")) ; --UNCHK @@ -59707,4 +59779,4 @@ oper OP_take_V2 : V2 = mkV2 "ottaa" ; oper OP_urge_V2 : V2 = mkWV2 (k53 "ahdistaa") ; --f88 -} +} \ No newline at end of file diff --git a/lib/src/translator/ExtensionsFin.gf b/lib/src/translator/ExtensionsFin.gf index 65e5efe07..6aff0ee85 100644 --- a/lib/src/translator/ExtensionsFin.gf +++ b/lib/src/translator/ExtensionsFin.gf @@ -56,7 +56,11 @@ lin s = \\_ => (snoun2nounSep {s = \\f => noun.s ! 10 ++ BIND ++ adj.s ! Posit ! sAN f ; h = adj.h}).s } ; ----- PastPartAP vp = {s = \\_,nf => (sverb2verbSep v).s ! PastPartPass (AN nf)} ; + PresPartAP vp = { ---- many things can go wrong here... + s = \\bool,nform => + vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext ++ + (sverb2verbSep vp.s).s ! PresPartAct (AN nform) + } ; PredVPosv np vp = mkCl np vp ; ----