DictionaryFin: added 58 missing Prep and other structural words

lib/src/translator/DictionaryFin.gf

@@ -792,7 +792,7 @@ lin adiposity_N = mkWN (k40 "rasvaisuus") ; --UNCHK
 lin adit_N = mkWN (k6 "tunneli") ; --UNCHK
 lin adjacency_N = mkWN (k40 "vierekkäisyys") ; --UNCHK
 lin adjacent_A = mkWA (k38 "viereinen") ;
-lin adjective_N = mkWN (k5 "adjektiivi") ; 
+lin adjective_N = mkWN (k5 "adjektiivi") ;
 lin adjoin_V = mkWV (k73 "lisätä") ; --UNCHK
 lin adjoin_V2 = mkWV2 (k73 "lisätä") ; --UNCHK
 lin adjourn_V = mkWV (k53A "päättää") ; --UNCHK
@@ -1409,7 +1409,7 @@ lin albanian_A = mkWA (k38 "albanialainen") ; --UNCHK
 lin albanian_N = mkWN (k38 "albanialainen") ; --UNCHK
 lin albatross_N = mkWN (k5 "albatrossi") ; --UNCHK
 lin albedo_N = mkWN (compoundN "heijastus" (k1 "teho")) ; --UNCHK
-lin albeit_Subj = variants {} ; --
+lin albeit_Subj = mkSubj "vaikkakin" ; --
 lin albert_PN = foreignPN "Albert" ;
 lin albescent_A = mkWA (compoundA "valke" (k9 "neva")) ; --UNCHK
 lin albinal_A = mkWA (compoundA "albina" (k38 "alinen")) ; --UNCHK
@@ -1904,6 +1904,7 @@ lin amide_N = mkWN "amidi" ; --UNCHK
 lin amidship_A = mkWA (k99 "keskivaiheilla") ; --UNCHK
 lin amidship_Adv = mkWAdv (compoundAdv "keskilai" (k99 "vaan")) ; --UNCHK
 lin amidships_Adv = mkWAdv (k99 "keskivaiheille") ; --UNCHK
+lin amidst_Prep = mkPrep "keskellä" ;
 lin amiens_PN = foreignPN "Amiens" ;
 lin amigo_N = mkWN (k6 "kaveri") ; --UNCHK
 lin amino_A = mkWA "amiini-" ; --UNCHK
@@ -2511,6 +2512,7 @@ lin anthroposophy_N = mkWN (k12 "antroposofia") ; --UNCHK
 lin anthurium_N = mkWN (compoundN "flamingo" (k10A "kukka")) ; --UNCHK
 lin anti_A = mkWA (k10 "oleva") "vastaan" ; --UNCHK
 lin anti_N = mkWN (k10 "vastustaja") ; --UNCHK
+lin anti_Prep = mkPrep "anti" nominative ;
 lin anti_semitic_A = mkA (mkN "anti" (mkN "semitistinen")) ;
 lin antiadrenergic_A = mkWA (compoundA "antiadr" (k38 "energinen")) ; --UNCHK
 lin antiaircraft_A = mkWA "ilmatorjunta-" ; --UNCHK
@@ -2971,6 +2973,7 @@ lin apricot_N = mkWN (k5 "aprikoosi") ; --UNCHK
 lin apron_N = mkWN (k1 "essu") ; --UNCHK
 lin apropos_A = mkWA (k99 "sopivasti") ; --UNCHK
 lin apropos_Adv = mkWAdv (k99 "muuten") ; --UNCHK
+lin apropos_Prep = mkPrep elative "puheenollen" ;
 lin apse_N = mkWN (compoundN "alttari" (k2 "komero")) ; --UNCHK
 lin apsidal_A = mkWA "apsis-" ; --UNCHK
 lin apt_A = mkA "osuva" ; --mkWA (k38 "olennainen") ;
@@ -2979,6 +2982,7 @@ lin apterous_A = mkWA (k34A "siivetön") ; --UNCHK
 lin aptitude_N = mkWN (k1A "taito") ; --UNCHK
 lin aptitudinal_A = mkWA "taito-" ; --UNCHK
 lin aptness_N = mkWN (k40 "sattuvuus") ; --UNCHK
+lin apud_Prep = mkPrep "luona" ;
 lin aquamarine_N = mkWN (k6 "turkoosi") ; --UNCHK
 lin aquanaut_N = mkWN (k10 "sukeltaja") ; --UNCHK
 lin aquaphobia_N = mkWN (compoundN "vesi" (k12 "fobia")) ; --UNCHK
@@ -3375,6 +3379,7 @@ lin as_for_Prep = mkPrep "mitä tulee" elative ;
 lin as_long_as_Subj = mkSubj "niin kauan kun" ;
 lin as_of_Prep = mkPrep "koskien" partitive ;
 lin as_opposed_to_Prep = mkPrep "toisin kuin" nominative ;
+lin as_regards_Prep = mkPrep "mitä tulee" illative ;
 lin as_well_Adv = mkWAdv (k99 "kanssa") ; --UNCHK
 lin as_well_as_Conj = mkConj "yhtä hyvin kuin" ;
 lin asafetida_N = mkWN (compoundN "haju" (k9 "pihka")) ; --UNCHK
@@ -7663,6 +7668,7 @@ lin by8agent_Prep = S.by8agent_Prep ;
 lin by8means_Prep = S.by8means_Prep ;
 lin by_Adv = mkWAdv (k99 "talteen") ; --UNCHK
 lin by_Prep = postPrep genitive "kautta" ;
+lin by_means_of_Prep = mkPrep "avulla" ;
 lin by_virtue_of_Prep = mkPrep "takia" ;
 lin bye_Interj = mkInterj "hei sitten" ;
 lin bye_bye_Interj = mkInterj "heippa" ;
@@ -9407,6 +9413,7 @@ lin chewer_N = mkWN "jauhaja" ; --UNCHK
 lin chewing_gum_N = mkWN (k10A "purkka") ; --UNCHK
 lin chewink_N = mkWN (compoundN "loistopip" (k1 "ilo")) ; --UNCHK
 lin chewy_A = mkWA (k15 "sitkeä") ; --UNCHK
+lin chez_Prep = mkPrep "luona" ;
 lin chi_N = mkWN (k18 "khii") ; --UNCHK
 lin chianti_N = mkWN (compoundN "Chi" (k5A "anti")) ; --UNCHK
 lin chiaroscuro_N = mkWN "chiaroscuro" ; --UNCHK
@@ -9840,6 +9847,7 @@ lin cipher_N = mkWN (compoundN "salakirjoitus" (k5 "viesti")) ; --UNCHK
 lin cipher_V = mkWV (k58 "laskea") ; --UNCHK
 lin cipher_V2 = mkWV2 (k58 "laskea") ; --UNCHK
 lin ciprofloxacin_N = mkWN "Cipro" ; --UNCHK
+lin circa_Prep = mkPrep "noin" nominative ;
 lin circadian_A = mkWA "vuorokausi-" ; --UNCHK
 lin circle_N = mkWN (k39 "kierros") ; --UNCHK
 lin circle_V = mkWV (k62 "ympyröidä") ; --UNCHK
@@ -10224,6 +10232,7 @@ lin close_in_V = mkWV (k58A "sulkea") "sisään" ; --UNCHK
 lin close_off_V2 = mkWV2 (k58A "sulkea") ; --UNCHK
 lin close_out_V2 = mkWV2 (k53A "lopettaa") ; --UNCHK
 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 {} ; --
@@ -11137,7 +11146,7 @@ lin concern_N = mkN "konserni" ;
 lin concern_V2 = mkV2 (mkV vOlla "tekemistä") (mkPrep "kanssa") ; --f65
 lin concerned_A = mkA "tarkoitettu" ;
 lin concernedly_Adv = mkWAdv (k99 "huolehtivaisesti") | adjAdv concerned_A ; --UNCHK -- derived
-lin concerning_Prep = variants {} ; --
+lin concerning_Prep = mkPrep "mitä tulee" illative ; --
 lin concert_N = mkWN (k5A "konsertti") ;
 lin concert_V2 = mkWV2 (k61A "sopia") ; --UNCHK
 lin concert_hall_N = mkWN (compoundN "konsertti" (k5 "sali")) ; --UNCHK
@@ -11447,9 +11456,9 @@ lin consequently_Adv = mkAdv "sen seurauksena" ;
 lin conservancy_N = mkWN (compoundN "luonnon" (k2 "suojelu")) ; --UNCHK
 lin conservation_N = mkWN (compoundN "ympäristön" (k2 "suojelu")) ; --UNCHK
 lin conservatism_N = mkWN (k40 "vanhoillisuus") ; --UNCHK
-lin conservative_A = mkWA (k38 "konservatiivinen") ; --f85
 lin conservative_1_N = mkN "konservatiivi" ;
 lin conservative_2_N = mkN "säilöntäaine" ;
+lin conservative_A = mkWA (k38 "konservatiivinen") ; --f85
 lin conservatoire_N = mkWN (k3 "konservatorio") ; --UNCHK
 lin conservator_N = mkWN (compoundN "edun" (k10 "valvoja")) ; --UNCHK
 lin conservatory_N = mkWN "talvipuutarha" ; --UNCHK
@@ -11512,7 +11521,7 @@ lin constable_N = mkWN (k6 "konstaapeli") ; --UNCHK
 lin constabulary_N = mkWN (k6 "poliisi") ; --UNCHK
 lin constancy_N = mkWN (k40 "muuttumattomuus") ; --UNCHK
 lin constant_A = mkA "jatkuva" ;
-lin constant_N = mkN "vakio" "vakioita" ; 
+lin constant_N = mkN "vakio" "vakioita" ;
 lin constantly_Adv = adjAdv constant_A ; -- -- derived
 lin constellation_N = mkWN (k10 "asetelma") ; --UNCHK
 lin consternation_N = mkWN (k39 "tyrmistys") ; --UNCHK
@@ -11553,16 +11562,16 @@ lin consul_N = mkWN (k6 "konsuli") ; --UNCHK
 lin consular_A = mkWA "konsuli-" ; --UNCHK
 lin consulate_N = mkWN (k5A "konsulaatti") ; --UNCHK
 lin consulship_N = mkWN (k10 "asema") "konsulin" ; --UNCHK
-lin consult_V = mkV (mkV "pyytää") "neuvoa" ; 
+lin consult_V = mkV (mkV "pyytää") "neuvoa" ;
 lin consult_V2 = mkV2 "konsultoida" partitive ; --WV2 (k61 "toimia") "neuvonantajana" ;
 lin consultancy_N = mkWN (k5A "konsultointi") ; --UNCHK
-lin consultant_N = mkWN (k5A "konsultti") ; 
+lin consultant_N = mkWN (k5A "konsultti") ;
 lin consultation_N = mkWN (k5A "konsultointi") ; --UNCHK
 lin consultative_A = mkWA (k10 "neuvoa-antava") ; --UNCHK
 lin consumable_A = mkWA "kuluva" ; --UNCHK
 lin consume_V = mkWV (k53A "kuluttaa") ; --UNCHK
 lin consume_V2 = mkWV2 (k53A "kuluttaa") ; --UNCHK
-lin consumer_N = mkWN (k10 "kuluttaja") ; 
+lin consumer_N = mkWN (k10 "kuluttaja") ;
 lin consumerism_N = mkWN (k10 "kuluttajansuoja") ; --UNCHK
 lin consummate_A = mkWA (k10 "syvä") ; --UNCHK
 lin consummate_V2 = mkWV2 (k56A "saattaa") "täydelliseksi" ; --UNCHK
@@ -11577,7 +11586,7 @@ lin contagion_N = mkWN (k9A "tartunta") ; --UNCHK
 lin contagious_A = mkA "tarttuva" ; --WA (compoundA "tartunta" (k38 "vaarallinen")) ;
 lin contain_V2 = mkV2 "sisältää" | mkV2 "pidätellä" ; ---- split
 lin container_N = mkWN (k3 "säiliö") ; --UNCHK
-lin containerful_N = mkN "säiliöllinen" | mkWN "kontillinen" ; 
+lin containerful_N = mkN "säiliöllinen" | mkWN "kontillinen" ;
 lin containment_N = mkWN "tukahduttaminen" ; --UNCHK
 lin contaminant_N = mkWN (k48 "saaste") ; --UNCHK
 lin contaminate_V2 = mkWV2 (k53A "saastuttaa") ; --UNCHK
@@ -11648,6 +11657,7 @@ lin contortion_N = mkWN (k2 "vääristely") ; --UNCHK
 lin contortionist_N = mkWN (compoundN "käärme" (k38 "ihminen")) ; --UNCHK
 lin contour_N = mkWN (k10 "asetelma") ; --UNCHK
 lin contour_V2 = mkWV2 (k53 "muodostaa") "ääriviivat" ; --UNCHK
+lin contra_Prep = mkPrep partitive "vastaan" ;
 lin contraband_N = mkWN (compoundN "salakuljetus" (k12 "tavara")) ; --UNCHK
 lin contrabass_A = mkWA "basso-" ; --UNCHK
 lin contrabass_N = mkWN (compoundN "basso" (k1 "viulu")) ; --UNCHK
@@ -13008,6 +13018,7 @@ lin culture_N = mkN "kulttuuri" ; ---- WN (k2 "viljely") ;
 lin cultured_A = mkWA (k1 "hieno") ; --UNCHK
 lin culverin_N = mkWN "kulevriini" ; --UNCHK
 lin culvert_N = mkWN (compoundN "silta" (k1A "rumpu")) ; --UNCHK
+lin cum_Prep = mkPrep "kanssa" ;
 lin cumber_V2 = mkWV2 (k73A "haitata") ; --UNCHK
 lin cumberland_PN = foreignPN "Cumberland" ;
 lin cumbernauld_PN = foreignPN "Cumbernauld" ;
@@ -16366,6 +16377,7 @@ lin dudley_PN = foreignPN "Dudley" ;
 lin due_A = mkA "asianmukainen" ;
 lin due_Adv = mkWAdv (k99 "suoraan") ; --UNCHK
 lin due_N = mkN "oikeus" ; ---ARB --mkN "maksu" ; --mkWN (k10 "osa") ;
+lin due_to_Prep = mkPrep "ansionsta" ;
 lin duel_N = mkWN (compoundN "kaksin" (k2 "kamppailu")) ; --UNCHK
 lin duel_V = mkWV (k67 "olla") "kaksintaistelussa" ; --UNCHK
 lin dueler_N = mkWN (compoundN "kaksin" (k12 "taistelija")) ; --UNCHK
@@ -18325,6 +18337,7 @@ lin excelsior_N = mkWN (k9 "lastuvilla") ; --UNCHK
 lin except_Conj = mkConj "paitsi" ;
 lin except_Prep = S.except_Prep ;
 lin except_V2 = mkWV2 (k53A "jättää") "pois" ; --UNCHK
+lin except_for_Prep = mkPrep "lukuunottamatta" partitive ;
 lin exception_N = mkN "poikkeus" ;
 lin exceptionable_A = mkWA (compoundA "kiistan" (k38 "alainen")) ; --UNCHK
 lin exceptional_A = mkWA (k38 "erikoinen") ; --UNCHK
@@ -19014,8 +19027,10 @@ lin fantastically_Adv = mkWAdv (k99 "loistavasti") ; --UNCHK
 lin fantasy_N = mkWN (k12 "fantasia") ; --UNCHK
 lin fantods_N = mkWN (k40 "ärtyisyys") ; --UNCHK
 lin far_A = mkA "etäinen" | mkA "kaukainen" ;
+lin far_AdA = mkAdA "paljon" ;
 lin far_Adv = L.far_Adv ;
 lin far_flung_A = mkA "kaukainen" ;
+lin far_from_Prep = mkPrep "kaukana" elative ;
 lin far_reaching_A = mkA "kauaskantoinen" ;
 lin farad_N = mkWN (k5 "faradi") ; --UNCHK
 lin farandole_N = mkWN "farandole" ; --UNCHK
@@ -19159,9 +19174,9 @@ lin faux_pas_N = mkWN (k40 "karkeus") ; --UNCHK
 lin faversham_PN = foreignPN "Faversham" ;
 lin favism_N = mkWN (compoundN "fav" (k5 "ismi")) ; --UNCHK
 lin favour_N = mkN "palvelus" ;
-lin favour_V = mkWV (k61 "suosia"); --UNCHK
-lin favour_V2 = mkWV2 (k61 "suosia") | mkWV2 (k61 "suosia") partitive; --UNCHK
-lin favour_VS = mkWVS (k61 "suosia"); --UNCHK
+lin favour_V = mkWV (k61 "suosia") ; --UNCHK
+lin favour_V2 = mkWV2 (k61 "suosia") ;
+lin favour_VS = mkWVS (k61 "suosia") ; --UNCHK
 lin favourable_A = mkWA (k10 "suotuisa") ; --UNCHK
 lin favourableness_N = mkWN (k40 "kannattavuus") ; --UNCHK
 lin favouriteFem_N = mkWN (k5A "suosikki") ; --UNCHK
@@ -20288,7 +20303,7 @@ lin follow_up_V2 = mkWV2 (k54A "täydentää") ; --UNCHK
 lin follower_N = mkWN (k10 "seuraaja") ; --UNCHK
 lin following_A = mkWA (k10 "seuraava") ;
 lin following_N = mkWN (kH1 "jahti") ; --UNCHK
-lin following_Prep = variants {} ; --
+lin following_Prep = mkPrep partitive "seuraten" ; --
 lin folly_N = mkWN (k39 "hullutus") ; --UNCHK
 lin foment_V2 = mkWV2 (k52A "hautoa") ; --UNCHK
 lin fomentation_N = mkWN (k39 "yllytys") ; --UNCHK
@@ -25800,6 +25815,7 @@ lin in_case_of_Prep = mkPrep "sattuessa" ;
 lin in_front_of_Prep = mkPrep "edessä" ;
 lin in_lieu_of_Prep = mkPrep "sijasta" ;
 lin in_loco_parentis_Adv = mkWAdv "vanhempien" "sijasta" ; --UNCHK
+lin in_order_to_Prep = mkPrep "tarkoituksena" nominative ; ---- cat ??
 lin in_place_of_Prep = mkPrep "sijasta" ;
 lin in_point_of_Prep = mkPrep "viitaten" illative ;
 lin in_situ_Adv = mkWAdv (k99 "paikallaan") ; --UNCHK
@@ -26007,6 +26023,8 @@ lin increase_V = mkV "kasvaa" ;
 lin increase_V2 = mkV2 "lisätä" partitive ;
 lin increased_A = variants {} ; --
 lin increasing_A = variants {} ; --
+lin increasingly_AdA = mkAdA "enenevästi" ;
+lin increasingly_AdV = mkAdV "enenevästi" ;
 lin increasingly_Adv = mkWAdv (k99 "enemmän") "yhä" ; --f80
 lin incredibility_N = mkWN (k40 "uskomattomuus") ; --UNCHK
 lin incredible_A = mkWA (k34A "uskomaton") ;
@@ -26100,10 +26118,10 @@ lin india_PN = foreignPN "Intia" ;
 lin india_rubber_N = mkWN (k1 "kautsu") ; --UNCHK
 lin indiaman_N = mkWN "Indiaman" ; --UNCHK
 lin indianFem_1_N = mkN "intialainen" ;
-lin indianMasc_1_N = mkN "intialainen" ;
-lin indian_A = mkA "intialainen" ;
 lin indianFem_2_N = mkN "intiaani" ;
+lin indianMasc_1_N = mkN "intialainen" ;
 lin indianMasc_2_N = mkN "intiaani" ;
+lin indian_A = mkA "intialainen" ;
 lin indiana_PN = foreignPN "Indiana" ;
 lin indianapolis_PN = foreignPN "Indianapolis" ;
 lin indicate_V2 = mkWV2 (k53A "osoittaa") ;
@@ -26590,6 +26608,7 @@ lin inside_A = mkWA "sisä-" ; --UNCHK
 lin inside_Adv = mkWAdv (k99 "sisimmältään") ;
 lin inside_N = mkWN (k13 "sisusta") ; --UNCHK
 lin inside_Prep = mkPrep "sisällä" | mkPrep "sisälle" ; ---- split
+lin inside_of_Prep = mkPrep "sisäpuolella" ;
 lin insider_N = mkWN (k32 "jäsen") "sisäpiirin" ;
 lin insidious_A = mkWA (k38 "haitallinen") ; --UNCHK
 lin insidiousness_N = mkWN (compoundN "sala" (k40 "kavaluus")) ; --UNCHK
@@ -29047,6 +29066,7 @@ lin left_N = mkWN (k37 "vasen") ; --UNCHK
 lin left_Ord = L.left_Ord ;
 lin left_hand_A = mkA (mkN "vasemman" (mkN "puoleinen")) ;
 lin left_handed_A = mkA (mkN "vasen" (mkN "kätinen")) ;
+lin left_of_Prep = mkPrep elative "vasemmalla" ;
 lin left_wing_N = mkWN (k1 "vasemmisto") ; --UNCHK
 lin leftish_A = mkWA (k99 "päin") "vasemmistoon" ; --UNCHK
 lin leftism_N = mkWN (k40 "vasemmistolaisuus") ; --UNCHK
@@ -29462,7 +29482,7 @@ lin like_A = mkWA (k38 "samanlainen") ;
 lin like_Adv = variants {} ; -- postPrep genitive "tavalla" ; ---
 lin like_N = mkWN (k38 "lainen") ; --UNCHK
 lin like_Prep = postPrep genitive "tavalla" | mkPrep nominative "kuin" ;
-lin like_Subj = variants {} ; --
+lin like_Subj = mkSubj "kuten" ; --
 lin like_V2 = L.like_V2 ;
 lin like_VS = mkVS (mkV (mkV "pitää") "siitä") ; -- pidän siitä, että XYZ
 lin like_VV = mkVV "tykätä" ; ---- need more inf forms ; "pidän kutomisesta" rather than "tykkään kutoa"
@@ -32032,6 +32052,7 @@ lin microtubule_N = mkWN (compoundN "mikro" (k7 "putki")) ; --UNCHK
 lin microvolt_N = mkWN (k5A "mikrovoltti") ; --UNCHK
 lin microwave_N = mkWN (k1 "mikro") ; --UNCHK
 lin mid_A = mkWA "keski-" ; --UNCHK
+lin mid_Prep = mkPrep "keskellä" ;
 lin midafternoon_N = mkWN (compoundN "keski" (k10 "päivä")) ; --UNCHK
 lin midair_N = mkWN (k9 "ilma") ; --UNCHK
 lin midazolam_N = mkWN "Versed" ; --UNCHK
@@ -32072,6 +32093,7 @@ lin midriff_N = mkWN (k12 "pallea") ; --UNCHK
 lin midshipman_N = mkWN (compoundN "meri" (k5A "kadetti")) ; --UNCHK
 lin midships_Adv = mkWAdv (k99 "keskivaiheille") ; --UNCHK
 lin midst_N = mkWN (k99 "keskellä") ; --UNCHK
+lin midst_Prep = mkPrep "joukossa" ;
 lin midstream_N = mkWN (k10A "keskikohta") "virran" ; --UNCHK
 lin midsummer_N = mkWN (k39 "juhannus") ; --UNCHK
 lin midterm_N = mkWN (k48A "koe") "puolivälin" ; --UNCHK
@@ -32642,6 +32664,7 @@ lin modulate_V = mkWV (k67A "muunnella") ; --UNCHK
 lin modulate_V2 = mkWV2 (k67A "muunnella") ; --UNCHK
 lin modulation_N = mkWN "sovittaminen" ; --UNCHK
 lin module_N = mkWN (k6 "moduuli") ; --UNCHK
+lin modulo_Prep = mkPrep "modulo" nominative ;
 lin modulus_N = mkWN (kH1 "kerroin") ; --UNCHK
 lin modus_operandi_N = mkWN (k5 "rutiini") ; --UNCHK
 lin modus_vivendi_N = mkWN (compoundN "elämän" (k9A "tapa")) ; --UNCHK
@@ -32963,12 +32986,10 @@ lin mordacious_A = mkWA (k10 "pureva") ; --UNCHK
 lin mordacity_N = mkWN (k40 "purevuus") ; --UNCHK
 lin mordant_A = mkWA "erittäin" "syövyttävä" ; --UNCHK
 lin mordant_N = mkWN (compoundN "peittaus" (k48 "aine")) ; --UNCHK
-lin more_Quant = mkQuant (mkN "useampi" "useamman" "useampia") (exceptNomN (mkN "enempä") "enemmän") ;
----lin morePl_Det = mkDet Pl (mkN "useampi" "useamman" "useampia") ;
----lin moreSg_Det = mkDet Sg (exceptNomN (mkN "enempä") "enemmän") ;
 lin more_Adv = mkWAdv (k99 "enemmän") ;
 lin more_CAdv = S.more_CAdv ;
 lin more_N = mkN "lisä" ; ---- ?
+lin more_Quant = mkQuant (mkN "useampi" "useamman" "useampia") (exceptNomN (mkN "enempä") "enemmän") ;
 lin more_than_AdN = mkAdN "yli" ;
 lin more_than_Predet = mkPredet "enemmän kuin" ;
 lin morecambe_PN = foreignPN "Morecambe" ;
@@ -33863,6 +33884,7 @@ lin near_Adv = mkWAdv (k99 "liki") ; --UNCHK
 lin near_Prep = postPrep genitive "lähellä" ;
 lin near_V = mkV "lähestyä" ; --mkWV (k67 "tulla") "lähelle" ;
 lin near_V2 = mkWV2 (k67 "tulla") "lähelle" ; --UNCHK
+lin near_to_Prep = mkPrep "lähellä" ;
 lin nearby_A = mkA "läheinen" ;
 lin nearby_Adv = mkWAdv (k99 "lähellä") ; --UNCHK
 lin nearer_Adv = mkWAdv (k99 "lähempänä") ; --UNCHK
@@ -33988,6 +34010,7 @@ lin neither7nor_DConj = mkConj "ei" "eikä" ;
 lin neither_A = mkWA (k16 "kumpikaan") "ei" ; --UNCHK
 lin neither_Adv = variants {} ; --
 lin neither_Det = MorphoFin.mkDetPol True Sg {s = table NForm {nf => (snoun2nounBind (nforms2snoun (dSuurempi "kumpi"))).s ! nf + "kaan"} ; h = Back} ;
+lin neither_Prep = mkPrep "eikä" nominative ; ---- cat ??
 lin nekton_N = mkWN "nektoni" ; --UNCHK
 lin nelfinavir_N = mkWN (compoundN "nelfina" (k5 "viiri")) ; --UNCHK
 lin nelson_N = mkWN "nelsoni" ; --UNCHK
@@ -34241,6 +34264,7 @@ lin newtown_PN = foreignPN "Newtown" ;
 lin next_A = mkA "seuraava" | invarA "ensi" ;
 lin next_Adv = mkAdv "seuraavaksi" ;
 lin next_Prep = mkPrep elative "seuraava" ;
+lin next_to_Prep = mkPrep "vieressä" ;
 lin nexus_N = mkWN (k10 "ryhmä") ; --UNCHK
 lin ngultrum_N = mkWN "ngultrum" ; --UNCHK
 lin ngwee_N = mkWN "ngwee" ; --UNCHK
@@ -34351,7 +34375,7 @@ lin nip_V2 = mkWV2 (k66 "näykkäistä") ; --UNCHK
 lin nip_off_V = mkWV (k61 "saksia") ; --UNCHK
 lin nipa_N = mkWN "nipa" ; --UNCHK
 lin nipper_N = mkWN "saksi" ; --UNCHK
-lin nipple_N = mkWN (k5 "nänni") ; 
+lin nipple_N = mkWN (k5 "nänni") ;
 lin nipponese_A = mkWA (k38 "japanilainen") ; --UNCHK
 lin nippy_A = mkWA (k41A "raitis") ; --UNCHK
 lin niqaabi_N = mkWN (k10 "käyttäjä") "niqabin" ; --UNCHK
@@ -34392,6 +34416,8 @@ lin no_ball_N = mkWN (k34A "laiton") ; --UNCHK
 lin no_fewer_than_AdN = mkAdN "peräti" ;
 lin no_longer_AdV = mkAdV "enää" ;
 lin no_man's_land_N = mkWN (k18 "maa") "ei" "kenenkään" ; --UNCHK
+lin no_more_than_AdN = mkAdN "korkeintaan" | mkAdN "enintään" ;
+lin no_one_NP = S.nobody_NP ** {s = \\c => "ei" ++ S.nobody_NP.s ! c} | S.nobody_NP ** {s = \\c => S.nobody_NP.s ! c} ;
 lin nob_N = mkWN (k1 "kiho") "iso" ; --UNCHK
 lin nobble_V2 = mkWV2 (k73 "huumata") ; --UNCHK
 lin nobelium_N = mkWN "atomiluku" "102" ; --UNCHK
@@ -35965,6 +35991,7 @@ lin out_Adv = mkWAdv (k99 "ulkona") ;
 lin out_N = mkWN (k1 "palo") ; --UNCHK
 lin out_Prep = mkPrep "ulos" elative ;
 lin out_V2 = mkWV2 (k67 "tulla") "ilmi" ; --UNCHK
+lin out_from_Prep = mkPrep "ulos" elative ;
 lin out_of_Prep = mkPrep "ulkopuolella" ;
 lin out_of_doors_Adv = mkWAdv (k99 "ulkosalla") ; --UNCHK
 lin out_of_the_way_Adv = mkWAdv "pois" "tieltä" ; --UNCHK
@@ -36366,6 +36393,7 @@ lin ovule_N = mkWN (k10 "muna") "pieni" ; --UNCHK
 lin ovum_N = mkWN (k10 "muna") ; --UNCHK
 lin owe_V = mkWV (k67 "olla") "auki" ; --UNCHK
 lin owe_V2 = mkV2 (mkV olla_V "velkaa") allative ;
+lin owing_to_Prep = mkPrep "ansiosta" ;
 lin owl_N = mkWN (k1 "pöllö") "Minervan" ; --UNCHK
 lin owlet_N = mkWN (k1 "pöllö") "nuori" ; --UNCHK
 lin owlish_A = mkWA (compoundA "pöllö" (k38 "mäinen")) ; --UNCHK
@@ -36432,6 +36460,7 @@ lin pa_N = mkWN (compoundN "kuulutus" (k1 "laitteisto")) ; --UNCHK
 lin pabulum_N = mkWN (k1A "ravinto") ; --UNCHK
 lin paca_N = mkWN "Cuniculus" "paca" ; --UNCHK
 lin pace_N = mkN "tahti" ; --f62
+lin pace_Prep = mkPrep elative "huolimatta" ;
 lin pace_V = mkWV (k65 "käydä") "tasakäyntiä" ; --UNCHK
 lin pace_V2 = mkWV2 (k65 "käydä") "tasakäyntiä" ; --UNCHK
 lin pacemaker_N = mkWN (k10 "vetäjä") ; --UNCHK
@@ -38942,7 +38971,7 @@ lin plenteous_A = mkWA (k99 "paljon") ; --UNCHK
 lin plentiful_A = mkWA (k99 "paljon") ; --UNCHK
 lin plenty_Adv = mkWAdv (k99 "kyllin") ;
 lin plenty_N = mkWN (k40 "runsaus") ;
-lin plenty_NP = variants {} ; --
+lin plenty_NP = Syntax.mkNP (exceptNomN (mkN "paljo") "paljon") ; --
 lin plenum_N = mkWN (k9 "tila") "täysi" ; --UNCHK
 lin pleochroic_A = mkWA "pleokroinen" ; --UNCHK
 lin pleochroism_N = mkWN (compoundN "pleokro" (k5 "ismi")) ; --UNCHK
@@ -40337,6 +40366,7 @@ lin prizefighter_N = mkWN (compoundN "ammattilais" (k12 "ottelija")) ; --UNCHK
 lin pro_A = mkWA (k99 "puolesta") ; --UNCHK
 lin pro_Adv = mkWAdv (k99 "puolesta") ; --UNCHK
 lin pro_N = mkWN (k26 "puoli") "hyvä" ; --UNCHK
+lin pro_Prep = mkPrep "puolesta" | mkPrep "pro" nominative ;
 lin pro_forma_A = mkWA (kH1 "vuoksi") "muodon" ;
 lin pro_rata_Adv = mkWAdv (k99 "suhteellisesti") ; --UNCHK
 lin pro_tem_Adv = mkWAdv (k99 "väliaikaisesti") ; --UNCHK
@@ -40849,7 +40879,7 @@ lin proverb_N = mkWN (k9A "sanonta") ; --UNCHK
 lin proverbial_A = mkWA (compoundA "sananlasku" (k38 "mainen")) ; --UNCHK
 lin provide_V = mkWV (k52A "varautua") ;
 lin provide_V2 = mkV2 "tarjota" partitive ;
-lin provided_Subj = variants {} ; --
+lin provided_Subj = mkSubj "mikäli" ; --
 lin providence_N = mkWN (k39 "sallimus") ; --UNCHK
 lin providence_PN = foreignPN "Providence" ;
 lin provident_A = mkWA (compoundA "kauko" (k38 "näköinen")) ; --UNCHK
@@ -41258,6 +41288,7 @@ lin purser_N = mkWN (k6 "purseri") ; --UNCHK
 lin purslane_N = mkWN (compoundN "portul" (k9A "akka")) ; --UNCHK
 lin pursuance_N = mkWN "tavoitteleminen" ; --UNCHK
 lin pursuant_A = mkWA (k99 "mukaan") ; --UNCHK
+lin pursuant_to_Prep = mkPrep illative "tähdäten" ;
 lin pursue_V = mkWV (k67A "tavoitella") ; --UNCHK
 lin pursue_V2 = mkV2 (mkV "tavoitella") partitive ;
 lin pursued_N = mkWN (compoundN "taka" (k1 "a-ajettu")) ; --UNCHK
@@ -41439,6 +41470,7 @@ lin qi_N = mkWN "ki" ; --UNCHK
 lin qibla_N = mkWN "Qibla" ; --UNCHK
 lin qindarka_N = mkWN (compoundN "qind" (k9A "arka")) ; --UNCHK
 lin qoph_N = mkWN "qof" ; --UNCHK
+lin qua_Prep = mkPrep elative | mkPrep "qua" nominative ;
 lin quack_Interj = mkInterj "kvaak" ;
 lin quack_N = mkWN (k39 "kaakatus") ; --UNCHK
 lin quack_V = mkWV (k62 "puoskaroida") ; --UNCHK
@@ -42079,6 +42111,8 @@ lin ratel_N = mkWN (compoundN "mesi" (k10 "mäyrä")) ; --UNCHK
 lin ratepayer_N = mkWN (compoundN "veron" (k10 "maksaja")) ; --UNCHK
 lin rates_N = mkWN (compoundN "kiinteistö" (k1 "vero")) "kunnallinen" ; --UNCHK
 lin rather_Adv = mkAdv "mieluummin" ;
+lin rather_than_Conj = mkConj "pikemmin kuin" ;
+lin rather_than_Prep = mkPrep "ennemmin kuin" nominative ;
 lin rathole_N = mkWN (compoundN "rotan" (k1 "kolo")) ; --UNCHK
 lin rathskeller_N = mkWN (compoundN "kellari" (k12 "ravintola")) ; --UNCHK
 lin ratification_N = mkWN (k39 "vahvistus") ; --UNCHK
@@ -42167,6 +42201,7 @@ lin razorbill_N = mkWN (k5A "ruokki") ; --UNCHK
 lin razorblade_N = mkWN (compoundN "parta" (k10 "terä")) ; --UNCHK
 lin razzle_N = mkWN "harhauttelu" ; --UNCHK
 lin re_N = mkWN "re" ; --UNCHK
+lin re_Prep = mkPrep "uudestaan" nominative ;
 lin re_create_V2 = mkV2 (mkV (mkV "luoda") "uudelleen") ;
 lin re_elect_V2 = mkV2 (mkV (mkV "valita") "uudelleen") ;
 lin re_emerge_V = mkV (mkV "ilmestyä") "uudelleen" ;
@@ -42740,9 +42775,10 @@ lin regard_V = mkWV (k62 "arvioida") ;
 lin regard_V2 = mkWV2 (k62 "arvioida") ;
 lin regard_VS = mkWVS (k62 "arvioida") ; --UNCHK
 lin regardful_A = mkWA (k38 "huomaavainen") ; --UNCHK
-lin regarding_Prep = variants {} ; --
+lin regarding_Prep = mkPrep partitive "ajatellen" ; --
 lin regardless_A = mkWA (k99 "riippumatta") ; --UNCHK
 lin regardless_Adv = mkWAdv (k99 "huolimatta") "siitä" ; --UNCHK
+lin regardless_of_Prep = mkPrep elative "huolimatta" ;
 lin regatta_N = mkWN (k9A "regatta") ; --UNCHK
 lin regency_N = mkWN (k10 "asema") "sijaishallitsijan" ; --UNCHK
 lin regenerate_A = mkWA (k47 "uudestisyntynyt") ; --UNCHK
@@ -43835,6 +43871,7 @@ lin right_Ord = L.right_Ord ;
 lin right_V2 = mkWV2 (k66 "oikaista") ; --UNCHK
 lin right_hand_A = mkA (mkN "oikean" (mkN "puoleinen")) ;
 lin right_hander_N = mkWN (compoundN "oikea" (k38 "kätinen")) ; --UNCHK
+lin right_of_Prep = mkPrep elative "oikealla" ;
 lin right_wing_N = mkWN (k1 "oikeisto") ; --UNCHK
 lin righteous_A = mkWA (k41 "vanhurskas") ; --UNCHK
 lin righteousness_N = mkWN (k40 "vanhurskaus") ; --UNCHK
@@ -44265,6 +44302,7 @@ lin roughen_V = mkWV (k54A "karhentaa") ; --UNCHK
 lin roughen_V2 = mkWV2 (k54A "karhentaa") ; --UNCHK
 lin roughhewn_A = mkWA (compoundA "haka" (k1 "ttu")) "karkeasti" ; --UNCHK
 lin roughish_A = mkWA (k15 "karkea") "hiukan" ; --UNCHK
+lin roughly_AdV = mkAdV "suunnilleen" ;
 lin roughly_Adv = variants {} ; --
 lin roughneck_N = mkWN (k10 "rettelöijä") ; --UNCHK
 lin roughness_N = mkWN (k40 "karkeus") ; --UNCHK
@@ -44944,6 +44982,7 @@ lin sanitize_V2 = mkWV2 (k61 "siistiä") ; --UNCHK
 lin sanity_N = mkWN (compoundN "mielen" (k40 "terveys")) ; --UNCHK
 lin sannup_N = mkWN "sannup" ; --UNCHK
 lin sannyasi_N = mkWN "sanyasi" ; --UNCHK
+lin sans_Prep = mkPrep "ilman" partitive ;
 lin sansevieria_N = mkWN (compoundN "anopin" (k26 "kieli")) ; --UNCHK
 lin sanskrit_N = mkWN (compoundN "Sanskrit-" (k26 "kieli")) ; --UNCHK
 lin santa_claus_N = mkWN (compoundN "joulu-" (k1A "ukko")) ; --UNCHK
@@ -49736,6 +49775,7 @@ lin stigmatize_V2 = mkWV2 (k69 "merkitä") ; --UNCHK
 lin stile_N = mkWN (k26 "pieli") ; --UNCHK
 lin stiletto_N = mkWN (k5A "stiletti") ; --UNCHK
 lin still_A = mkWA "asetelma-" ; --UNCHK
+lin still_AdA = mkAdA "yhä" ;
 lin still_AdV = lin AdV (ss "yhä") ;
 lin still_Adv = mkAdv "yhä" ;
 lin still_N = mkWN (k2 "tislaamo") ; --UNCHK
@@ -50357,6 +50397,7 @@ lin subject_A = mkWA (k41A "altis") ; --UNCHK
 lin subject_A2 = mkA2 (mkWA (k41A "altis")) (casePrep allative) ;
 lin subject_N = mkWN (k48 "aihe") ;
 lin subject_V2 = mkV2 "altistaa" ; ---ARB --mkWV2 (k56A "antaa") "arvioitavaksi" ;
+lin subject_to_Prep = mkPrep "alttiina" allative ; ---- sense
 lin subjection_N = mkWN (compoundN "ali" (k38 "staminen")) ; --UNCHK
 lin subjective_A = mkWA (k38 "subjektiivinen") ; --UNCHK
 lin subjectivism_N = mkWN (k40 "yksipuolisuus") ; --UNCHK
@@ -52380,7 +52421,7 @@ lin thanks_Interj = mkInterj "kiitos" ;
 lin thanks_N = mkWN (k39 "kiitos") ;
 lin thanks_to_Prep = mkPrep "ansiosta" ;
 lin thanksgiving_N = mkWN (k39 "siunaus") "ruoan" ; --UNCHK
-lin that_AdA = variants {} ; --
+lin that_AdA = mkAdA "niin" ; --
 lin that_Quant = S.that_Quant ;
 lin that_Subj = S.that_Subj ;
 lin thatch_N = mkWN (compoundN "olki" (k1A "katto")) ; --UNCHK
@@ -52868,7 +52909,7 @@ lin tiler_N = mkWN (k6 "muurari") ; --UNCHK
 lin tiling_N = mkWN (compoundN "muu" (k38 "raaminen")) ; --UNCHK
 lin till_N = mkWN (k9 "kassa") ; --UNCHK
 lin till_Prep = variants {} ; --
-lin till_Subj = variants {} ; --
+lin till_Subj = mkSubj "kunnes" ; --
 lin till_V2 = mkWV2 (k53A "kyntää") ; --UNCHK
 lin tillage_N = mkWN (compoundN "maan" (k39 "muokkaus")) ; --UNCHK
 lin tiller_N = mkWN (k9 "hara") ; --UNCHK
@@ -52906,6 +52947,7 @@ lin timely_A = mkWA (compoundA "oikea-" (k38 "aikainen")) ;
 lin timepiece_N = mkWN (k1 "kello") ; --UNCHK
 lin timer_N = mkWN (k33 "ajastin") ; --UNCHK
 lin times_N = mkWN (compoundN "kerto" (k1 "lasku")) ; --UNCHK
+lin times_Prep = mkPrep "kertaa" nominative ;
 lin timeserver_N = mkWN (compoundN "myötä" (k12 "juoksija")) ; --UNCHK
 lin timeserving_A = mkWA (k38 "opportunistinen") ; --UNCHK
 lin timetable_N = mkWN (compoundN "aika" (k1 "taulu")) ; --UNCHK
@@ -56135,6 +56177,7 @@ lin up_Prep = mkPrep "ylös" partitive ;
 lin up_V = mkWV (k53 "nostaa") ; --UNCHK
 lin up_V2 = mkWV2 (k53 "nostaa") ; --UNCHK
 lin up_and_coming_A = mkA "lupaava" ;
+lin up_to_Prep = mkPrep elative "kiinni" ;
 lin up_to_date_A = variants {} ; --
 lin upbeat_N = mkWN (compoundN "koho" (k5A "tahti")) ; --UNCHK
 lin upbound_A = mkWA "ylävirtaan" ; --UNCHK
@@ -56839,6 +56882,7 @@ lin vicarial_A = mkA "papillinen" ;
 lin vicariate_N = mkWN "vikariaatti" ; --UNCHK
 lin vicarious_A = mkWA (compoundA "epä" (k10 "suora")) ; --UNCHK
 lin vice_N = mkN (lin NK {s = d48 "pahe"}) ;
+lin vice_Prep = mkPrep "vara" nominative ; ---- cat
 lin vice_president_N = mkN "vara" (mkN "presidentti") ;
 lin vice_versa_Adv = mkWAdv (k99 "päin") "toisin" ; --UNCHK
 lin vicegerent_N = mkWN (compoundN "käskyn" (k12 "haltija")) ; --UNCHK
@@ -57908,10 +57952,12 @@ lin whence_Adv = mkWAdv (k99 "mistä") ; --UNCHK
 lin whenever_Adv = variants {} ; --
 lin where_IAdv = S.where_IAdv ;
 lin where_Subj = mkSubj "missä" ;
+lin where_as_Prep = mkPrep "kun taas" nominative ; ---- cat
 lin whereabouts_N = mkWN (k5A "sijainti") ; --UNCHK
 lin whereas_Prep = prePrep nominative "kun taas" ;
 lin whereas_Subj = mkSubj "kun taas" ;
 lin whereby_Adv = variants {} ; --
+lin wherein_Subj = mkSubj "missä" ;
 lin wheresoever_Adv = mkWAdv (k99 "ikinä") "missä" ; --UNCHK
 lin wherever_Adv = mkWAdv (k99 "ikinä") "missä" ; --UNCHK
 lin wherry_N = mkWN (compoundN "lautta" (k48 "vene")) ; --UNCHK
@@ -58041,7 +58087,7 @@ lin whoPl_IP = S.whoPl_IP ;
 lin whoSg_IP = S.whoSg_IP ;
 lin who_N = mkWN (compoundN "terveys" (k2 "järjestö")) "Maailman" ; --UNCHK
 lin whodunit_N = mkWN (k6 "dekkari") ; --UNCHK
-lin whoever_NP = variants {} ; --
+lin whoever_NP = {s = table {NPAcc => "kenet" ++ "tahansa" ; c => S.kukaInt ! Sg ! npform2case Sg c ++ "tahansa"} ; a = agrP3 Sg ; isPron, isNeg = False} ; --
 lin whole_A = mkA "kokonainen" ;
 lin whole_N = mkWN (k40 "kokonaisuus") ;
 lin wholehearted_A = mkWA (k34A "varaukseton") ; --UNCHK
@@ -58319,6 +58365,7 @@ lin witching_A = mkWA (k10 "lumoava") ; --UNCHK
 lin witching_N = mkWN "noituminen" ; --UNCHK
 lin witchlike_A = mkWA (compoundA "noita" (k38 "mainen")) ; --UNCHK
 lin with_Prep = mkPrep "kanssa" | mkPrep "luona" | mkPrep "tykönä" ; ---- split
+lin with_a_view_to_Prep = mkPrep genitive "huomioonottaen" ; ---- should be accusative
 lin with_regard_to_Prep = mkPrep "kohtaan" partitive ;
 lin with_respect_to_Prep = mkPrep "suhteessa" illative ;
 lin witham_PN = foreignPN "Witham" ;
@@ -58919,7 +58966,6 @@ lin zero_N = mkWN (compoundN "nolla" (k48 "piste")) ; --UNCHK
 lin zero_V = mkWV (k53 "kohdistaa") ; --UNCHK
 lin zero_in_V = mkWV (k53 "kohdistaa") ; --UNCHK
 lin zero_in_on_V2 = mkWV2 (k53 "kohdistaa") illative ; --UNCHK
-
 lin zeroth_A = mkWA (k45 "nollas") ; --UNCHK
 lin zest_N = mkWN (k1A "maku") "ryydin" ; --UNCHK
 lin zestful_A = mkWA (k34A "järjetön") ; --UNCHK
@@ -59012,4 +59058,4 @@ lin zymoid_A = mkWA (compoundA "muis" (k10 "tuttava")) "entsyymiä" ; --UNCHK
 lin zymology_N = mkWN "tsymologia" ; --UNCHK
 lin zymosis_N = mkWN "tsymoosi" ; --UNCHK
 lin zymotic_A = mkWA "tsymoosiin" "liittyvä" ; --UNCHK
-}
+}