diff --git a/next-lib/src/parse/oald/Oald.gf b/next-lib/src/parse/oald/Oald.gf index 0ff2771e4..ec3d3bdbd 100644 --- a/next-lib/src/parse/oald/Oald.gf +++ b/next-lib/src/parse/oald/Oald.gf @@ -35,7 +35,6 @@ fun ab_initio_Adv : Adv; fun aback_Adv : Adv; fun abacus_N : N; fun abaft_Adv : Adv; -fun abaft_Prep : Prep; fun abandon_N : N; fun abandon_V2 : V2; fun abandoned_A : A; @@ -104,7 +103,6 @@ fun abnormality_N : N; fun abnormally_Adv : Adv; fun abo_N : N; fun aboard_Adv : Adv; -fun aboard_Prep : Prep; fun abode_N : N; fun abolish_V2 : V2; fun abolition_N : N; @@ -124,11 +122,9 @@ fun abortive_A : A; fun abortively_Adv : Adv; fun abound_V : V; fun about_Adv : Adv; -fun about_Prep : Prep; fun about_face_N : N; fun about_face_V : V; fun above_Adv : Adv; -fun above_Prep : Prep; fun above_board_A : A; fun above_board_Adv : Adv; fun above_mentioned_A : A; @@ -264,8 +260,6 @@ fun accord_N : N; fun accord_V : V; fun accord_V2 : V2; fun accordance_N : N; -fun according_as_Conj : Conj; -fun according_to_Prep : Prep; fun accordingly_Adv : Adv; fun accordion_N : N; fun accost_V2 : V2; @@ -354,7 +348,6 @@ fun acrobatics_N : N; fun acronym_N : N; fun acropolis_N : N; fun across_Adv : Adv; -fun across_Prep : Prep; fun acrostic_N : N; fun acrylic_N : N; fun act_N : N; @@ -664,7 +657,6 @@ fun aflame_A : A; fun afloat_A : A; fun afoot_A : A; fun afore_Adv : Adv; -fun afore_Prep : Prep; fun aforesaid_A : A; fun aforethought_Adv : Adv; fun afoul_Adv : Adv; @@ -682,8 +674,6 @@ fun afro_wig_N : N; fun aft_Adv : Adv; fun after_A : A; fun after_Adv : Adv; -fun after_Conj : Conj; -fun after_Prep : Prep; fun aftercare_N : N; fun afterdamp_N : N; fun aftereffect_N : N; @@ -693,7 +683,6 @@ fun afternoon_N : N; fun afterthought_N : N; fun afterwards_Adv : Adv; fun again_Adv : Adv; -fun against_Prep : Prep; fun agape_A : A; fun agar_agar_N : N; fun agate_N : N; @@ -739,7 +728,6 @@ fun aghast_A : A; fun agile_A : A; fun agilely_Adv : Adv; fun agility_N : N; -fun agin_Prep : Prep; fun aging_N : N; fun agitate_V : V; fun agitate_V2 : V2; @@ -863,7 +851,6 @@ fun albania_PN : PN; fun albanian_A : A; fun albanian_N : N; fun albatross_N : N; -fun albeit_Conj : Conj; fun albert_PN : PN; fun alberta_PN : PN; fun albino_N : N; @@ -1015,9 +1002,7 @@ fun aloft_Adv : Adv; fun alone_A : A; fun alone_Adv : Adv; fun along_Adv : Adv; -fun along_Prep : Prep; fun alongside_Adv : Adv; -fun alongside_Prep : Prep; fun aloof_A : A; fun aloof_Adv : Adv; fun aloofness_N : N; @@ -1053,7 +1038,6 @@ fun alternation_N : N; fun alternative_A : A; fun alternative_N : N; fun alternatively_Adv : Adv; -fun although_Conj : Conj; fun altimeter_N : N; fun altitude_N : N; fun alto_N : N; @@ -1141,9 +1125,7 @@ fun amiably_Adv : Adv; fun amicability_N : N; fun amicable_A : A; fun amicably_Adv : Adv; -fun amid_Prep : Prep; fun amidships_Adv : Adv; -fun amidst_Prep : Prep; fun amiens_PN : PN; fun amir_N : N; fun amiss_A : A; @@ -1160,8 +1142,6 @@ fun amnesty_N : N; fun amoeba_N : N; fun amoebic_A : A; fun amok_Adv : Adv; -fun among_Prep : Prep; -fun amongst_Prep : Prep; fun amoral_A : A; fun amorous_A : A; fun amorously_Adv : Adv; @@ -1196,7 +1176,6 @@ fun amusement_N : N; fun amusing_A : A; fun amusingly_Adv : Adv; fun amy_PN : PN; -fun an_Conj : Conj; fun anachronism_N : N; fun anachronistic_A : A; fun anaconda_N : N; @@ -1251,7 +1230,6 @@ fun anchovy_N : N; fun ancient_A : A; fun ancillary_A : A; fun ancona_PN : PN; -fun and_Conj : Conj; fun andante_A : A; fun andante_Adv : Adv; fun andante_N : N; @@ -1266,7 +1244,6 @@ fun anecdotal_A : A; fun anecdote_N : N; fun anemometer_N : N; fun anemone_N : N; -fun anent_Prep : Prep; fun aneroid_A : A; fun aneroid_N : N; fun anesthetic_A : A; @@ -1810,7 +1787,6 @@ fun arnold_PN : PN; fun aroma_N : N; fun aromatic_A : A; fun around_Adv : Adv; -fun around_Prep : Prep; fun arouse_V2 : V2; fun arpeggio_N : N; fun arquebus_N : N; @@ -1887,7 +1863,6 @@ fun arum_N : N; fun aryan_A : A; fun aryan_N : N; fun arête_N : N; -fun as_Conj : Conj; fun asap_PN : PN; fun asbestos_N : N; fun ascend_V : V; @@ -1948,7 +1923,6 @@ fun askew_A : A; fun askew_Adv : Adv; fun asking_N : N; fun aslant_Adv : Adv; -fun aslant_Prep : Prep; fun asleep_A : A; fun asleep_Adv : Adv; fun asp_N : N; @@ -2059,7 +2033,6 @@ fun astray_A : A; fun astray_Adv : Adv; fun astride_A : A; fun astride_Adv : Adv; -fun astride_Prep : Prep; fun astringency_N : N; fun astringent_A : A; fun astringent_N : N; @@ -2087,7 +2060,6 @@ fun asymmetry_N : N; fun asymptote_N : N; fun asymptotic_A : A; fun asymptotically_Adv : Adv; -fun at_Prep : Prep; fun at_home_N : N; fun atabrine_N : N; fun atavism_N : N; @@ -2106,7 +2078,6 @@ fun athletic_A : A; fun athletics_N : N; fun athlone_PN : PN; fun athwart_Adv : Adv; -fun athwart_Prep : Prep; fun atlanta_PN : PN; fun atlantic_PN : PN; fun atlas_N : N; @@ -2699,7 +2670,6 @@ fun baptist_A : A; fun baptist_N : N; fun baptize_V2 : V2; fun bar_N : N; -fun bar_Prep : Prep; fun bar_V2 : V2; fun baracaldo_PN : PN; fun barb_N : N; @@ -2807,7 +2777,6 @@ fun barrhead_PN : PN; fun barricade_N : N; fun barricade_V2 : V2; fun barrier_N : N; -fun barring_Prep : Prep; fun barrister_N : N; fun barrow_N : N; fun barrow_boy_N : N; @@ -3011,7 +2980,6 @@ fun beaver_N : N; fun beaver_V : V; fun bebington_PN : PN; fun becalmed_A : A; -fun because_Conj : Conj; fun beccles_PN : PN; fun beck_N : N; fun beckon_V : V; @@ -3081,8 +3049,6 @@ fun befitting_A : A; fun befittingly_Adv : Adv; fun befogged_A : A; fun before_Adv : Adv; -fun before_Conj : Conj; -fun before_Prep : Prep; fun beforehand_A : A; fun beforehand_Adv : Adv; fun befoul_V2 : V2; @@ -3116,7 +3082,6 @@ fun behead_V2 : V2; fun behest_N : N; fun behind_Adv : Adv; fun behind_N : N; -fun behind_Prep : Prep; fun behindhand_A : A; fun behold_V2 : V2; fun beholden_A : A; @@ -3198,7 +3163,6 @@ fun belong_V : V; fun beloved_A : A; fun beloved_N : N; fun below_Adv : Adv; -fun below_Prep : Prep; fun belper_PN : PN; fun belt_N : N; fun belt_V2 : V2; @@ -3212,7 +3176,6 @@ fun bend_N : N; fun bend_V : V; fun bend_V2 : V2; fun beneath_Adv : Adv; -fun beneath_Prep : Prep; fun benedick_N : N; fun benedictine_A : A; fun benedictine_N : N; @@ -3291,9 +3254,7 @@ fun beseechingly_Adv : Adv; fun beseem_V2 : V2; fun beset_V2 : V2; fun beshrew_V2 : V2; -fun beside_Prep : Prep; fun besides_Adv : Adv; -fun besides_Prep : Prep; fun besiege_V2 : V2; fun besieger_N : N; fun besmear_V2 : V2; @@ -3345,9 +3306,7 @@ fun betterment_N : N; fun bettor_N : N; fun betty_PN : PN; fun between_Adv : Adv; -fun between_Prep : Prep; fun betwixt_Adv : Adv; -fun betwixt_Prep : Prep; fun bevel_N : N; fun bevel_V2 : V2; fun beverage_N : N; @@ -3367,7 +3326,6 @@ fun bexhill_PN : PN; fun bexley_PN : PN; fun bey_N : N; fun beyond_Adv : Adv; -fun beyond_Prep : Prep; fun bezique_N : N; fun bhang_N : N; fun bhutan_PN : PN; @@ -4878,8 +4836,6 @@ fun busy_A : A; fun busy_V2 : V2; fun busybody_N : N; fun but_Adv : Adv; -fun but_Conj : Conj; -fun but_Prep : Prep; fun butane_N : N; fun butch_A : A; fun butcher_N : N; @@ -4922,7 +4878,6 @@ fun buzzard_N : N; fun buzzer_N : N; fun bvm_N : N; fun by_Adv : Adv; -fun by_Prep : Prep; fun by_election_N : N; fun bye_N : N; fun bye_bye_N : N; @@ -6324,7 +6279,6 @@ fun cinquefoil_N : N; fun cipher_N : N; fun cipher_V : V; fun cipher_V2 : V2; -fun circa_Prep : Prep; fun circle_N : N; fun circle_V : V; fun circle_V2 : V2; @@ -7309,7 +7263,6 @@ fun concern_N : N; fun concern_V2 : V2; fun concerned_A : A; fun concernedly_Adv : Adv; -fun concerning_Prep : Prep; fun concert_N : N; fun concert_V2 : V2; fun concert_hall_N : N; @@ -7591,7 +7544,6 @@ fun considerate_A : A; fun considerately_Adv : Adv; fun considerateness_N : N; fun consideration_N : N; -fun considering_Prep : Prep; fun consign_V2 : V2; fun consignee_N : N; fun consigner_N : N; @@ -8119,7 +8071,6 @@ fun coruscate_V : V; fun coruscation_N : N; fun corvette_N : N; fun corvée_N : N; -fun cos_Conj : Conj; fun cos_N : N; fun cosenza_PN : PN; fun cosh_N : N; @@ -9911,7 +9862,6 @@ fun despicable_A : A; fun despicably_Adv : Adv; fun despise_V2 : V2; fun despite_N : N; -fun despite_Prep : Prep; fun despiteful_A : A; fun despitefully_Adv : Adv; fun despoil_V2 : V2; @@ -10293,7 +10243,6 @@ fun direction_finder_N : N; fun directional_A : A; fun directive_N : N; fun directly_Adv : Adv; -fun directly_Conj : Conj; fun directness_N : N; fun director_N : N; fun directorate_N : N; @@ -11099,7 +11048,6 @@ fun dower_V2 : V2; fun down_Adv : Adv; fun down_N : N; fun down_PN : PN; -fun down_Prep : Prep; fun down_V2 : V2; fun down_and_out_N : N; fun down_market_A : A; @@ -11491,7 +11439,6 @@ fun durban_PN : PN; fun durbar_N : N; fun duress_N : N; fun durham_PN : PN; -fun during_Prep : Prep; fun durrington_PN : PN; fun dursley_PN : PN; fun dusk_N : N; @@ -11854,7 +11801,6 @@ fun eindhoven_PN : PN; fun eisteddfod_N : N; fun either_A : A; fun either_Adv : Adv; -fun either_Conj : Conj; fun ejaculate_V2 : V2; fun ejaculation_N : N; fun eject_V : V; @@ -12466,7 +12412,6 @@ fun erase_V2 : V2; fun eraser_N : N; fun erasure_N : N; fun ere_Adv : Adv; -fun ere_Prep : Prep; fun erect_A : A; fun erect_V2 : V2; fun erectile_A : A; @@ -12763,10 +12708,7 @@ fun excellency_N : N; fun excellent_A : A; fun excellently_Adv : Adv; fun excelsior_N : N; -fun except_Conj : Conj; -fun except_Prep : Prep; fun except_V2 : V2; -fun excepting_Prep : Prep; fun exception_N : N; fun exceptionable_A : A; fun exceptional_A : A; @@ -13182,7 +13124,6 @@ fun fail_V : V; fun fail_V2 : V2; fun fail_safe_A : A; fun failing_N : N; -fun failing_Prep : Prep; fun failure_N : N; fun fain_Adv : Adv; fun faint_A : A; @@ -14314,11 +14255,8 @@ fun footwear_N : N; fun footwork_N : N; fun fop_N : N; fun foppish_A : A; -fun for_Conj : Conj; -fun for_Prep : Prep; fun forage_N : N; fun forage_V : V; -fun forasmuch_as_Conj : Conj; fun foray_N : N; fun foray_V : V; fun forbear_N : N; @@ -14814,7 +14752,6 @@ fun frogmarch_V2 : V2; fun frolic_N : N; fun frolic_V : V; fun frolicsome_A : A; -fun from_Prep : Prep; fun frome_PN : PN; fun frond_N : N; fun front_N : N; @@ -17763,7 +17700,6 @@ fun hovercraft_N : N; fun how_Adv : Adv; fun how_d'ye_do_N : N; fun howard_PN : PN; -fun howbeit_Conj : Conj; fun howdah_N : N; fun however_Adv : Adv; fun howitzer_N : N; @@ -18122,7 +18058,6 @@ fun idolize_V2 : V2; fun idyll_N : N; fun idyllic_A : A; fun ie_PN : PN; -fun if_Conj : Conj; fun igloo_N : N; fun igneous_A : A; fun ignis_fatuus_N : N; @@ -18242,7 +18177,6 @@ fun immeasurably_Adv : Adv; fun immediacy_N : N; fun immediate_A : A; fun immediately_Adv : Adv; -fun immediately_Conj : Conj; fun immemorial_A : A; fun immense_A : A; fun immensely_Adv : Adv; @@ -18488,7 +18422,6 @@ fun imputation_N : N; fun impute_V2 : V2; fun in_Adv : Adv; fun in_N : N; -fun in_Prep : Prep; fun in_chief_A : A; fun in_fighting_N : N; fun in_loco_parentis_Adv : Adv; @@ -19189,7 +19122,6 @@ fun inshore_Adv : Adv; fun inside_A : A; fun inside_Adv : Adv; fun inside_N : N; -fun inside_Prep : Prep; fun insider_N : N; fun insidious_A : A; fun insidiously_Adv : Adv; @@ -19248,7 +19180,6 @@ fun instant_N : N; fun instantaneous_A : A; fun instantaneously_Adv : Adv; fun instantly_Adv : Adv; -fun instantly_Conj : Conj; fun instead_Adv : Adv; fun instep_N : N; fun instigate_V2 : V2; @@ -19506,7 +19437,6 @@ fun intimately_Adv : Adv; fun intimation_N : N; fun intimidate_V2 : V2; fun intimidation_N : N; -fun into_Prep : Prep; fun intolerable_A : A; fun intolerably_Adv : Adv; fun intolerance_N : N; @@ -21231,14 +21161,12 @@ fun lesotho_PN : PN; fun less_A : A; fun less_Adv : Adv; fun less_N : N; -fun less_Prep : Prep; fun lessee_N : N; fun lessen_V : V; fun lessen_V2 : V2; fun lesser_A : A; fun lesson_N : N; fun lessor_N : N; -fun lest_Conj : Conj; fun let_N : N; fun let_V : V; fun let_V2 : V2; @@ -21453,9 +21381,7 @@ fun lignite_N : N; fun likable_A : A; fun like_A : A; fun like_Adv : Adv; -fun like_Conj : Conj; fun like_N : N; -fun like_Prep : Prep; fun like_V2 : V2; fun like_minded_A : A; fun likeable_A : A; @@ -21465,7 +21391,6 @@ fun likely_Adv : Adv; fun liken_V2 : V2; fun likeness_N : N; fun likewise_Adv : Adv; -fun likewise_Conj : Conj; fun liking_N : N; fun lilac_N : N; fun lilian_PN : PN; @@ -23333,7 +23258,6 @@ fun microscopically_Adv : Adv; fun microscopy_N : N; fun microwave_N : N; fun mid_A : A; -fun mid_Prep : Prep; fun mid_off_N : N; fun mid_on_N : N; fun midday_N : N; @@ -23366,7 +23290,6 @@ fun midriff_N : N; fun midshipman_N : N; fun midships_Adv : Adv; fun midst_N : N; -fun midst_Prep : Prep; fun midstream_N : N; fun midsummer_N : N; fun midway_A : A; @@ -23583,7 +23506,6 @@ fun mint_V2 : V2; fun minuet_N : N; fun minus_A : A; fun minus_N : N; -fun minus_Prep : Prep; fun minuscule_A : A; fun minute_A : A; fun minute_N : N; @@ -24667,7 +24589,6 @@ fun neapolitan_A : A; fun neapolitan_N : N; fun near_A : A; fun near_Adv : Adv; -fun near_Prep : Prep; fun near_V : V; fun near_V2 : V2; fun near_sighted_A : A; @@ -24679,7 +24600,6 @@ fun nearness_N : N; fun nearside_N : N; fun neat_A : A; fun neath_PN : PN; -fun neath_Prep : Prep; fun neatly_Adv : Adv; fun neatness_N : N; fun nebraska_PN : PN; @@ -24762,7 +24682,6 @@ fun neighbourly_A : A; fun neil_PN : PN; fun neither_A : A; fun neither_Adv : Adv; -fun neither_Conj : Conj; fun nell_PN : PN; fun nelly_N : N; fun nelly_PN : PN; @@ -24850,7 +24769,6 @@ fun nevada_PN : PN; fun never_Adv : Adv; fun nevermore_Adv : Adv; fun nevertheless_Adv : Adv; -fun nevertheless_Conj : Conj; fun neville_PN : PN; fun new_A : A; fun new_Adv : Adv; @@ -24914,7 +24832,6 @@ fun newtown_PN : PN; fun next_A : A; fun next_Adv : Adv; fun next_N : N; -fun next_Prep : Prep; fun nexus_N : N; fun nhs_N : N; fun nib_N : N; @@ -24960,11 +24877,8 @@ fun nigger_N : N; fun niggle_V : V; fun niggling_A : A; fun nigh_Adv : Adv; -fun nigh_Prep : Prep; fun nigher_Adv : Adv; -fun nigher_Prep : Prep; fun nighest_Adv : Adv; -fun nighest_Prep : Prep; fun night_N : N; fun night_bell_N : N; fun night_bird_N : N; @@ -25034,7 +24948,6 @@ fun nipponese_A : A; fun nippy_A : A; fun nirvana_N : N; fun nisi_A : A; -fun nisi_Conj : Conj; fun nissen_PN : PN; fun nit_N : N; fun nitrate_N : N; @@ -25167,7 +25080,6 @@ fun nor'_nor'_west_Adv : Adv; fun nor'_nor'_west_N : N; fun nor'_west_Adv : Adv; fun nor'_west_N : N; -fun nor_Conj : Conj; fun nora_PN : PN; fun nordic_A : A; fun nordic_N : N; @@ -25283,8 +25195,6 @@ fun notoriously_Adv : Adv; fun nottingham_PN : PN; fun nottinghamshire_PN : PN; fun notwithstanding_Adv : Adv; -fun notwithstanding_Conj : Conj; -fun notwithstanding_Prep : Prep; fun nougat_N : N; fun nought_N : N; fun noun_N : N; @@ -25309,7 +25219,6 @@ fun novitiate_N : N; fun novokuznetsk_PN : PN; fun novosibirsk_PN : PN; fun now_Adv : Adv; -fun now_Conj : Conj; fun nowadays_Adv : Adv; fun nowhere_Adv : Adv; fun nowise_Adv : Adv; @@ -25409,7 +25318,6 @@ fun nymphomaniac_N : N; fun née_A : A; fun négligé_N : N; fun o'er_Adv : Adv; -fun o'er_Prep : Prep; fun o_N : N; fun o_level_N : N; fun oaf_N : N; @@ -25617,10 +25525,8 @@ fun oecumenical_A : A; fun oed_N : N; fun oedipus_PN : PN; fun oesophagus_N : N; -fun of_Prep : Prep; fun off_A : A; fun off_Adv : Adv; -fun off_Prep : Prep; fun off_day_N : N; fun off_licence_N : N; fun off_peak_A : A; @@ -25775,9 +25681,7 @@ fun omniscient_A : A; fun omnivorous_A : A; fun omsk_PN : PN; fun on_Adv : Adv; -fun on_Prep : Prep; fun on_licence_N : N; -fun on_to_Prep : Prep; fun once_Adv : Adv; fun oncoming_A : A; fun oncoming_N : N; @@ -25800,7 +25704,6 @@ fun onion_N : N; fun onlooker_N : N; fun only_A : A; fun only_Adv : Adv; -fun only_Conj : Conj; fun onomatopoeia_N : N; fun onrush_N : N; fun onset_N : N; @@ -25808,7 +25711,6 @@ fun onshore_A : A; fun onshore_Adv : Adv; fun onslaught_N : N; fun ontario_PN : PN; -fun onto_Prep : Prep; fun ontology_N : N; fun onus_N : N; fun onward_A : A; @@ -25917,7 +25819,6 @@ fun opulence_N : N; fun opulent_A : A; fun opulently_Adv : Adv; fun opus_N : N; -fun or_Conj : Conj; fun oracle_N : N; fun oracular_A : A; fun oral_A : A; @@ -26081,7 +25982,6 @@ fun other_A : A; fun other_Adv : Adv; fun other_N : N; fun otherwise_Adv : Adv; -fun otherwise_Conj : Conj; fun otherworldly_A : A; fun otiose_A : A; fun otley_PN : PN; @@ -26197,7 +26097,6 @@ fun outshine_V2 : V2; fun outside_A : A; fun outside_Adv : Adv; fun outside_N : N; -fun outside_Prep : Prep; fun outsider_N : N; fun outsize_A : A; fun outsmart_V2 : V2; @@ -26233,7 +26132,6 @@ fun oven_N : N; fun ovenware_N : N; fun over_Adv : Adv; fun over_N : N; -fun over_Prep : Prep; fun over_abundance_N : N; fun over_ripe_A : A; fun overabundant_A : A; @@ -26981,7 +26879,6 @@ fun pass fun past_A : A; fun past_Adv : Adv; fun past_N : N; -fun past_Prep : Prep; fun pasta_N : N; fun paste_N : N; fun paste_V2 : V2; @@ -27325,7 +27222,6 @@ fun pencil_V2 : V2; fun pendant_N : N; fun pendent_A : A; fun pending_A : A; -fun pending_Prep : Prep; fun pendlebury_PN : PN; fun pendulous_A : A; fun pendulum_N : N; @@ -27410,7 +27306,6 @@ fun peppermint_N : N; fun peppery_A : A; fun pepsin_N : N; fun peptic_A : A; -fun per_Prep : Prep; fun peradventure_Adv : Adv; fun perambulate_V : V; fun perambulate_V2 : V2; @@ -28413,7 +28308,6 @@ fun pluralist_N : N; fun plurality_N : N; fun plus_A : A; fun plus_N : N; -fun plus_Prep : Prep; fun plush_A : A; fun plush_N : N; fun plushy_A : A; @@ -29753,7 +29647,6 @@ fun proverbial_A : A; fun proverbially_Adv : Adv; fun provide_V : V; fun provide_V2 : V2; -fun provided_Conj : Conj; fun providence_N : N; fun providence_PN : PN; fun provident_A : A; @@ -29761,7 +29654,6 @@ fun providential_A : A; fun providentially_Adv : Adv; fun providently_Adv : Adv; fun provider_N : N; -fun providing_Conj : Conj; fun province_N : N; fun provincial_A : A; fun provincial_N : N; @@ -30149,8 +30041,6 @@ fun qatari_N : N; fun qc_N : N; fun qed_PN : PN; fun qt_N : N; -fun qua_Conj : Conj; -fun qua_Prep : Prep; fun quack_N : N; fun quack_V : V; fun quack_quack_N : N; @@ -30739,7 +30629,6 @@ fun razzle_dazzle_N : N; fun rc_PN : PN; fun rd_PN : PN; fun re_N : N; -fun re_Prep : Prep; fun re_address_V2 : V2; fun re_afforest_V2 : V2; fun re_afforestation_N : N; @@ -31685,7 +31574,6 @@ fun respectably_Adv : Adv; fun respecter_N : N; fun respectful_A : A; fun respectfully_Adv : Adv; -fun respecting_Prep : Prep; fun respective_A : A; fun respectively_Adv : Adv; fun respiration_N : N; @@ -32461,7 +32349,6 @@ fun roulette_N : N; fun round_A : A; fun round_Adv : Adv; fun round_N : N; -fun round_Prep : Prep; fun round_V : V; fun round_V2 : V2; fun round_arm_A : A; @@ -32987,7 +32874,6 @@ fun sanguine_A : A; fun sanitary_A : A; fun sanitation_N : N; fun sanity_N : N; -fun sans_Prep : Prep; fun sanskrit_N : N; fun santa_claus_N : N; fun santa_claus_PN : PN; @@ -33110,14 +32996,12 @@ fun savanna_N : N; fun savannah_N : N; fun savant_N : N; fun save_N : N; -fun save_Prep : Prep; fun save_V : V; fun save_V2 : V2; fun saveloy_N : N; fun saver_N : N; fun saving_A : A; fun saving_N : N; -fun saving_Prep : Prep; fun savings_bank_N : N; fun saviour_N : N; fun savoir_faire_N : N; @@ -34801,8 +34685,6 @@ fun simultaneousness_N : N; fun sin_N : N; fun sin_V : V; fun since_Adv : Adv; -fun since_Conj : Conj; -fun since_Prep : Prep; fun sincere_A : A; fun sincerely_Adv : Adv; fun sincerity_N : N; @@ -35578,7 +35460,6 @@ fun snuggle_V2 : V2; fun snugly_Adv : Adv; fun snugness_N : N; fun so_Adv : Adv; -fun so_Conj : Conj; fun so_N : N; fun so_and_so_N : N; fun so_called_A : A; @@ -37801,7 +37682,6 @@ fun supporter_N : N; fun suppose_V2 : V2; fun supposed_A : A; fun supposedly_Adv : Adv; -fun supposing_Conj : Conj; fun supposition_N : N; fun suppository_N : N; fun suppress_V2 : V2; @@ -38896,7 +38776,6 @@ fun thai_N : N; fun thailand_PN : PN; fun thalidomide_N : N; fun thame_PN : PN; -fun than_Conj : Conj; fun thane_N : N; fun thank_V2 : V2; fun thank_offering_N : N; @@ -38907,7 +38786,6 @@ fun thankless_A : A; fun thanksgiving_N : N; fun that_A : A; fun that_Adv : Adv; -fun that_Conj : Conj; fun thatch_N : N; fun thatch_V2 : V2; fun thatcham_PN : PN; @@ -39066,7 +38944,6 @@ fun thistle_N : N; fun thistledown_N : N; fun thither_Adv : Adv; fun tho'_Adv : Adv; -fun tho'_Conj : Conj; fun thole_N : N; fun tholepin_N : N; fun thomas_PN : PN; @@ -39085,7 +38962,6 @@ fun thoroughly_Adv : Adv; fun thoroughness_N : N; fun those_A : A; fun though_Adv : Adv; -fun though_Conj : Conj; fun thought_N : N; fun thought_reader_N : N; fun thoughtful_A : A; @@ -39157,7 +39033,6 @@ fun thrill_V : V; fun thrill_V2 : V2; fun thriller_N : N; fun thrive_V : V; -fun thro'_Prep : Prep; fun throat_N : N; fun throated_A : A; fun throaty_A : A; @@ -39176,9 +39051,7 @@ fun throttle_V : V; fun throttle_V2 : V2; fun throttle_valve_N : N; fun through_Adv : Adv; -fun through_Prep : Prep; fun throughout_Adv : Adv; -fun throughout_Prep : Prep; fun throughput_N : N; fun throughway_N : N; fun throw_N : N; @@ -39187,7 +39060,6 @@ fun throw_V2 : V2; fun throw_in_N : N; fun throwaway_N : N; fun throwback_N : N; -fun thru_Prep : Prep; fun thrum_V : V; fun thrum_V2 : V2; fun thrush_N : N; @@ -39299,9 +39171,7 @@ fun tilbury_PN : PN; fun tilde_N : N; fun tile_N : N; fun tile_V2 : V2; -fun till_Conj : Conj; fun till_N : N; -fun till_Prep : Prep; fun till_V2 : V2; fun tillage_N : N; fun tiller_N : N; @@ -39446,7 +39316,6 @@ fun tiverton_PN : PN; fun tizzy_N : N; fun tnt_N : N; fun to_Adv : Adv; -fun to_Prep : Prep; fun to_do_N : N; fun toad_N : N; fun toad_in_the_hole_N : N; @@ -39705,7 +39574,6 @@ fun touched_A : A; fun touchily_Adv : Adv; fun touchiness_N : N; fun touching_A : A; -fun touching_Prep : Prep; fun touchingly_Adv : Adv; fun touchline_N : N; fun touchstone_N : N; @@ -39739,8 +39607,6 @@ fun tout_ensemble_Adv : Adv; fun tout_ensemble_N : N; fun tow_N : N; fun tow_V2 : V2; -fun toward_Prep : Prep; -fun towards_Prep : Prep; fun towel_N : N; fun towel_V2 : V2; fun towel_horse_N : N; @@ -40478,7 +40344,6 @@ fun tweak_V2 : V2; fun twee_A : A; fun tweed_N : N; fun tween_Adv : Adv; -fun tween_Prep : Prep; fun tween_decks_Adv : Adv; fun tweet_N : N; fun tweet_V : V; @@ -40533,7 +40398,6 @@ fun twitch_V : V; fun twitch_V2 : V2; fun twitter_N : N; fun twitter_V : V; -fun twixt_Prep : Prep; fun two_A : A; fun two_N : N; fun two_a_penny_A : A; @@ -40894,7 +40758,6 @@ fun undeniable_A : A; fun undeniably_Adv : Adv; fun undenominational_A : A; fun under_Adv : Adv; -fun under_Prep : Prep; fun under_the_counter_A : A; fun underact_V : V; fun underact_V2 : V2; @@ -40947,7 +40810,6 @@ fun undermanned_A : A; fun undermentioned_A : A; fun undermine_V2 : V2; fun underneath_Adv : Adv; -fun underneath_Prep : Prep; fun undernourished_A : A; fun undernourishment_N : N; fun underpass_N : N; @@ -41326,13 +41188,11 @@ fun unlawfully_Adv : Adv; fun unlearn_V2 : V2; fun unleash_V2 : V2; fun unleavened_A : A; -fun unless_Conj : Conj; fun unlettered_A : A; fun unlicensed_A : A; fun unlighted_A : A; fun unlikable_A : A; fun unlike_A : A; -fun unlike_Prep : Prep; fun unlikely_A : A; fun unlimited_A : A; fun unlined_A : A; @@ -41688,12 +41548,9 @@ fun untidiness_N : N; fun untidy_A : A; fun untie_V : V; fun untie_V2 : V2; -fun until_Conj : Conj; -fun until_Prep : Prep; fun untimely_A : A; fun untiring_A : A; fun untitled_A : A; -fun unto_Prep : Prep; fun untold_A : A; fun untouchable_A : A; fun untouchable_N : N; @@ -41773,7 +41630,6 @@ fun unwritten_A : A; fun unyielding_A : A; fun unzip_V2 : V2; fun up_Adv : Adv; -fun up_Prep : Prep; fun up_V : V; fun up_V2 : V2; fun up_and_coming_A : A; @@ -41802,7 +41658,6 @@ fun upland_N : N; fun uplift_N : N; fun uplift_V2 : V2; fun upmost_A : A; -fun upon_Prep : Prep; fun upper_A : A; fun upper_N : N; fun uppercut_N : N; @@ -42216,7 +42071,6 @@ fun versify_V : V; fun versify_V2 : V2; fun version_N : N; fun verso_N : N; -fun versus_Prep : Prep; fun vertebra_N : N; fun vertebrate_A : A; fun vertebrate_N : N; @@ -42256,7 +42110,6 @@ fun vex_V2 : V2; fun vexation_N : N; fun vexatious_A : A; fun vhf_PN : PN; -fun via_Prep : Prep; fun via_media_N : N; fun viability_N : N; fun viable_A : A; @@ -42275,7 +42128,6 @@ fun vicarage_N : N; fun vicarious_A : A; fun vicariously_Adv : Adv; fun vice_N : N; -fun vice_Prep : Prep; fun vice_versa_Adv : Adv; fun vicenza_PN : PN; fun viceregal_A : A; @@ -42407,7 +42259,6 @@ fun virulent_A : A; fun virulently_Adv : Adv; fun virus_N : N; fun vis_à_vis_Adv : Adv; -fun vis_à_vis_Prep : Prep; fun visa_N : N; fun visa_V2 : V2; fun visage_N : N; @@ -42718,7 +42569,6 @@ fun want_V : V; fun want_V2 : V2; fun want_ad_N : N; fun wantage_PN : PN; -fun wanting_Prep : Prep; fun wanton_A : A; fun wanton_N : N; fun wanton_V : V; @@ -43220,15 +43070,11 @@ fun whelk_N : N; fun whelp_N : N; fun whelp_V : V; fun when_Adv : Adv; -fun when_Conj : Conj; fun whence_Adv : Adv; fun whencesoever_A : A; -fun whencesoever_Conj : Conj; fun whenever_Adv : Adv; -fun whenever_Conj : Conj; fun where_Adv : Adv; fun whereabouts_Adv : Adv; -fun whereas_Conj : Conj; fun whereat_Adv : Adv; fun whereby_Adv : Adv; fun wherefore_Adv : Adv; @@ -43245,7 +43091,6 @@ fun wherewithal_Adv : Adv; fun wherewithal_N : N; fun wherry_N : N; fun whet_V2 : V2; -fun whether_Conj : Conj; fun whetstone_N : N; fun whey_N : N; fun which_A : A; @@ -43253,10 +43098,8 @@ fun whichever_A : A; fun whichsoever_A : A; fun whiff_N : N; fun whig_N : N; -fun while_Conj : Conj; fun while_N : N; fun while_V2 : V2; -fun whilst_Conj : Conj; fun whim_N : N; fun whimper_N : N; fun whimper_V : V; @@ -43599,7 +43442,6 @@ fun witch_hunt_N : N; fun witchcraft_N : N; fun witchery_N : N; fun witching_A : A; -fun with_Prep : Prep; fun withal_Adv : Adv; fun witham_PN : PN; fun withdraw_V : V; @@ -43612,9 +43454,7 @@ fun witheringly_Adv : Adv; fun withernsea_PN : PN; fun withhold_V2 : V2; fun within_Adv : Adv; -fun within_Prep : Prep; fun without_Adv : Adv; -fun without_Prep : Prep; fun withstand_V2 : V2; fun withy_N : N; fun witless_A : A; @@ -43983,7 +43823,6 @@ fun yes_N : N; fun yesterday_Adv : Adv; fun yesterday_N : N; fun yet_Adv : Adv; -fun yet_Conj : Conj; fun yeti_N : N; fun yew_N : N; fun yew_tree_N : N; diff --git a/next-lib/src/parse/oald/OaldEng.gf b/next-lib/src/parse/oald/OaldEng.gf index befff0e07..8456e1a91 100644 --- a/next-lib/src/parse/oald/OaldEng.gf +++ b/next-lib/src/parse/oald/OaldEng.gf @@ -36,7 +36,6 @@ lin ab_initio_Adv = mkAdv "ab initio"; lin aback_Adv = mkAdv "aback"; lin abacus_N = mkN "abacus" "abacuses"; lin abaft_Adv = mkAdv "abaft"; -lin abaft_Prep = mkPrep "abaft"; lin abandon_N = mkN "abandon" "-" {- FIXME: no plural form -}; lin abandon_V2 = mkV2 (mkV "abandon" "abandons" "abandoned" "abandoned" "abandoning"); lin abandoned_A = compoundA (mkA "abandoned"); @@ -105,7 +104,6 @@ lin abnormality_N = mkN "abnormality" "abnormalities"; lin abnormally_Adv = mkAdv "abnormally"; lin abo_N = mkN "abo" "abos"; lin aboard_Adv = mkAdv "aboard"; -lin aboard_Prep = mkPrep "aboard"; lin abode_N = mkN "abode" "abodes"; lin abolish_V2 = mkV2 (mkV "abolish" "abolishes" "abolished" "abolished" "abolishing"); lin abolition_N = mkN "abolition" "-" {- FIXME: no plural form -}; @@ -125,11 +123,9 @@ lin abortive_A = compoundA (mkA "abortive"); lin abortively_Adv = mkAdv "abortively"; lin abound_V = mkV "abound" "abounds" "abounded" "abounded" "abounding"; lin about_Adv = mkAdv "about"; -lin about_Prep = mkPrep "about"; lin about_face_N = mkN "about-face" "IRREG"; lin about_face_V = mkV "about-face" "about-faces" "about-faced" "about-faced" "about-facing"; lin above_Adv = mkAdv "above"; -lin above_Prep = mkPrep "above"; lin above_board_A = compoundA (mkA "above board"); lin above_board_Adv = mkAdv "above board"; lin above_mentioned_A = compoundA (mkA "above-mentioned"); @@ -265,8 +261,6 @@ lin accord_N = mkN "accord" "accords"; lin accord_V = mkV "accord" "accords" "accorded" "accorded" "according"; lin accord_V2 = mkV2 (mkV "accord" "accords" "accorded" "accorded" "according"); lin accordance_N = mkN "accordance" "accordances"; -lin according_as_Conj = mkConj "according as"; -lin according_to_Prep = mkPrep "according to"; lin accordingly_Adv = mkAdv "accordingly"; lin accordion_N = mkN "accordion" "accordions"; lin accost_V2 = mkV2 (mkV "accost" "accosts" "accosted" "accosted" "accosting"); @@ -355,7 +349,6 @@ lin acrobatics_N = mkN "acrobatics" "acrobatics"; lin acronym_N = mkN "acronym" "acronyms"; lin acropolis_N = mkN "acropolis" "acropolises"; lin across_Adv = mkAdv "across"; -lin across_Prep = mkPrep "across"; lin acrostic_N = mkN "acrostic" "acrostics"; lin acrylic_N = mkN "acrylic" "acrylics"; lin act_N = mkN "act" "acts"; @@ -665,7 +658,6 @@ lin aflame_A = compoundA (mkA "aflame"); lin afloat_A = compoundA (mkA "afloat"); lin afoot_A = compoundA (mkA "afoot"); lin afore_Adv = mkAdv "afore"; -lin afore_Prep = mkPrep "afore"; lin aforesaid_A = compoundA (mkA "aforesaid"); lin aforethought_Adv = mkAdv "aforethought"; lin afoul_Adv = mkAdv "afoul"; @@ -683,8 +675,6 @@ lin afro_wig_N = mkN "afro-wig" "afro-wigs"; lin aft_Adv = mkAdv "aft"; lin after_A = compoundA (mkA "after"); lin after_Adv = mkAdv "after"; -lin after_Conj = mkConj "after"; -lin after_Prep = mkPrep "after"; lin aftercare_N = mkN "aftercare" "-" {- FIXME: no plural form -}; lin afterdamp_N = mkN "afterdamp" "-" {- FIXME: no plural form -}; lin aftereffect_N = mkN "aftereffect" "aftereffects"; @@ -694,7 +684,6 @@ lin afternoon_N = mkN "afternoon" "afternoons"; lin afterthought_N = mkN "afterthought" "afterthoughts"; lin afterwards_Adv = mkAdv "afterwards"; lin again_Adv = mkAdv "again"; -lin against_Prep = mkPrep "against"; lin agape_A = compoundA (mkA "agape"); lin agar_agar_N = mkN "agar-agar" "-" {- FIXME: no plural form -}; lin agate_N = mkN "agate" "agates"; @@ -740,7 +729,6 @@ lin aghast_A = compoundA (mkA "aghast"); lin agile_A = compoundA (mkA "agile"); lin agilely_Adv = mkAdv "agilely"; lin agility_N = mkN "agility" "-" {- FIXME: no plural form -}; -lin agin_Prep = mkPrep "agin"; lin aging_N = mkN "aging" "-" {- FIXME: no plural form -}; lin agitate_V = mkV "agitate" "agitates" "agitated" "agitated" "agitating"; lin agitate_V2 = mkV2 (mkV "agitate" "agitates" "agitated" "agitated" "agitating"); @@ -864,7 +852,6 @@ lin albania_PN = mkPN "albania"; lin albanian_A = compoundA (mkA "albanian"); lin albanian_N = mkN "albanian" "albanians"; lin albatross_N = mkN "albatross" "albatrosses"; -lin albeit_Conj = mkConj "albeit"; lin albert_PN = mkPN "albert"; lin alberta_PN = mkPN "alberta"; lin albino_N = mkN "albino" "albinos"; @@ -1016,9 +1003,7 @@ lin aloft_Adv = mkAdv "aloft"; lin alone_A = compoundA (mkA "alone"); lin alone_Adv = mkAdv "alone"; lin along_Adv = mkAdv "along"; -lin along_Prep = mkPrep "along"; lin alongside_Adv = mkAdv "alongside"; -lin alongside_Prep = mkPrep "alongside"; lin aloof_A = compoundA (mkA "aloof"); lin aloof_Adv = mkAdv "aloof"; lin aloofness_N = mkN "aloofness" "-" {- FIXME: no plural form -}; @@ -1054,7 +1039,6 @@ lin alternation_N = mkN "alternation" "alternations"; lin alternative_A = compoundA (mkA "alternative"); lin alternative_N = mkN "alternative" "alternatives"; lin alternatively_Adv = mkAdv "alternatively"; -lin although_Conj = mkConj "although"; lin altimeter_N = mkN "altimeter" "altimeters"; lin altitude_N = mkN "altitude" "altitudes"; lin alto_N = mkN "alto" "altos"; @@ -1142,9 +1126,7 @@ lin amiably_Adv = mkAdv "amiably"; lin amicability_N = mkN "amicability" "-" {- FIXME: no plural form -}; lin amicable_A = compoundA (mkA "amicable"); lin amicably_Adv = mkAdv "amicably"; -lin amid_Prep = mkPrep "amid"; lin amidships_Adv = mkAdv "amidships"; -lin amidst_Prep = mkPrep "amidst"; lin amiens_PN = mkPN "amiens"; lin amir_N = mkN "amir" "amirs"; lin amiss_A = compoundA (mkA "amiss"); @@ -1161,8 +1143,6 @@ lin amnesty_N = mkN "amnesty" "amnesties"; lin amoeba_N = mkN "amoeba" "amoebas"; lin amoebic_A = compoundA (mkA "amoebic"); lin amok_Adv = mkAdv "amok"; -lin among_Prep = mkPrep "among"; -lin amongst_Prep = mkPrep "amongst"; lin amoral_A = compoundA (mkA "amoral"); lin amorous_A = compoundA (mkA "amorous"); lin amorously_Adv = mkAdv "amorously"; @@ -1197,7 +1177,6 @@ lin amusement_N = mkN "amusement" "amusements"; lin amusing_A = compoundA (mkA "amusing"); lin amusingly_Adv = mkAdv "amusingly"; lin amy_PN = mkPN "amy"; -lin an_Conj = mkConj "an"; lin anachronism_N = mkN "anachronism" "anachronisms"; lin anachronistic_A = compoundA (mkA "anachronistic"); lin anaconda_N = mkN "anaconda" "anacondas"; @@ -1252,7 +1231,6 @@ lin anchovy_N = mkN "anchovy" "anchovies"; lin ancient_A = compoundA (mkA "ancient"); lin ancillary_A = compoundA (mkA "ancillary"); lin ancona_PN = mkPN "ancona"; -lin and_Conj = mkConj "and"; lin andante_A = compoundA (mkA "andante"); lin andante_Adv = mkAdv "andante"; lin andante_N = mkN "andante" "andantes"; @@ -1267,7 +1245,6 @@ lin anecdotal_A = compoundA (mkA "anecdotal"); lin anecdote_N = mkN "anecdote" "anecdotes"; lin anemometer_N = mkN "anemometer" "anemometers"; lin anemone_N = mkN "anemone" "anemones"; -lin anent_Prep = mkPrep "anent"; lin aneroid_A = compoundA (mkA "aneroid"); lin aneroid_N = mkN "aneroid" "aneroids"; lin anesthetic_A = compoundA (mkA "anesthetic"); @@ -1811,7 +1788,6 @@ lin arnold_PN = mkPN "arnold"; lin aroma_N = mkN "aroma" "aromas"; lin aromatic_A = compoundA (mkA "aromatic"); lin around_Adv = mkAdv "around"; -lin around_Prep = mkPrep "around"; lin arouse_V2 = mkV2 (mkV "arouse" "arouses" "aroused" "aroused" "arousing"); lin arpeggio_N = mkN "arpeggio" "arpeggios"; lin arquebus_N = mkN "arquebus" "arquebuses"; @@ -1888,7 +1864,6 @@ lin arum_N = mkN "arum" "arums"; lin aryan_A = compoundA (mkA "aryan"); lin aryan_N = mkN "aryan" "aryans"; lin arête_N = mkN "arête" "arêtes"; -lin as_Conj = mkConj "as"; lin asap_PN = mkPN "asap"; lin asbestos_N = mkN "asbestos" "-" {- FIXME: no plural form -}; lin ascend_V = mkV "ascend" "ascends" "ascended" "ascended" "ascending"; @@ -1949,7 +1924,6 @@ lin askew_A = compoundA (mkA "askew"); lin askew_Adv = mkAdv "askew"; lin asking_N = mkN "asking" "IRREG"; lin aslant_Adv = mkAdv "aslant"; -lin aslant_Prep = mkPrep "aslant"; lin asleep_A = compoundA (mkA "asleep"); lin asleep_Adv = mkAdv "asleep"; lin asp_N = mkN "asp" "asps"; @@ -2060,7 +2034,6 @@ lin astray_A = compoundA (mkA "astray"); lin astray_Adv = mkAdv "astray"; lin astride_A = compoundA (mkA "astride"); lin astride_Adv = mkAdv "astride"; -lin astride_Prep = mkPrep "astride"; lin astringency_N = mkN "astringency" "-" {- FIXME: no plural form -}; lin astringent_A = compoundA (mkA "astringent"); lin astringent_N = mkN "astringent" "astringents"; @@ -2088,7 +2061,6 @@ lin asymmetry_N = mkN "asymmetry" "-" {- FIXME: no plural form -}; lin asymptote_N = mkN "asymptote" "asymptotes"; lin asymptotic_A = compoundA (mkA "asymptotic"); lin asymptotically_Adv = mkAdv "asymptotically"; -lin at_Prep = mkPrep "at"; lin at_home_N = mkN "at-home" "at-homes"; lin atabrine_N = mkN "atabrine" "-" {- FIXME: no plural form -}; lin atavism_N = mkN "atavism" "atavisms"; @@ -2107,7 +2079,6 @@ lin athletic_A = compoundA (mkA "athletic"); lin athletics_N = mkN "athletics" "athletics"; lin athlone_PN = mkPN "athlone"; lin athwart_Adv = mkAdv "athwart"; -lin athwart_Prep = mkPrep "athwart"; lin atlanta_PN = mkPN "atlanta"; lin atlantic_PN = mkPN "atlantic"; lin atlas_N = mkN "atlas" "atlases"; @@ -2700,7 +2671,6 @@ lin baptist_A = compoundA (mkA "baptist"); lin baptist_N = mkN "baptist" "baptists"; lin baptize_V2 = mkV2 (mkV "baptize" "baptizes" "baptized" "baptized" "baptizing"); lin bar_N = mkN "bar" "bars"; -lin bar_Prep = mkPrep "bar"; lin bar_V2 = mkV2 (mkV "bar" "bars" "barred" "barred" "barring"); lin baracaldo_PN = mkPN "baracaldo"; lin barb_N = mkN "barb" "barbs"; @@ -2808,7 +2778,6 @@ lin barrhead_PN = mkPN "barrhead"; lin barricade_N = mkN "barricade" "barricades"; lin barricade_V2 = mkV2 (mkV "barricade" "barricades" "barricaded" "barricaded" "barricading"); lin barrier_N = mkN "barrier" "barriers"; -lin barring_Prep = mkPrep "barring"; lin barrister_N = mkN "barrister" "barristers"; lin barrow_N = mkN "barrow" "barrows"; lin barrow_boy_N = mkN "barrow-boy" "barrow-boys"; @@ -3012,7 +2981,6 @@ lin beaver_N = mkN "beaver" "beavers"; lin beaver_V = mkV "beaver" "beavers" "beavered" "beavered" "beavering"; lin bebington_PN = mkPN "bebington"; lin becalmed_A = compoundA (mkA "becalmed"); -lin because_Conj = mkConj "because"; lin beccles_PN = mkPN "beccles"; lin beck_N = mkN "beck" "becks"; lin beckon_V = mkV "beckon" "beckons" "beckoned" "beckoned" "beckoning"; @@ -3082,8 +3050,6 @@ lin befitting_A = compoundA (mkA "befitting"); lin befittingly_Adv = mkAdv "befittingly"; lin befogged_A = compoundA (mkA "befogged"); lin before_Adv = mkAdv "before"; -lin before_Conj = mkConj "before"; -lin before_Prep = mkPrep "before"; lin beforehand_A = compoundA (mkA "beforehand"); lin beforehand_Adv = mkAdv "beforehand"; lin befoul_V2 = mkV2 (mkV "befoul" "befouls" "befouled" "befouled" "befouling"); @@ -3117,7 +3083,6 @@ lin behead_V2 = mkV2 (mkV "behead" "beheads" "beheaded" "beheaded" "beheading"); lin behest_N = mkN "behest" "behests"; lin behind_Adv = mkAdv "behind"; lin behind_N = mkN "behind" "behinds"; -lin behind_Prep = mkPrep "behind"; lin behindhand_A = compoundA (mkA "behindhand"); lin behold_V2 = mkV2 (mkV "be" IrregEng.hold_V); lin beholden_A = compoundA (mkA "beholden"); @@ -3199,7 +3164,6 @@ lin belong_V = mkV "belong" "belongs" "belonged" "belonged" "belonging"; lin beloved_A = compoundA (mkA "beloved"); lin beloved_N = mkN "beloved" "beloveds"; lin below_Adv = mkAdv "below"; -lin below_Prep = mkPrep "below"; lin belper_PN = mkPN "belper"; lin belt_N = mkN "belt" "belts"; lin belt_V2 = mkV2 (mkV "belt" "belts" "belted" "belted" "belting"); @@ -3213,7 +3177,6 @@ lin bend_N = mkN "bend" "bends"; lin bend_V = mkV "bend" "bends" "bended" "bended" "bending"; lin bend_V2 = mkV2 (mkV "bend" "bends" "bended" "bended" "bending"); lin beneath_Adv = mkAdv "beneath"; -lin beneath_Prep = mkPrep "beneath"; lin benedick_N = mkN "benedick" "benedicks"; lin benedictine_A = compoundA (mkA "benedictine"); lin benedictine_N = mkN "benedictine" "benedictines"; @@ -3292,9 +3255,7 @@ lin beseechingly_Adv = mkAdv "beseechingly"; lin beseem_V2 = mkV2 (mkV "beseem" "beseems" "beseemed" "beseemed" "beseeming"); lin beset_V2 = mkV2 (IrregEng.beset_V); lin beshrew_V2 = mkV2 (mkV "beshrew" "beshrews" "beshrewed" "beshrewed" "beshrewing"); -lin beside_Prep = mkPrep "beside"; lin besides_Adv = mkAdv "besides"; -lin besides_Prep = mkPrep "besides"; lin besiege_V2 = mkV2 (mkV "besiege" "besieges" "besieged" "besieged" "besieging"); lin besieger_N = mkN "besieger" "besiegers"; lin besmear_V2 = mkV2 (mkV "besmear" "besmears" "besmeared" "besmeared" "besmearing"); @@ -3346,9 +3307,7 @@ lin betterment_N = mkN "betterment" "-" {- FIXME: no plural form -}; lin bettor_N = mkN "bettor" "bettors"; lin betty_PN = mkPN "betty"; lin between_Adv = mkAdv "between"; -lin between_Prep = mkPrep "between"; lin betwixt_Adv = mkAdv "betwixt"; -lin betwixt_Prep = mkPrep "betwixt"; lin bevel_N = mkN "bevel" "bevels"; lin bevel_V2 = mkV2 (mkV "bevel" "bevels" "bevelled" "bevelled" "bevelling"); lin beverage_N = mkN "beverage" "beverages"; @@ -3368,7 +3327,6 @@ lin bexhill_PN = mkPN "bexhill"; lin bexley_PN = mkPN "bexley"; lin bey_N = mkN "bey" "beys"; lin beyond_Adv = mkAdv "beyond"; -lin beyond_Prep = mkPrep "beyond"; lin bezique_N = mkN "bezique" "-" {- FIXME: no plural form -}; lin bhang_N = mkN "bhang" "bhangs"; lin bhutan_PN = mkPN "bhutan"; @@ -4879,8 +4837,6 @@ lin busy_A = mkA "busy" "busier"; lin busy_V2 = mkV2 (mkV "busy" "busies" "busied" "busied" "busying"); lin busybody_N = mkN "busybody" "busybodies"; lin but_Adv = mkAdv "but"; -lin but_Conj = mkConj "but"; -lin but_Prep = mkPrep "but"; lin butane_N = mkN "butane" "-" {- FIXME: no plural form -}; lin butch_A = compoundA (mkA "butch"); lin butcher_N = mkN "butcher" "butchers"; @@ -4923,7 +4879,6 @@ lin buzzard_N = mkN "buzzard" "buzzards"; lin buzzer_N = mkN "buzzer" "buzzers"; lin bvm_N = mkN "bvm" "-" {- FIXME: no plural form -}; lin by_Adv = mkAdv "by"; -lin by_Prep = mkPrep "by"; lin by_election_N = mkN "by-election" "by-elections"; lin bye_N = mkN "bye" "byes"; lin bye_bye_N = mkN "bye-bye" "bye-byes"; @@ -6325,7 +6280,6 @@ lin cinquefoil_N = mkN "cinquefoil" "cinquefoils"; lin cipher_N = mkN "cipher" "ciphers"; lin cipher_V = mkV "cipher" "ciphers" "ciphered" "ciphered" "ciphering"; lin cipher_V2 = mkV2 (mkV "cipher" "ciphers" "ciphered" "ciphered" "ciphering"); -lin circa_Prep = mkPrep "circa"; lin circle_N = mkN "circle" "circles"; lin circle_V = mkV "circle" "circles" "circled" "circled" "circling"; lin circle_V2 = mkV2 (mkV "circle" "circles" "circled" "circled" "circling"); @@ -7310,7 +7264,6 @@ lin concern_N = mkN "concern" "concerns"; lin concern_V2 = mkV2 (mkV "concern" "concerns" "concerned" "concerned" "concerning"); lin concerned_A = compoundA (mkA "concerned"); lin concernedly_Adv = mkAdv "concernedly"; -lin concerning_Prep = mkPrep "concerning"; lin concert_N = mkN "concert" "concerts"; lin concert_V2 = mkV2 (mkV "concert" "concerts" "concerted" "concerted" "concerting"); lin concert_hall_N = mkN "concert-hall" "concert-halls"; @@ -7592,7 +7545,6 @@ lin considerate_A = compoundA (mkA "considerate"); lin considerately_Adv = mkAdv "considerately"; lin considerateness_N = mkN "considerateness" "-" {- FIXME: no plural form -}; lin consideration_N = mkN "consideration" "considerations"; -lin considering_Prep = mkPrep "considering"; lin consign_V2 = mkV2 (mkV "consign" "consigns" "consigned" "consigned" "consigning"); lin consignee_N = mkN "consignee" "consignees"; lin consigner_N = mkN "consigner" "consigners"; @@ -8120,7 +8072,6 @@ lin coruscate_V = mkV "coruscate" "coruscates" "coruscated" "coruscated" "corusc lin coruscation_N = mkN "coruscation" "coruscations"; lin corvette_N = mkN "corvette" "corvettes"; lin corvée_N = mkN "corvée" "corvées"; -lin cos_Conj = mkConj "cos"; lin cos_N = mkN "cos" "cos"; lin cosenza_PN = mkPN "cosenza"; lin cosh_N = mkN "cosh" "coshes"; @@ -9912,7 +9863,6 @@ lin despicable_A = compoundA (mkA "despicable"); lin despicably_Adv = mkAdv "despicably"; lin despise_V2 = mkV2 (mkV "despise" "despises" "despised" "despised" "despising"); lin despite_N = mkN "despite" "-" {- FIXME: no plural form -}; -lin despite_Prep = mkPrep "despite"; lin despiteful_A = compoundA (mkA "despiteful"); lin despitefully_Adv = mkAdv "despitefully"; lin despoil_V2 = mkV2 (mkV "despoil" "despoils" "despoiled" "despoiled" "despoiling"); @@ -10294,7 +10244,6 @@ lin direction_finder_N = mkN "direction-finder" "direction-finders"; lin directional_A = compoundA (mkA "directional"); lin directive_N = mkN "directive" "directives"; lin directly_Adv = mkAdv "directly"; -lin directly_Conj = mkConj "directly"; lin directness_N = mkN "directness" "-" {- FIXME: no plural form -}; lin director_N = mkN "director" "directors"; lin directorate_N = mkN "directorate" "directorates"; @@ -11100,7 +11049,6 @@ lin dower_V2 = mkV2 (mkV "dower" "dowers" "dowered" "dowered" "dowering"); lin down_Adv = mkAdv "down"; lin down_N = mkN "down" "downs"; lin down_PN = mkPN "down"; -lin down_Prep = mkPrep "down"; lin down_V2 = mkV2 (mkV "down" "downs" "downed" "downed" "downing"); lin down_and_out_N = mkN "down-and-out" "down-and-outs"; lin down_market_A = compoundA (mkA "down-market"); @@ -11492,7 +11440,6 @@ lin durban_PN = mkPN "durban"; lin durbar_N = mkN "durbar" "durbars"; lin duress_N = mkN "duress" "-" {- FIXME: no plural form -}; lin durham_PN = mkPN "durham"; -lin during_Prep = mkPrep "during"; lin durrington_PN = mkPN "durrington"; lin dursley_PN = mkPN "dursley"; lin dusk_N = mkN "dusk" "-" {- FIXME: no plural form -}; @@ -11855,7 +11802,6 @@ lin eindhoven_PN = mkPN "eindhoven"; lin eisteddfod_N = mkN "eisteddfod" "eisteddfods"; lin either_A = compoundA (mkA "either"); lin either_Adv = mkAdv "either"; -lin either_Conj = mkConj "either"; lin ejaculate_V2 = mkV2 (mkV "ejaculate" "ejaculates" "ejaculated" "ejaculated" "ejaculating"); lin ejaculation_N = mkN "ejaculation" "ejaculations"; lin eject_V = mkV "eject" "ejects" "ejected" "ejected" "ejecting"; @@ -12467,7 +12413,6 @@ lin erase_V2 = mkV2 (mkV "erase" "erases" "erased" "erased" "erasing"); lin eraser_N = mkN "eraser" "erasers"; lin erasure_N = mkN "erasure" "erasures"; lin ere_Adv = mkAdv "ere"; -lin ere_Prep = mkPrep "ere"; lin erect_A = compoundA (mkA "erect"); lin erect_V2 = mkV2 (mkV "erect" "erects" "erected" "erected" "erecting"); lin erectile_A = compoundA (mkA "erectile"); @@ -12764,10 +12709,7 @@ lin excellency_N = mkN "excellency" "excellencies"; lin excellent_A = compoundA (mkA "excellent"); lin excellently_Adv = mkAdv "excellently"; lin excelsior_N = mkN "excelsior" "-" {- FIXME: no plural form -}; -lin except_Conj = mkConj "except"; -lin except_Prep = mkPrep "except"; lin except_V2 = mkV2 (mkV "except" "excepts" "excepted" "excepted" "excepting"); -lin excepting_Prep = mkPrep "excepting"; lin exception_N = mkN "exception" "exceptions"; lin exceptionable_A = compoundA (mkA "exceptionable"); lin exceptional_A = compoundA (mkA "exceptional"); @@ -13183,7 +13125,6 @@ lin fail_V = mkV "fail" "fails" "failed" "failed" "failing"; lin fail_V2 = mkV2 (mkV "fail" "fails" "failed" "failed" "failing"); lin fail_safe_A = compoundA (mkA "fail-safe"); lin failing_N = mkN "failing" "failings"; -lin failing_Prep = mkPrep "failing"; lin failure_N = mkN "failure" "failures"; lin fain_Adv = mkAdv "fain"; lin faint_A = mkA "faint" "fainter"; @@ -14315,11 +14256,8 @@ lin footwear_N = mkN "footwear" "-" {- FIXME: no plural form -}; lin footwork_N = mkN "footwork" "-" {- FIXME: no plural form -}; lin fop_N = mkN "fop" "fops"; lin foppish_A = compoundA (mkA "foppish"); -lin for_Conj = mkConj "for"; -lin for_Prep = mkPrep "for"; lin forage_N = mkN "forage" "-" {- FIXME: no plural form -}; lin forage_V = mkV "forage" "forages" "foraged" "foraged" "foraging"; -lin forasmuch_as_Conj = mkConj "forasmuch as"; lin foray_N = mkN "foray" "forays"; lin foray_V = mkV "foray" "forays" "forayed" "forayed" "foraying"; lin forbear_N = mkN "forbear" "forbears"; @@ -14815,7 +14753,6 @@ lin frogmarch_V2 = mkV2 (mkV "frogmarch" "frogmarches" "frogmarched" "frogmarche lin frolic_N = mkN "frolic" "frolics"; lin frolic_V = mkV "frolic" "IRREG" "IRREG" "IRREG" "IRREG"; lin frolicsome_A = compoundA (mkA "frolicsome"); -lin from_Prep = mkPrep "from"; lin frome_PN = mkPN "frome"; lin frond_N = mkN "frond" "fronds"; lin front_N = mkN "front" "fronts"; @@ -17764,7 +17701,6 @@ lin hovercraft_N = mkN "hovercraft" "hovercraft"; lin how_Adv = mkAdv "how"; lin how_d'ye_do_N = mkN "how-d'ye-do" "how-d'ye-dos"; lin howard_PN = mkPN "howard"; -lin howbeit_Conj = mkConj "howbeit"; lin howdah_N = mkN "howdah" "howdahs"; lin however_Adv = mkAdv "however"; lin howitzer_N = mkN "howitzer" "howitzers"; @@ -18123,7 +18059,6 @@ lin idolize_V2 = mkV2 (mkV "idolize" "idolizes" "idolized" "idolized" "idolizing lin idyll_N = mkN "idyll" "idylls"; lin idyllic_A = compoundA (mkA "idyllic"); lin ie_PN = mkPN "ie"; -lin if_Conj = mkConj "if"; lin igloo_N = mkN "igloo" "igloos"; lin igneous_A = compoundA (mkA "igneous"); lin ignis_fatuus_N = mkN "ignis fatuus" "ignis fatui" {- FIXME: guessed plural form -}; @@ -18243,7 +18178,6 @@ lin immeasurably_Adv = mkAdv "immeasurably"; lin immediacy_N = mkN "immediacy" "-" {- FIXME: no plural form -}; lin immediate_A = compoundA (mkA "immediate"); lin immediately_Adv = mkAdv "immediately"; -lin immediately_Conj = mkConj "immediately"; lin immemorial_A = compoundA (mkA "immemorial"); lin immense_A = compoundA (mkA "immense"); lin immensely_Adv = mkAdv "immensely"; @@ -18489,7 +18423,6 @@ lin imputation_N = mkN "imputation" "imputations"; lin impute_V2 = mkV2 (mkV "impute" "imputes" "imputed" "imputed" "imputing"); lin in_Adv = mkAdv "in"; lin in_N = mkN "in" "ins"; -lin in_Prep = mkPrep "in"; lin in_chief_A = compoundA (mkA "in-chief"); lin in_fighting_N = mkN "in-fighting" "-" {- FIXME: no plural form -}; lin in_loco_parentis_Adv = mkAdv "in loco parentis"; @@ -19190,7 +19123,6 @@ lin inshore_Adv = mkAdv "inshore"; lin inside_A = compoundA (mkA "inside"); lin inside_Adv = mkAdv "inside"; lin inside_N = mkN "inside" "insides"; -lin inside_Prep = mkPrep "inside"; lin insider_N = mkN "insider" "insiders"; lin insidious_A = compoundA (mkA "insidious"); lin insidiously_Adv = mkAdv "insidiously"; @@ -19249,7 +19181,6 @@ lin instant_N = mkN "instant" "instants"; lin instantaneous_A = compoundA (mkA "instantaneous"); lin instantaneously_Adv = mkAdv "instantaneously"; lin instantly_Adv = mkAdv "instantly"; -lin instantly_Conj = mkConj "instantly"; lin instead_Adv = mkAdv "instead"; lin instep_N = mkN "instep" "insteps"; lin instigate_V2 = mkV2 (mkV "instigate" "instigates" "instigated" "instigated" "instigating"); @@ -19507,7 +19438,6 @@ lin intimately_Adv = mkAdv "intimately"; lin intimation_N = mkN "intimation" "intimations"; lin intimidate_V2 = mkV2 (mkV "intimidate" "intimidates" "intimidated" "intimidated" "intimidating"); lin intimidation_N = mkN "intimidation" "-" {- FIXME: no plural form -}; -lin into_Prep = mkPrep "into"; lin intolerable_A = compoundA (mkA "intolerable"); lin intolerably_Adv = mkAdv "intolerably"; lin intolerance_N = mkN "intolerance" "-" {- FIXME: no plural form -}; @@ -21232,14 +21162,12 @@ lin lesotho_PN = mkPN "lesotho"; lin less_A = compoundA (mkA "less"); lin less_Adv = mkAdv "less"; lin less_N = mkN "less" "-" {- FIXME: no plural form -}; -lin less_Prep = mkPrep "less"; lin lessee_N = mkN "lessee" "lessees"; lin lessen_V = mkV "lessen" "lessens" "lessened" "lessened" "lessening"; lin lessen_V2 = mkV2 (mkV "lessen" "lessens" "lessened" "lessened" "lessening"); lin lesser_A = compoundA (mkA "lesser"); lin lesson_N = mkN "lesson" "lessons"; lin lessor_N = mkN "lessor" "lessors"; -lin lest_Conj = mkConj "lest"; lin let_N = mkN "let" "lets"; lin let_V = IrregEng.let_V; lin let_V2 = mkV2 (IrregEng.let_V); @@ -21454,9 +21382,7 @@ lin lignite_N = mkN "lignite" "-" {- FIXME: no plural form -}; lin likable_A = compoundA (mkA "likable"); lin like_A = compoundA (mkA "like"); lin like_Adv = mkAdv "like"; -lin like_Conj = mkConj "like"; lin like_N = mkN "like" "likes"; -lin like_Prep = mkPrep "like"; lin like_V2 = mkV2 (mkV "like" "likes" "liked" "liked" "liking"); lin like_minded_A = compoundA (mkA "like-minded"); lin likeable_A = compoundA (mkA "likeable"); @@ -21466,7 +21392,6 @@ lin likely_Adv = mkAdv "likely"; lin liken_V2 = mkV2 (mkV "liken" "likens" "likened" "likened" "likening"); lin likeness_N = mkN "likeness" "likenesses"; lin likewise_Adv = mkAdv "likewise"; -lin likewise_Conj = mkConj "likewise"; lin liking_N = mkN "liking" "likings"; lin lilac_N = mkN "lilac" "lilacs"; lin lilian_PN = mkPN "lilian"; @@ -23334,7 +23259,6 @@ lin microscopically_Adv = mkAdv "microscopically"; lin microscopy_N = mkN "microscopy" "-" {- FIXME: no plural form -}; lin microwave_N = mkN "microwave" "microwaves"; lin mid_A = compoundA (mkA "mid"); -lin mid_Prep = mkPrep "mid"; lin mid_off_N = mkN "mid-off" "mid-ofves" {- FIXME: guessed plural form -}; lin mid_on_N = mkN "mid-on" "mid-a" {- FIXME: guessed plural form -}; lin midday_N = mkN "midday" "-" {- FIXME: no plural form -}; @@ -23367,7 +23291,6 @@ lin midriff_N = mkN "midriff" "midriffs"; lin midshipman_N = mkN "midshipman" "midshipmen" {- FIXME: guessed plural form -}; lin midships_Adv = mkAdv "midships"; lin midst_N = mkN "midst" "IRREG"; -lin midst_Prep = mkPrep "midst"; lin midstream_N = mkN "midstream" "-" {- FIXME: no plural form -}; lin midsummer_N = mkN "midsummer" "-" {- FIXME: no plural form -}; lin midway_A = compoundA (mkA "midway"); @@ -23584,7 +23507,6 @@ lin mint_V2 = mkV2 (mkV "mint" "mints" "minted" "minted" "minting"); lin minuet_N = mkN "minuet" "minuets"; lin minus_A = compoundA (mkA "minus"); lin minus_N = mkN "minus" "minuses"; -lin minus_Prep = mkPrep "minus"; lin minuscule_A = compoundA (mkA "minuscule"); lin minute_A = mkA "minute" "minuter"; lin minute_N = mkN "minute" "minutes"; @@ -24668,7 +24590,6 @@ lin neapolitan_A = compoundA (mkA "neapolitan"); lin neapolitan_N = mkN "neapolitan" "neapolitans"; lin near_A = mkA "near" "nearer"; lin near_Adv = mkAdv "near"; -lin near_Prep = mkPrep "near"; lin near_V = mkV "near" "nears" "neared" "neared" "nearing"; lin near_V2 = mkV2 (mkV "near" "nears" "neared" "neared" "nearing"); lin near_sighted_A = compoundA (mkA "near-sighted"); @@ -24680,7 +24601,6 @@ lin nearness_N = mkN "nearness" "-" {- FIXME: no plural form -}; lin nearside_N = mkN "nearside" "nearsides"; lin neat_A = mkA "neat" "neater"; lin neath_PN = mkPN "neath"; -lin neath_Prep = mkPrep "'neath"; lin neatly_Adv = mkAdv "neatly"; lin neatness_N = mkN "neatness" "-" {- FIXME: no plural form -}; lin nebraska_PN = mkPN "nebraska"; @@ -24763,7 +24683,6 @@ lin neighbourly_A = compoundA (mkA "neighbourly"); lin neil_PN = mkPN "neil"; lin neither_A = compoundA (mkA "neither"); lin neither_Adv = mkAdv "neither"; -lin neither_Conj = mkConj "neither"; lin nell_PN = mkPN "nell"; lin nelly_N = mkN "nelly" "IRREG"; lin nelly_PN = mkPN "nelly"; @@ -24851,7 +24770,6 @@ lin nevada_PN = mkPN "nevada"; lin never_Adv = mkAdv "never"; lin nevermore_Adv = mkAdv "nevermore"; lin nevertheless_Adv = mkAdv "nevertheless"; -lin nevertheless_Conj = mkConj "nevertheless"; lin neville_PN = mkPN "neville"; lin new_A = mkA "new" "newer"; lin new_Adv = mkAdv "new"; @@ -24915,7 +24833,6 @@ lin newtown_PN = mkPN "newtown"; lin next_A = compoundA (mkA "next"); lin next_Adv = mkAdv "next"; lin next_N = mkN "next" "next"; -lin next_Prep = mkPrep "next"; lin nexus_N = mkN "nexus" "nexuses"; lin nhs_N = mkN "nhs" "-" {- FIXME: no plural form -}; lin nib_N = mkN "nib" "nibs"; @@ -24961,11 +24878,8 @@ lin nigger_N = mkN "nigger" "niggers"; lin niggle_V = mkV "niggle" "niggles" "niggled" "niggled" "niggling"; lin niggling_A = compoundA (mkA "niggling"); lin nigh_Adv = mkAdv "nigh"; -lin nigh_Prep = mkPrep "nigh"; lin nigher_Adv = mkAdv "nigher"; -lin nigher_Prep = mkPrep "nigher"; lin nighest_Adv = mkAdv "nighest"; -lin nighest_Prep = mkPrep "nighest"; lin night_N = mkN "night" "nights"; lin night_bell_N = mkN "night-bell" "night-bells"; lin night_bird_N = mkN "night-bird" "night-birds"; @@ -25035,7 +24949,6 @@ lin nipponese_A = compoundA (mkA "nipponese"); lin nippy_A = mkA "nippy" "nippier"; lin nirvana_N = mkN "nirvana" "nirvanas"; lin nisi_A = compoundA (mkA "nisi"); -lin nisi_Conj = mkConj "nisi"; lin nissen_PN = mkPN "nissen"; lin nit_N = mkN "nit" "nits"; lin nitrate_N = mkN "nitrate" "nitrates"; @@ -25168,7 +25081,6 @@ lin nor'_nor'_west_Adv = mkAdv "nor'-nor'-west"; lin nor'_nor'_west_N = mkN "nor'-nor'-west" "-" {- FIXME: no plural form -}; lin nor'_west_Adv = mkAdv "nor'-west"; lin nor'_west_N = mkN "nor'-west" "-" {- FIXME: no plural form -}; -lin nor_Conj = mkConj "nor"; lin nora_PN = mkPN "nora"; lin nordic_A = compoundA (mkA "nordic"); lin nordic_N = mkN "nordic" "nordics"; @@ -25284,8 +25196,6 @@ lin notoriously_Adv = mkAdv "notoriously"; lin nottingham_PN = mkPN "nottingham"; lin nottinghamshire_PN = mkPN "nottinghamshire"; lin notwithstanding_Adv = mkAdv "notwithstanding"; -lin notwithstanding_Conj = mkConj "notwithstanding"; -lin notwithstanding_Prep = mkPrep "notwithstanding"; lin nougat_N = mkN "nougat" "nougats"; lin nought_N = mkN "nought" "noughts"; lin noun_N = mkN "noun" "nouns"; @@ -25310,7 +25220,6 @@ lin novitiate_N = mkN "novitiate" "novitiates"; lin novokuznetsk_PN = mkPN "novokuznetsk"; lin novosibirsk_PN = mkPN "novosibirsk"; lin now_Adv = mkAdv "now"; -lin now_Conj = mkConj "now"; lin nowadays_Adv = mkAdv "nowadays"; lin nowhere_Adv = mkAdv "nowhere"; lin nowise_Adv = mkAdv "nowise"; @@ -25410,7 +25319,6 @@ lin nymphomaniac_N = mkN "nymphomaniac" "nymphomaniacs"; lin née_A = compoundA (mkA "née"); lin négligé_N = mkN "négligé" "négligés"; lin o'er_Adv = mkAdv "o'er"; -lin o'er_Prep = mkPrep "o'er"; lin o_N = mkN "o" "i" {- FIXME: guessed plural form -}; lin o_level_N = mkN "o-level" "o-levels"; lin oaf_N = mkN "oaf" "oafs"; @@ -25618,10 +25526,8 @@ lin oecumenical_A = compoundA (mkA "oecumenical"); lin oed_N = mkN "oed" "-" {- FIXME: no plural form -}; lin oedipus_PN = mkPN "oedipus"; lin oesophagus_N = mkN "oesophagus" "oesophaguses"; -lin of_Prep = mkPrep "of"; lin off_A = compoundA (mkA "off"); lin off_Adv = mkAdv "off"; -lin off_Prep = mkPrep "off"; lin off_day_N = mkN "off-day" "off-days"; lin off_licence_N = mkN "off-licence" "off-licences"; lin off_peak_A = compoundA (mkA "off-peak"); @@ -25776,9 +25682,7 @@ lin omniscient_A = compoundA (mkA "omniscient"); lin omnivorous_A = compoundA (mkA "omnivorous"); lin omsk_PN = mkPN "omsk"; lin on_Adv = mkAdv "on"; -lin on_Prep = mkPrep "on"; lin on_licence_N = mkN "on-licence" "on-licences"; -lin on_to_Prep = mkPrep "on to"; lin once_Adv = mkAdv "once"; lin oncoming_A = compoundA (mkA "oncoming"); lin oncoming_N = mkN "oncoming" "IRREG"; @@ -25801,7 +25705,6 @@ lin onion_N = mkN "onion" "onions"; lin onlooker_N = mkN "onlooker" "onlookers"; lin only_A = compoundA (mkA "only"); lin only_Adv = mkAdv "only"; -lin only_Conj = mkConj "only"; lin onomatopoeia_N = mkN "onomatopoeia" "-" {- FIXME: no plural form -}; lin onrush_N = mkN "onrush" "onrushes"; lin onset_N = mkN "onset" "onsets"; @@ -25809,7 +25712,6 @@ lin onshore_A = compoundA (mkA "onshore"); lin onshore_Adv = mkAdv "onshore"; lin onslaught_N = mkN "onslaught" "onslaughts"; lin ontario_PN = mkPN "ontario"; -lin onto_Prep = mkPrep "onto"; lin ontology_N = mkN "ontology" "ontologies"; lin onus_N = mkN "onus" "oni" {- FIXME: guessed plural form -}; lin onward_A = compoundA (mkA "onward"); @@ -25918,7 +25820,6 @@ lin opulence_N = mkN "opulence" "-" {- FIXME: no plural form -}; lin opulent_A = compoundA (mkA "opulent"); lin opulently_Adv = mkAdv "opulently"; lin opus_N = mkN "opus" "opi" {- FIXME: guessed plural form -}; -lin or_Conj = mkConj "or"; lin oracle_N = mkN "oracle" "oracles"; lin oracular_A = compoundA (mkA "oracular"); lin oral_A = compoundA (mkA "oral"); @@ -26082,7 +25983,6 @@ lin other_A = compoundA (mkA "other"); lin other_Adv = mkAdv "other"; lin other_N = mkN "other" "others"; lin otherwise_Adv = mkAdv "otherwise"; -lin otherwise_Conj = mkConj "otherwise"; lin otherworldly_A = compoundA (mkA "otherworldly"); lin otiose_A = compoundA (mkA "otiose"); lin otley_PN = mkPN "otley"; @@ -26198,7 +26098,6 @@ lin outshine_V2 = mkV2 (mkV "out" IrregEng.shine_V); lin outside_A = compoundA (mkA "outside"); lin outside_Adv = mkAdv "outside"; lin outside_N = mkN "outside" "outsides"; -lin outside_Prep = mkPrep "outside"; lin outsider_N = mkN "outsider" "outsiders"; lin outsize_A = compoundA (mkA "outsize"); lin outsmart_V2 = mkV2 (mkV "outsmart" "outsmarts" "outsmarted" "outsmarted" "outsmarting"); @@ -26234,7 +26133,6 @@ lin oven_N = mkN "oven" "ovens"; lin ovenware_N = mkN "ovenware" "-" {- FIXME: no plural form -}; lin over_Adv = mkAdv "over"; lin over_N = mkN "over" "overs"; -lin over_Prep = mkPrep "over"; lin over_abundance_N = mkN "over-abundance" "-" {- FIXME: no plural form -}; lin over_ripe_A = compoundA (mkA "over-ripe"); lin overabundant_A = compoundA (mkA "overabundant"); @@ -26982,7 +26880,6 @@ lin pass lin past_A = compoundA (mkA "past"); lin past_Adv = mkAdv "past"; lin past_N = mkN "past" "pasts"; -lin past_Prep = mkPrep "past"; lin pasta_N = mkN "pasta" "-" {- FIXME: no plural form -}; lin paste_N = mkN "paste" "pastes"; lin paste_V2 = mkV2 (mkV "paste" "pastes" "pasted" "pasted" "pasting"); @@ -27326,7 +27223,6 @@ lin pencil_V2 = mkV2 (mkV "pencil" "pencils" "pencilled" "pencilled" "pencilling lin pendant_N = mkN "pendant" "pendants"; lin pendent_A = compoundA (mkA "pendent"); lin pending_A = compoundA (mkA "pending"); -lin pending_Prep = mkPrep "pending"; lin pendlebury_PN = mkPN "pendlebury"; lin pendulous_A = compoundA (mkA "pendulous"); lin pendulum_N = mkN "pendulum" "pendulums"; @@ -27411,7 +27307,6 @@ lin peppermint_N = mkN "peppermint" "peppermints"; lin peppery_A = compoundA (mkA "peppery"); lin pepsin_N = mkN "pepsin" "-" {- FIXME: no plural form -}; lin peptic_A = compoundA (mkA "peptic"); -lin per_Prep = mkPrep "per"; lin peradventure_Adv = mkAdv "peradventure"; lin perambulate_V = mkV "perambulate" "perambulates" "perambulated" "perambulated" "perambulating"; lin perambulate_V2 = mkV2 (mkV "perambulate" "perambulates" "perambulated" "perambulated" "perambulating"); @@ -28414,7 +28309,6 @@ lin pluralist_N = mkN "pluralist" "pluralists"; lin plurality_N = mkN "plurality" "pluralities"; lin plus_A = compoundA (mkA "plus"); lin plus_N = mkN "plus" "pluses"; -lin plus_Prep = mkPrep "plus"; lin plush_A = mkA "plush" "plusher"; lin plush_N = mkN "plush" "-" {- FIXME: no plural form -}; lin plushy_A = mkA "plushy" "plushier"; @@ -29754,7 +29648,6 @@ lin proverbial_A = compoundA (mkA "proverbial"); lin proverbially_Adv = mkAdv "proverbially"; lin provide_V = mkV "provide" "provides" "provided" "provided" "providing"; lin provide_V2 = mkV2 (mkV "provide" "provides" "provided" "provided" "providing"); -lin provided_Conj = mkConj "provided"; lin providence_N = mkN "providence" "-" {- FIXME: no plural form -}; lin providence_PN = mkPN "providence"; lin provident_A = compoundA (mkA "provident"); @@ -29762,7 +29655,6 @@ lin providential_A = compoundA (mkA "providential"); lin providentially_Adv = mkAdv "providentially"; lin providently_Adv = mkAdv "providently"; lin provider_N = mkN "provider" "providers"; -lin providing_Conj = mkConj "providing"; lin province_N = mkN "province" "provinces"; lin provincial_A = compoundA (mkA "provincial"); lin provincial_N = mkN "provincial" "provincials"; @@ -30150,8 +30042,6 @@ lin qatari_N = mkN "qatari" "qataris"; lin qc_N = mkN "qc" "-" {- FIXME: no plural form -}; lin qed_PN = mkPN "qed"; lin qt_N = mkN "qt" "qt"; -lin qua_Conj = mkConj "qua"; -lin qua_Prep = mkPrep "qua"; lin quack_N = mkN "quack" "quacks"; lin quack_V = mkV "quack" "quacks" "quacked" "quacked" "quacking"; lin quack_quack_N = mkN "quack-quack" "quack-quacks"; @@ -30740,7 +30630,6 @@ lin razzle_dazzle_N = mkN "razzle-dazzle" "IRREG"; lin rc_PN = mkPN "rc"; lin rd_PN = mkPN "rd"; lin re_N = mkN "re" "IRREG"; -lin re_Prep = mkPrep "re"; lin re_address_V2 = mkV2 (mkV "re-address" "re-addresses" "re-addressed" "re-addressed" "re-addressing"); lin re_afforest_V2 = mkV2 (mkV "re-afforest" "re-afforests" "re-afforested" "re-afforested" "re-afforesting"); lin re_afforestation_N = mkN "re-afforestation" "re-afforestations"; @@ -31686,7 +31575,6 @@ lin respectably_Adv = mkAdv "respectably"; lin respecter_N = mkN "respecter" "respecters"; lin respectful_A = compoundA (mkA "respectful"); lin respectfully_Adv = mkAdv "respectfully"; -lin respecting_Prep = mkPrep "respecting"; lin respective_A = compoundA (mkA "respective"); lin respectively_Adv = mkAdv "respectively"; lin respiration_N = mkN "respiration" "respirations"; @@ -32462,7 +32350,6 @@ lin roulette_N = mkN "roulette" "-" {- FIXME: no plural form -}; lin round_A = mkA "round" "rounder"; lin round_Adv = mkAdv "round"; lin round_N = mkN "round" "rounds"; -lin round_Prep = mkPrep "round"; lin round_V = mkV "round" "rounds" "rounded" "rounded" "rounding"; lin round_V2 = mkV2 (mkV "round" "rounds" "rounded" "rounded" "rounding"); lin round_arm_A = compoundA (mkA "round-arm"); @@ -32988,7 +32875,6 @@ lin sanguine_A = compoundA (mkA "sanguine"); lin sanitary_A = compoundA (mkA "sanitary"); lin sanitation_N = mkN "sanitation" "-" {- FIXME: no plural form -}; lin sanity_N = mkN "sanity" "-" {- FIXME: no plural form -}; -lin sans_Prep = mkPrep "sans"; lin sanskrit_N = mkN "sanskrit" "-" {- FIXME: no plural form -}; lin santa_claus_N = mkN "santa claus" "santa clauses"; lin santa_claus_PN = mkPN "santa claus"; @@ -33111,14 +32997,12 @@ lin savanna_N = mkN "savanna" "savannas"; lin savannah_N = mkN "savannah" "savannahs"; lin savant_N = mkN "savant" "savants"; lin save_N = mkN "save" "saves"; -lin save_Prep = mkPrep "save"; lin save_V = mkV "save" "saves" "saved" "saved" "saving"; lin save_V2 = mkV2 (mkV "save" "saves" "saved" "saved" "saving"); lin saveloy_N = mkN "saveloy" "saveloys"; lin saver_N = mkN "saver" "savers"; lin saving_A = compoundA (mkA "saving"); lin saving_N = mkN "saving" "savings"; -lin saving_Prep = mkPrep "saving"; lin savings_bank_N = mkN "savings-bank" "savings-banks"; lin saviour_N = mkN "saviour" "saviours"; lin savoir_faire_N = mkN "savoir-faire" "-" {- FIXME: no plural form -}; @@ -34802,8 +34686,6 @@ lin simultaneousness_N = mkN "simultaneousness" "-" {- FIXME: no plural form -}; lin sin_N = mkN "sin" "sins"; lin sin_V = mkV "sin" "sins" "sinned" "sinned" "sinning"; lin since_Adv = mkAdv "since"; -lin since_Conj = mkConj "since"; -lin since_Prep = mkPrep "since"; lin sincere_A = compoundA (mkA "sincere"); lin sincerely_Adv = mkAdv "sincerely"; lin sincerity_N = mkN "sincerity" "-" {- FIXME: no plural form -}; @@ -35579,7 +35461,6 @@ lin snuggle_V2 = mkV2 (mkV "snuggle" "snuggles" "snuggled" "snuggled" "snuggling lin snugly_Adv = mkAdv "snugly"; lin snugness_N = mkN "snugness" "-" {- FIXME: no plural form -}; lin so_Adv = mkAdv "so"; -lin so_Conj = mkConj "so"; lin so_N = mkN "so" "si" {- FIXME: guessed plural form -}; lin so_and_so_N = mkN "so-and-so" "so-and-sos"; lin so_called_A = compoundA (mkA "so-called"); @@ -37802,7 +37683,6 @@ lin supporter_N = mkN "supporter" "supporters"; lin suppose_V2 = mkV2 (mkV "suppose" "supposes" "supposed" "supposed" "supposing"); lin supposed_A = compoundA (mkA "supposed"); lin supposedly_Adv = mkAdv "supposedly"; -lin supposing_Conj = mkConj "supposing"; lin supposition_N = mkN "supposition" "suppositions"; lin suppository_N = mkN "suppository" "suppositories"; lin suppress_V2 = mkV2 (mkV "suppress" "suppresses" "suppressed" "suppressed" "suppressing"); @@ -38897,7 +38777,6 @@ lin thai_N = mkN "thai" "thais"; lin thailand_PN = mkPN "thailand"; lin thalidomide_N = mkN "thalidomide" "-" {- FIXME: no plural form -}; lin thame_PN = mkPN "thame"; -lin than_Conj = mkConj "than"; lin thane_N = mkN "thane" "thanes"; lin thank_V2 = mkV2 (mkV "thank" "thanks" "thanked" "thanked" "thanking"); lin thank_offering_N = mkN "thank-offering" "thank-offerings"; @@ -38908,7 +38787,6 @@ lin thankless_A = compoundA (mkA "thankless"); lin thanksgiving_N = mkN "thanksgiving" "thanksgivings"; lin that_A = compoundA (mkA "that"); lin that_Adv = mkAdv "that"; -lin that_Conj = mkConj "that"; lin thatch_N = mkN "thatch" "-" {- FIXME: no plural form -}; lin thatch_V2 = mkV2 (mkV "thatch" "thatches" "thatched" "thatched" "thatching"); lin thatcham_PN = mkPN "thatcham"; @@ -39067,7 +38945,6 @@ lin thistle_N = mkN "thistle" "thistles"; lin thistledown_N = mkN "thistledown" "-" {- FIXME: no plural form -}; lin thither_Adv = mkAdv "thither"; lin tho'_Adv = mkAdv "tho'"; -lin tho'_Conj = mkConj "tho'"; lin thole_N = mkN "thole" "tholes"; lin tholepin_N = mkN "tholepin" "tholepins"; lin thomas_PN = mkPN "thomas"; @@ -39086,7 +38963,6 @@ lin thoroughly_Adv = mkAdv "thoroughly"; lin thoroughness_N = mkN "thoroughness" "-" {- FIXME: no plural form -}; lin those_A = compoundA (mkA "those"); lin though_Adv = mkAdv "though"; -lin though_Conj = mkConj "though"; lin thought_N = mkN "thought" "thoughts"; lin thought_reader_N = mkN "thought-reader" "thought-readers"; lin thoughtful_A = compoundA (mkA "thoughtful"); @@ -39158,7 +39034,6 @@ lin thrill_V = mkV "thrill" "thrills" "thrilled" "thrilled" "thrilling"; lin thrill_V2 = mkV2 (mkV "thrill" "thrills" "thrilled" "thrilled" "thrilling"); lin thriller_N = mkN "thriller" "thrillers"; lin thrive_V = mkV "thrive" "thrives" "thrived" "thrived" "thriving"; -lin thro'_Prep = mkPrep "thro'"; lin throat_N = mkN "throat" "throats"; lin throated_A = compoundA (mkA "throated"); lin throaty_A = mkA "throaty" "throatier"; @@ -39177,9 +39052,7 @@ lin throttle_V = mkV "throttle" "throttles" "throttled" "throttled" "throttling" lin throttle_V2 = mkV2 (mkV "throttle" "throttles" "throttled" "throttled" "throttling"); lin throttle_valve_N = mkN "throttle-valve" "throttle-valves"; lin through_Adv = mkAdv "through"; -lin through_Prep = mkPrep "through"; lin throughout_Adv = mkAdv "throughout"; -lin throughout_Prep = mkPrep "throughout"; lin throughput_N = mkN "throughput" "throughputs"; lin throughway_N = mkN "throughway" "throughways"; lin throw_N = mkN "throw" "throws"; @@ -39188,7 +39061,6 @@ lin throw_V2 = mkV2 (IrregEng.throw_V); lin throw_in_N = mkN "throw-in" "throw-ins"; lin throwaway_N = mkN "throwaway" "throwaways"; lin throwback_N = mkN "throwback" "throwbacks"; -lin thru_Prep = mkPrep "thru"; lin thrum_V = mkV "thrum" "thrums" "thrummed" "thrummed" "thrumming"; lin thrum_V2 = mkV2 (mkV "thrum" "thrums" "thrummed" "thrummed" "thrumming"); lin thrush_N = mkN "thrush" "thrushes"; @@ -39300,9 +39172,7 @@ lin tilbury_PN = mkPN "tilbury"; lin tilde_N = mkN "tilde" "tildes"; lin tile_N = mkN "tile" "tiles"; lin tile_V2 = mkV2 (mkV "tile" "tiles" "tiled" "tiled" "tiling"); -lin till_Conj = mkConj "till"; lin till_N = mkN "till" "tills"; -lin till_Prep = mkPrep "till"; lin till_V2 = mkV2 (mkV "till" "tills" "tilled" "tilled" "tilling"); lin tillage_N = mkN "tillage" "-" {- FIXME: no plural form -}; lin tiller_N = mkN "tiller" "tillers"; @@ -39447,7 +39317,6 @@ lin tiverton_PN = mkPN "tiverton"; lin tizzy_N = mkN "tizzy" "tizzies"; lin tnt_N = mkN "tnt" "-" {- FIXME: no plural form -}; lin to_Adv = mkAdv "to"; -lin to_Prep = mkPrep "to"; lin to_do_N = mkN "to-do" "to-dos"; lin toad_N = mkN "toad" "toads"; lin toad_in_the_hole_N = mkN "toad-in-the-hole" "IRREG"; @@ -39706,7 +39575,6 @@ lin touched_A = compoundA (mkA "touched"); lin touchily_Adv = mkAdv "touchily"; lin touchiness_N = mkN "touchiness" "-" {- FIXME: no plural form -}; lin touching_A = compoundA (mkA "touching"); -lin touching_Prep = mkPrep "touching"; lin touchingly_Adv = mkAdv "touchingly"; lin touchline_N = mkN "touchline" "touchlines"; lin touchstone_N = mkN "touchstone" "touchstones"; @@ -39740,8 +39608,6 @@ lin tout_ensemble_Adv = mkAdv "tout ensemble"; lin tout_ensemble_N = mkN "tout ensemble" "IRREG"; lin tow_N = mkN "tow" "tows"; lin tow_V2 = mkV2 (mkV "tow" "tows" "towed" "towed" "towing"); -lin toward_Prep = mkPrep "toward"; -lin towards_Prep = mkPrep "towards"; lin towel_N = mkN "towel" "towels"; lin towel_V2 = mkV2 (mkV "towel" "towels" "towelled" "towelled" "towelling"); lin towel_horse_N = mkN "towel-horse" "towel-horses"; @@ -40479,7 +40345,6 @@ lin tweak_V2 = mkV2 (mkV "tweak" "tweaks" "tweaked" "tweaked" "tweaking"); lin twee_A = compoundA (mkA "twee"); lin tweed_N = mkN "tweed" "tweeds"; lin tween_Adv = mkAdv "'tween"; -lin tween_Prep = mkPrep "'tween"; lin tween_decks_Adv = mkAdv "'tween-decks"; lin tweet_N = mkN "tweet" "tweets"; lin tweet_V = mkV "tweet" "tweets" "tweeted" "tweeted" "tweeting"; @@ -40534,7 +40399,6 @@ lin twitch_V = mkV "twitch" "twitches" "twitched" "twitched" "twitching"; lin twitch_V2 = mkV2 (mkV "twitch" "twitches" "twitched" "twitched" "twitching"); lin twitter_N = mkN "twitter" "twitters"; lin twitter_V = mkV "twitter" "twitters" "twittered" "twittered" "twittering"; -lin twixt_Prep = mkPrep "'twixt"; lin two_A = compoundA (mkA "two"); lin two_N = mkN "two" "twos"; lin two_a_penny_A = compoundA (mkA "two-a-penny"); @@ -40895,7 +40759,6 @@ lin undeniable_A = compoundA (mkA "undeniable"); lin undeniably_Adv = mkAdv "undeniably"; lin undenominational_A = compoundA (mkA "undenominational"); lin under_Adv = mkAdv "under"; -lin under_Prep = mkPrep "under"; lin under_the_counter_A = compoundA (mkA "under-the-counter"); lin underact_V = mkV "underact" "underacts" "underacted" "underacted" "underacting"; lin underact_V2 = mkV2 (mkV "underact" "underacts" "underacted" "underacted" "underacting"); @@ -40948,7 +40811,6 @@ lin undermanned_A = compoundA (mkA "undermanned"); lin undermentioned_A = compoundA (mkA "undermentioned"); lin undermine_V2 = mkV2 (mkV "undermine" "undermines" "undermined" "undermined" "undermining"); lin underneath_Adv = mkAdv "underneath"; -lin underneath_Prep = mkPrep "underneath"; lin undernourished_A = compoundA (mkA "undernourished"); lin undernourishment_N = mkN "undernourishment" "-" {- FIXME: no plural form -}; lin underpass_N = mkN "underpass" "underpasses"; @@ -41327,13 +41189,11 @@ lin unlawfully_Adv = mkAdv "unlawfully"; lin unlearn_V2 = mkV2 (mkV "unlearn" "unlearns" "unlearned" "unlearned" "unlearning"); lin unleash_V2 = mkV2 (mkV "unleash" "unleashes" "unleashed" "unleashed" "unleashing"); lin unleavened_A = compoundA (mkA "unleavened"); -lin unless_Conj = mkConj "unless"; lin unlettered_A = compoundA (mkA "unlettered"); lin unlicensed_A = compoundA (mkA "unlicensed"); lin unlighted_A = compoundA (mkA "unlighted"); lin unlikable_A = compoundA (mkA "unlikable"); lin unlike_A = compoundA (mkA "unlike"); -lin unlike_Prep = mkPrep "unlike"; lin unlikely_A = compoundA (mkA "unlikely"); lin unlimited_A = compoundA (mkA "unlimited"); lin unlined_A = compoundA (mkA "unlined"); @@ -41689,12 +41549,9 @@ lin untidiness_N = mkN "untidiness" "-" {- FIXME: no plural form -}; lin untidy_A = mkA "untidy" "untidier"; lin untie_V = mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG"; lin untie_V2 = mkV2 (mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG"); -lin until_Conj = mkConj "until"; -lin until_Prep = mkPrep "until"; lin untimely_A = compoundA (mkA "untimely"); lin untiring_A = compoundA (mkA "untiring"); lin untitled_A = compoundA (mkA "untitled"); -lin unto_Prep = mkPrep "unto"; lin untold_A = compoundA (mkA "untold"); lin untouchable_A = compoundA (mkA "untouchable"); lin untouchable_N = mkN "untouchable" "untouchables"; @@ -41774,7 +41631,6 @@ lin unwritten_A = compoundA (mkA "unwritten"); lin unyielding_A = compoundA (mkA "unyielding"); lin unzip_V2 = mkV2 (mkV "unzip" "unzips" "unzipped" "unzipped" "unzipping"); lin up_Adv = mkAdv "up"; -lin up_Prep = mkPrep "up"; lin up_V = mkV "up" "ups" "upped" "upped" "upping"; lin up_V2 = mkV2 (mkV "up" "ups" "upped" "upped" "upping"); lin up_and_coming_A = compoundA (mkA "up-and-coming"); @@ -41803,7 +41659,6 @@ lin upland_N = mkN "upland" "uplands"; lin uplift_N = mkN "uplift" "-" {- FIXME: no plural form -}; lin uplift_V2 = mkV2 (mkV "uplift" "uplifts" "uplifted" "uplifted" "uplifting"); lin upmost_A = compoundA (mkA "upmost"); -lin upon_Prep = mkPrep "upon"; lin upper_A = compoundA (mkA "upper"); lin upper_N = mkN "upper" "uppers"; lin uppercut_N = mkN "uppercut" "uppercuts"; @@ -42217,7 +42072,6 @@ lin versify_V = mkV "versify" "versifies" "versified" "versified" "versifying"; lin versify_V2 = mkV2 (mkV "versify" "versifies" "versified" "versified" "versifying"); lin version_N = mkN "version" "versions"; lin verso_N = mkN "verso" "versos"; -lin versus_Prep = mkPrep "versus"; lin vertebra_N = mkN "vertebra" "vertebrae" {- FIXME: guessed plural form -}; lin vertebrate_A = compoundA (mkA "vertebrate"); lin vertebrate_N = mkN "vertebrate" "vertebrates"; @@ -42257,7 +42111,6 @@ lin vex_V2 = mkV2 (mkV "vex" "vexes" "vexed" "vexed" "vexing"); lin vexation_N = mkN "vexation" "vexations"; lin vexatious_A = compoundA (mkA "vexatious"); lin vhf_PN = mkPN "vhf"; -lin via_Prep = mkPrep "via"; lin via_media_N = mkN "via media" "via mediae" {- FIXME: guessed plural form -}; lin viability_N = mkN "viability" "-" {- FIXME: no plural form -}; lin viable_A = compoundA (mkA "viable"); @@ -42276,7 +42129,6 @@ lin vicarage_N = mkN "vicarage" "vicarages"; lin vicarious_A = compoundA (mkA "vicarious"); lin vicariously_Adv = mkAdv "vicariously"; lin vice_N = mkN "vice" "vices"; -lin vice_Prep = mkPrep "vice"; lin vice_versa_Adv = mkAdv "vice versa"; lin vicenza_PN = mkPN "vicenza"; lin viceregal_A = compoundA (mkA "viceregal"); @@ -42408,7 +42260,6 @@ lin virulent_A = compoundA (mkA "virulent"); lin virulently_Adv = mkAdv "virulently"; lin virus_N = mkN "virus" "viruses"; lin vis_à_vis_Adv = mkAdv "vis-à-vis"; -lin vis_à_vis_Prep = mkPrep "vis-à-vis"; lin visa_N = mkN "visa" "visas"; lin visa_V2 = mkV2 (mkV "visa" "visas" "visaed" "visaed" "visaing"); lin visage_N = mkN "visage" "visages"; @@ -42719,7 +42570,6 @@ lin want_V = mkV "want" "wants" "wanted" "wanted" "wanting"; lin want_V2 = mkV2 (mkV "want" "wants" "wanted" "wanted" "wanting"); lin want_ad_N = mkN "want-ad" "want-ads"; lin wantage_PN = mkPN "wantage"; -lin wanting_Prep = mkPrep "wanting"; lin wanton_A = compoundA (mkA "wanton"); lin wanton_N = mkN "wanton" "wantons"; lin wanton_V = mkV "wanton" "wantons" "wantoned" "wantoned" "wantoning"; @@ -43221,15 +43071,11 @@ lin whelk_N = mkN "whelk" "whelks"; lin whelp_N = mkN "whelp" "whelps"; lin whelp_V = mkV "whelp" "whelps" "whelped" "whelped" "whelping"; lin when_Adv = mkAdv "when"; -lin when_Conj = mkConj "when"; lin whence_Adv = mkAdv "whence"; lin whencesoever_A = compoundA (mkA "whencesoever"); -lin whencesoever_Conj = mkConj "whencesoever"; lin whenever_Adv = mkAdv "whenever"; -lin whenever_Conj = mkConj "whenever"; lin where_Adv = mkAdv "where"; lin whereabouts_Adv = mkAdv "whereabouts"; -lin whereas_Conj = mkConj "whereas"; lin whereat_Adv = mkAdv "whereat"; lin whereby_Adv = mkAdv "whereby"; lin wherefore_Adv = mkAdv "wherefore"; @@ -43246,7 +43092,6 @@ lin wherewithal_Adv = mkAdv "wherewithal"; lin wherewithal_N = mkN "wherewithal" "-" {- FIXME: no plural form -}; lin wherry_N = mkN "wherry" "wherries"; lin whet_V2 = mkV2 (mkV "whet" "whets" "whetted" "whetted" "whetting"); -lin whether_Conj = mkConj "whether"; lin whetstone_N = mkN "whetstone" "whetstones"; lin whey_N = mkN "whey" "-" {- FIXME: no plural form -}; lin which_A = compoundA (mkA "which"); @@ -43254,10 +43099,8 @@ lin whichever_A = compoundA (mkA "whichever"); lin whichsoever_A = compoundA (mkA "whichsoever"); lin whiff_N = mkN "whiff" "whiffs"; lin whig_N = mkN "whig" "whigs"; -lin while_Conj = mkConj "while"; lin while_N = mkN "while" "IRREG"; lin while_V2 = mkV2 (mkV "while" "whiles" "whiled" "whiled" "whiling"); -lin whilst_Conj = mkConj "whilst"; lin whim_N = mkN "whim" "whims"; lin whimper_N = mkN "whimper" "whimpers"; lin whimper_V = mkV "whimper" "whimpers" "whimpered" "whimpered" "whimpering"; @@ -43600,7 +43443,6 @@ lin witch_hunt_N = mkN "witch-hunt" "witch-hunts"; lin witchcraft_N = mkN "witchcraft" "-" {- FIXME: no plural form -}; lin witchery_N = mkN "witchery" "-" {- FIXME: no plural form -}; lin witching_A = compoundA (mkA "witching"); -lin with_Prep = mkPrep "with"; lin withal_Adv = mkAdv "withal"; lin witham_PN = mkPN "witham"; lin withdraw_V = mkV "with" IrregEng.draw_V; @@ -43613,9 +43455,7 @@ lin witheringly_Adv = mkAdv "witheringly"; lin withernsea_PN = mkPN "withernsea"; lin withhold_V2 = mkV2 (IrregEng.withhold_V); lin within_Adv = mkAdv "within"; -lin within_Prep = mkPrep "within"; lin without_Adv = mkAdv "without"; -lin without_Prep = mkPrep "without"; lin withstand_V2 = mkV2 (IrregEng.withstand_V); lin withy_N = mkN "withy" "withies"; lin witless_A = compoundA (mkA "witless"); @@ -43984,7 +43824,6 @@ lin yes_N = mkN "yes" "yeses"; lin yesterday_Adv = mkAdv "yesterday"; lin yesterday_N = mkN "yesterday" "yesterdays"; lin yet_Adv = mkAdv "yet"; -lin yet_Conj = mkConj "yet"; lin yeti_N = mkN "yeti" "yetis"; lin yew_N = mkN "yew" "yews"; lin yew_tree_N = mkN "yew-tree" "yew-trees"; diff --git a/next-lib/src/parse/oald/OaldStructural.gf b/next-lib/src/parse/oald/OaldStructural.gf new file mode 100644 index 000000000..c930c9c6d --- /dev/null +++ b/next-lib/src/parse/oald/OaldStructural.gf @@ -0,0 +1,184 @@ +-- English lexicon for GF, produced from: +-- Oxford advanced learner's dictionary of current English: +-- expanded 'computer usable' version compiled by Roger Mitton +-- The computer usable version is transcribed from: +-- Oxford advanced learner's dictionary of current English +-- A.S. Hornby ; with the assistance of A.P. Cowie [and] J. Windsor Lewis. +-- 3rd. ed., London : Oxford University Press, 1974. +-- Distributed as 'dict0710' by: +-- Oxford Text Archive +-- Oxford University Computing Services +-- 13 Banbury Road +-- Oxford +-- OX2 6NN +-- Under these conditions: +-- Freely available for non-commercial use provided that this header is +-- included in its entirety with any copy distributed. +-- +-- GF version generated by asc2gf, Bjorn Bringert Nov 2008 +-- based on asc2lex, Matthew Purver Nov 2001 +-- http://www.stanford.edu/~mpurver/software.html + +abstract OaldStructural = Cat ** { +fun abaft_Prep : Prep; +fun aboard_Prep : Prep; +fun about_Prep : Prep; +fun above_Prep : Prep; +fun according_as_Conj : Conj; +fun according_to_Prep : Prep; +fun across_Prep : Prep; +fun afore_Prep : Prep; +fun after_Conj : Conj; +fun after_Prep : Prep; +fun against_Prep : Prep; +fun agin_Prep : Prep; +fun albeit_Conj : Conj; +fun along_Prep : Prep; +fun alongside_Prep : Prep; +fun although_Conj : Conj; +fun amid_Prep : Prep; +fun amidst_Prep : Prep; +fun among_Prep : Prep; +fun amongst_Prep : Prep; +fun an_Conj : Conj; +fun and_Conj : Conj; +fun anent_Prep : Prep; +fun around_Prep : Prep; +fun as_Conj : Conj; +fun aslant_Prep : Prep; +fun astride_Prep : Prep; +fun at_Prep : Prep; +fun athwart_Prep : Prep; +fun bar_Prep : Prep; +fun barring_Prep : Prep; +fun because_Conj : Conj; +fun before_Conj : Conj; +fun before_Prep : Prep; +fun behind_Prep : Prep; +fun below_Prep : Prep; +fun beneath_Prep : Prep; +fun beside_Prep : Prep; +fun besides_Prep : Prep; +fun between_Prep : Prep; +fun betwixt_Prep : Prep; +fun beyond_Prep : Prep; +fun but_Conj : Conj; +fun but_Prep : Prep; +fun by_Prep : Prep; +fun circa_Prep : Prep; +fun concerning_Prep : Prep; +fun considering_Prep : Prep; +fun cos_Conj : Conj; +fun despite_Prep : Prep; +fun directly_Conj : Conj; +fun down_Prep : Prep; +fun during_Prep : Prep; +fun either_Conj : Conj; +fun ere_Prep : Prep; +fun except_Conj : Conj; +fun except_Prep : Prep; +fun excepting_Prep : Prep; +fun failing_Prep : Prep; +fun for_Conj : Conj; +fun for_Prep : Prep; +fun forasmuch_as_Conj : Conj; +fun from_Prep : Prep; +fun howbeit_Conj : Conj; +fun if_Conj : Conj; +fun immediately_Conj : Conj; +fun in_Prep : Prep; +fun inside_Prep : Prep; +fun instantly_Conj : Conj; +fun into_Prep : Prep; +fun less_Prep : Prep; +fun lest_Conj : Conj; +fun like_Conj : Conj; +fun like_Prep : Prep; +fun likewise_Conj : Conj; +fun mid_Prep : Prep; +fun midst_Prep : Prep; +fun minus_Prep : Prep; +fun near_Prep : Prep; +fun neath_Prep : Prep; +fun neither_Conj : Conj; +fun nevertheless_Conj : Conj; +fun next_Prep : Prep; +fun nigh_Prep : Prep; +fun nigher_Prep : Prep; +fun nighest_Prep : Prep; +fun nisi_Conj : Conj; +fun nor_Conj : Conj; +fun notwithstanding_Conj : Conj; +fun notwithstanding_Prep : Prep; +fun now_Conj : Conj; +fun o'er_Prep : Prep; +fun of_Prep : Prep; +fun off_Prep : Prep; +fun on_Prep : Prep; +fun on_to_Prep : Prep; +fun only_Conj : Conj; +fun onto_Prep : Prep; +fun or_Conj : Conj; +fun otherwise_Conj : Conj; +fun outside_Prep : Prep; +fun over_Prep : Prep; +fun past_Prep : Prep; +fun pending_Prep : Prep; +fun per_Prep : Prep; +fun plus_Prep : Prep; +fun provided_Conj : Conj; +fun providing_Conj : Conj; +fun qua_Conj : Conj; +fun qua_Prep : Prep; +fun re_Prep : Prep; +fun respecting_Prep : Prep; +fun round_Prep : Prep; +fun sans_Prep : Prep; +fun save_Prep : Prep; +fun saving_Prep : Prep; +fun since_Conj : Conj; +fun since_Prep : Prep; +fun so_Conj : Conj; +fun supposing_Conj : Conj; +fun than_Conj : Conj; +fun that_Conj : Conj; +fun tho'_Conj : Conj; +fun though_Conj : Conj; +fun thro'_Prep : Prep; +fun through_Prep : Prep; +fun throughout_Prep : Prep; +fun thru_Prep : Prep; +fun till_Conj : Conj; +fun till_Prep : Prep; +fun to_Prep : Prep; +fun touching_Prep : Prep; +fun toward_Prep : Prep; +fun towards_Prep : Prep; +fun tween_Prep : Prep; +fun twixt_Prep : Prep; +fun under_Prep : Prep; +fun underneath_Prep : Prep; +fun unless_Conj : Conj; +fun unlike_Prep : Prep; +fun until_Conj : Conj; +fun until_Prep : Prep; +fun unto_Prep : Prep; +fun up_Prep : Prep; +fun upon_Prep : Prep; +fun versus_Prep : Prep; +fun via_Prep : Prep; +fun vice_Prep : Prep; +fun vis_à_vis_Prep : Prep; +fun wanting_Prep : Prep; +fun when_Conj : Conj; +fun whencesoever_Conj : Conj; +fun whenever_Conj : Conj; +fun whereas_Conj : Conj; +fun whether_Conj : Conj; +fun while_Conj : Conj; +fun whilst_Conj : Conj; +fun with_Prep : Prep; +fun within_Prep : Prep; +fun without_Prep : Prep; +fun yet_Conj : Conj; +} \ No newline at end of file diff --git a/next-lib/src/parse/oald/OaldStructuralEng.gf b/next-lib/src/parse/oald/OaldStructuralEng.gf new file mode 100644 index 000000000..ceba1cd11 --- /dev/null +++ b/next-lib/src/parse/oald/OaldStructuralEng.gf @@ -0,0 +1,185 @@ +-- English lexicon for GF, produced from: +-- Oxford advanced learner's dictionary of current English: +-- expanded 'computer usable' version compiled by Roger Mitton +-- The computer usable version is transcribed from: +-- Oxford advanced learner's dictionary of current English +-- A.S. Hornby ; with the assistance of A.P. Cowie [and] J. Windsor Lewis. +-- 3rd. ed., London : Oxford University Press, 1974. +-- Distributed as 'dict0710' by: +-- Oxford Text Archive +-- Oxford University Computing Services +-- 13 Banbury Road +-- Oxford +-- OX2 6NN +-- Under these conditions: +-- Freely available for non-commercial use provided that this header is +-- included in its entirety with any copy distributed. +-- +-- GF version generated by asc2gf, Bjorn Bringert Nov 2008 +-- based on asc2lex, Matthew Purver Nov 2001 +-- http://www.stanford.edu/~mpurver/software.html + +--# -path=.:alltenses +concrete OaldStructuralEng of OaldStructural = CatEng ** open ParadigmsEng in { +lin abaft_Prep = mkPrep "abaft"; +lin aboard_Prep = mkPrep "aboard"; +lin about_Prep = mkPrep "about"; +lin above_Prep = mkPrep "above"; +lin according_as_Conj = mkConj "according as"; +lin according_to_Prep = mkPrep "according to"; +lin across_Prep = mkPrep "across"; +lin afore_Prep = mkPrep "afore"; +lin after_Conj = mkConj "after"; +lin after_Prep = mkPrep "after"; +lin against_Prep = mkPrep "against"; +lin agin_Prep = mkPrep "agin"; +lin albeit_Conj = mkConj "albeit"; +lin along_Prep = mkPrep "along"; +lin alongside_Prep = mkPrep "alongside"; +lin although_Conj = mkConj "although"; +lin amid_Prep = mkPrep "amid"; +lin amidst_Prep = mkPrep "amidst"; +lin among_Prep = mkPrep "among"; +lin amongst_Prep = mkPrep "amongst"; +lin an_Conj = mkConj "an"; +lin and_Conj = mkConj "and"; +lin anent_Prep = mkPrep "anent"; +lin around_Prep = mkPrep "around"; +lin as_Conj = mkConj "as"; +lin aslant_Prep = mkPrep "aslant"; +lin astride_Prep = mkPrep "astride"; +lin at_Prep = mkPrep "at"; +lin athwart_Prep = mkPrep "athwart"; +lin bar_Prep = mkPrep "bar"; +lin barring_Prep = mkPrep "barring"; +lin because_Conj = mkConj "because"; +lin before_Conj = mkConj "before"; +lin before_Prep = mkPrep "before"; +lin behind_Prep = mkPrep "behind"; +lin below_Prep = mkPrep "below"; +lin beneath_Prep = mkPrep "beneath"; +lin beside_Prep = mkPrep "beside"; +lin besides_Prep = mkPrep "besides"; +lin between_Prep = mkPrep "between"; +lin betwixt_Prep = mkPrep "betwixt"; +lin beyond_Prep = mkPrep "beyond"; +lin but_Conj = mkConj "but"; +lin but_Prep = mkPrep "but"; +lin by_Prep = mkPrep "by"; +lin circa_Prep = mkPrep "circa"; +lin concerning_Prep = mkPrep "concerning"; +lin considering_Prep = mkPrep "considering"; +lin cos_Conj = mkConj "cos"; +lin despite_Prep = mkPrep "despite"; +lin directly_Conj = mkConj "directly"; +lin down_Prep = mkPrep "down"; +lin during_Prep = mkPrep "during"; +lin either_Conj = mkConj "either"; +lin ere_Prep = mkPrep "ere"; +lin except_Conj = mkConj "except"; +lin except_Prep = mkPrep "except"; +lin excepting_Prep = mkPrep "excepting"; +lin failing_Prep = mkPrep "failing"; +lin for_Conj = mkConj "for"; +lin for_Prep = mkPrep "for"; +lin forasmuch_as_Conj = mkConj "forasmuch as"; +lin from_Prep = mkPrep "from"; +lin howbeit_Conj = mkConj "howbeit"; +lin if_Conj = mkConj "if"; +lin immediately_Conj = mkConj "immediately"; +lin in_Prep = mkPrep "in"; +lin inside_Prep = mkPrep "inside"; +lin instantly_Conj = mkConj "instantly"; +lin into_Prep = mkPrep "into"; +lin less_Prep = mkPrep "less"; +lin lest_Conj = mkConj "lest"; +lin like_Conj = mkConj "like"; +lin like_Prep = mkPrep "like"; +lin likewise_Conj = mkConj "likewise"; +lin mid_Prep = mkPrep "mid"; +lin midst_Prep = mkPrep "midst"; +lin minus_Prep = mkPrep "minus"; +lin near_Prep = mkPrep "near"; +lin neath_Prep = mkPrep "'neath"; +lin neither_Conj = mkConj "neither"; +lin nevertheless_Conj = mkConj "nevertheless"; +lin next_Prep = mkPrep "next"; +lin nigh_Prep = mkPrep "nigh"; +lin nigher_Prep = mkPrep "nigher"; +lin nighest_Prep = mkPrep "nighest"; +lin nisi_Conj = mkConj "nisi"; +lin nor_Conj = mkConj "nor"; +lin notwithstanding_Conj = mkConj "notwithstanding"; +lin notwithstanding_Prep = mkPrep "notwithstanding"; +lin now_Conj = mkConj "now"; +lin o'er_Prep = mkPrep "o'er"; +lin of_Prep = mkPrep "of"; +lin off_Prep = mkPrep "off"; +lin on_Prep = mkPrep "on"; +lin on_to_Prep = mkPrep "on to"; +lin only_Conj = mkConj "only"; +lin onto_Prep = mkPrep "onto"; +lin or_Conj = mkConj "or"; +lin otherwise_Conj = mkConj "otherwise"; +lin outside_Prep = mkPrep "outside"; +lin over_Prep = mkPrep "over"; +lin past_Prep = mkPrep "past"; +lin pending_Prep = mkPrep "pending"; +lin per_Prep = mkPrep "per"; +lin plus_Prep = mkPrep "plus"; +lin provided_Conj = mkConj "provided"; +lin providing_Conj = mkConj "providing"; +lin qua_Conj = mkConj "qua"; +lin qua_Prep = mkPrep "qua"; +lin re_Prep = mkPrep "re"; +lin respecting_Prep = mkPrep "respecting"; +lin round_Prep = mkPrep "round"; +lin sans_Prep = mkPrep "sans"; +lin save_Prep = mkPrep "save"; +lin saving_Prep = mkPrep "saving"; +lin since_Conj = mkConj "since"; +lin since_Prep = mkPrep "since"; +lin so_Conj = mkConj "so"; +lin supposing_Conj = mkConj "supposing"; +lin than_Conj = mkConj "than"; +lin that_Conj = mkConj "that"; +lin tho'_Conj = mkConj "tho'"; +lin though_Conj = mkConj "though"; +lin thro'_Prep = mkPrep "thro'"; +lin through_Prep = mkPrep "through"; +lin throughout_Prep = mkPrep "throughout"; +lin thru_Prep = mkPrep "thru"; +lin till_Conj = mkConj "till"; +lin till_Prep = mkPrep "till"; +lin to_Prep = mkPrep "to"; +lin touching_Prep = mkPrep "touching"; +lin toward_Prep = mkPrep "toward"; +lin towards_Prep = mkPrep "towards"; +lin tween_Prep = mkPrep "'tween"; +lin twixt_Prep = mkPrep "'twixt"; +lin under_Prep = mkPrep "under"; +lin underneath_Prep = mkPrep "underneath"; +lin unless_Conj = mkConj "unless"; +lin unlike_Prep = mkPrep "unlike"; +lin until_Conj = mkConj "until"; +lin until_Prep = mkPrep "until"; +lin unto_Prep = mkPrep "unto"; +lin up_Prep = mkPrep "up"; +lin upon_Prep = mkPrep "upon"; +lin versus_Prep = mkPrep "versus"; +lin via_Prep = mkPrep "via"; +lin vice_Prep = mkPrep "vice"; +lin vis_à_vis_Prep = mkPrep "vis-à-vis"; +lin wanting_Prep = mkPrep "wanting"; +lin when_Conj = mkConj "when"; +lin whencesoever_Conj = mkConj "whencesoever"; +lin whenever_Conj = mkConj "whenever"; +lin whereas_Conj = mkConj "whereas"; +lin whether_Conj = mkConj "whether"; +lin while_Conj = mkConj "while"; +lin whilst_Conj = mkConj "whilst"; +lin with_Prep = mkPrep "with"; +lin within_Prep = mkPrep "within"; +lin without_Prep = mkPrep "without"; +lin yet_Conj = mkConj "yet"; +} \ No newline at end of file diff --git a/next-lib/src/parse/oald/asc2gf b/next-lib/src/parse/oald/asc2gf index 3b27e3022..d3db827f8 100644 --- a/next-lib/src/parse/oald/asc2gf +++ b/next-lib/src/parse/oald/asc2gf @@ -367,10 +367,15 @@ while ( my $line = ) { my $absfile = "Oald.gf"; my $cncfile = "OaldEng.gf"; +my $abs_structfile = "OaldStructural.gf"; +my $cnc_structfile = "OaldStructuralEng.gf"; open (ABS, '>', $absfile); open (CNC, '>', $cncfile); +open (ABS_STRUCTURAL, '>', $abs_structfile); +open (CNC_STRUCTURAL, '>', $cnc_structfile); + # print a nice comment at the top @@ -396,26 +401,45 @@ my $header = "-- English lexicon for GF, produced from:\n" . "-- http://www.stanford.edu/~mpurver/software.html\n" . "\n"; print ABS $header; -print CNC $header; - print ABS "abstract Oald = Cat ** {\n"; + +print CNC $header; print CNC "--# -path=.:alltenses\n"; print CNC "concrete OaldEng of Oald = CatEng ** open ParadigmsEng, IrregEng in {\n"; +print ABS_STRUCTURAL $header; +print ABS_STRUCTURAL "abstract OaldStructural = Cat ** {\n"; + +print CNC_STRUCTURAL $header; +print CNC_STRUCTURAL "--# -path=.:alltenses\n"; +print CNC_STRUCTURAL "concrete OaldStructuralEng of OaldStructural = CatEng ** open ParadigmsEng in {\n"; + foreach my $name (sort (keys %words)) { (my $cat = $name) =~ s/.*_([A-Z][A-Za-z\d]*)$/$1/; my $lin = $words{$name}; - print ABS "fun $name : $cat;\n"; - print CNC "lin $name = $lin;\n"; + if ( $cat =~ /^(A)|(N)|(V)|(V2)$/ ) { + print ABS "fun $name : $cat;\n"; + print CNC "lin $name = $lin;\n"; + } else { + print ABS_STRUCTURAL "fun $name : $cat;\n"; + print CNC_STRUCTURAL "lin $name = $lin;\n"; + } } print ABS "}"; print CNC "}"; +print ABS_STRUCTURAL "}"; +print CNC_STRUCTURAL "}"; + +close(ABS_STRUCTURAL); +close(CNC_STRUCTURAL); + close(ABS); close(CNC); -print "\nWrote lexicon to $absfile and $cncfile\n"; +print "\nWrote open lexicon to $absfile and $cncfile\n"; +print "Wrote closed lexicon to $abs_structfile and $cnc_structfile\n";