diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 0be4e2477..9800a5b61 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -666,12 +666,10 @@ fun activism_N : N ; fun activistFem_N : N ; fun activistMasc_N : N ; fun activist_A : A ; -fun activist_N : N ; fun activity_N : N ; fun actomyosin_N : N ; fun actor_1_N : N ; -- | a Shakespeare actor fun actor_2_N : N ; -- | an important actor -fun actor_N : N ; fun actress_N : N ; fun actual_A : A ; fun actuality_N : N ; @@ -852,7 +850,6 @@ fun administrative_A : A ; fun administratively_Adv : Adv ; fun administratorFem_N : N ; fun administratorMasc_N : N ; -fun administrator_N : N ; fun administrivia_N : N ; fun admirability_N : N ; fun admirable_A : A ; @@ -997,14 +994,12 @@ fun advise_VS : VS ; fun advisee_N : N ; fun adviserFem_N : N ; fun adviserMasc_N : N ; -fun adviser_N : N ; fun advisor_N : N ; fun advisory_A : A ; fun advisory_N : N ; fun advocacy_N : N ; fun advocateFem_N : N ; fun advocateMasc_N : N ; -fun advocate_N : N ; fun advocate_V2 : V2 ; fun advocate_VS : VS ; fun advowson_N : N ; @@ -1243,7 +1238,6 @@ fun agenda_N : N ; fun agenesis_N : N ; fun agentFem_N : N ; fun agentMasc_N : N ; -fun agent_N : N ; fun agent_provocateur_N : N ; fun agential_A : A ; fun agerasia_N : N ; @@ -1608,7 +1602,6 @@ fun alidade_N : N ; fun alienFem_N : N ; fun alienMasc_N : N ; fun alien_A : A ; -fun alien_N : N ; fun alienable_A : A ; fun alienage_N : N ; fun alienate_V2 : V2 ; @@ -1929,7 +1922,6 @@ fun amastia_N : N ; fun amateurFem_N : N ; fun amateurMasc_N : N ; fun amateur_A : A ; -fun amateur_N : N ; fun amateurish_A : A ; fun amateurishness_N : N ; fun amateurism_N : N ; @@ -2259,7 +2251,6 @@ fun anarchically_Adv : Adv ; fun anarchism_N : N ; fun anarchistFem_N : N ; fun anarchistMasc_N : N ; -fun anarchist_N : N ; fun anarchistic_A : A ; fun anarchy_N : N ; fun anarthria_N : N ; @@ -2691,7 +2682,6 @@ fun anthropolatry_N : N ; fun anthropological_A : A ; fun anthropologistFem_N : N ; fun anthropologistMasc_N : N ; -fun anthropologist_N : N ; fun anthropology_N : N ; fun anthropometric_A : A ; fun anthropometry_N : N ; @@ -3117,9 +3107,8 @@ fun applied_A : A ; fun applique_N : N ; fun applique_V2 : V2 ; fun apply_V : V ; -fun apply_V2 : V2 ; --- -fun apply_1_V2 : V2 ; -- | we apply the newest methods -fun apply_2_V2 : V2 ; -- | we apply for a job +fun apply_V2 : V2 ; -- | we apply the newest methods +fun apply_for_V2 : V2 ; -- | we apply for a job fun apply_V2V : V2V ; fun apply_VV : VV ; fun appoint_V2 : V2 ; @@ -3333,7 +3322,6 @@ fun archipelagic_A : A ; fun archipelago_N : N ; fun architectFem_N : N ; fun architectMasc_N : N ; -fun architect_N : N ; fun architectonics_N : N ; fun architectural_A : A ; fun architecture_N : N ; @@ -3366,7 +3354,6 @@ fun area_3_N : N ; fun area_4_N : N ; fun area_5_N : N ; fun area_6_N : N ; -fun area_N : N ; fun areal_A : A ; fun areaway_N : N ; fun areca_N : N ; @@ -3441,7 +3428,6 @@ fun arity_N : N ; fun arizona_PN : PN ; fun ark_N : N ; fun arkansas_PN : PN ; -fun arm_N : N ; --- fun arm_1_N : N ; -- | arms and legs fun arm_2_N : N ; -- | a farewell to arms fun arm_V : V ; @@ -3847,7 +3833,8 @@ fun assist_V : V ; fun assist_V2 : V2 ; fun assistance_N : N ; fun assistant_A : A ; -fun assistant_N : N ; +fun assistantMasc_N : N ; +fun assistantFem_N : N ; fun assistive_A : A ; fun assize_N : N ; fun assizes_N : N ; @@ -4251,7 +4238,6 @@ fun authoritarianism_N : N ; fun authoritative_A : A ; fun authority_1_N : N ; -- | he is an authority in his field fun authority_2_N : N ; -- | the police and other authorities -fun authority_N : N ; fun authorization_N : N ; fun authorize_V2 : V2 ; fun authorize_V2V : V2V ; @@ -4386,7 +4372,6 @@ fun aviary_N : N ; fun aviation_N : N ; fun aviatorFem_N : N ; fun aviatorMasc_N : N ; -fun aviator_N : N ; fun aviatrix_N : N ; fun avid_A : A ; fun avidity_N : N ; @@ -4433,7 +4418,6 @@ fun awash_A : A ; fun away_1_Adv : Adv ; -- | she is away fun away_2_Adv : Adv ; -- | she went away fun away_A : A ; -fun away_Adv : Adv ; fun awayness_N : N ; fun awe_N : N ; fun awe_V2 : V2 ; @@ -4984,7 +4968,6 @@ fun baptist_N : N ; fun baptize_V2 : V2 ; fun bar_1_N : N ; -- | have a drink in the bar fun bar_2_N : N ; -- | bars in front of the window -fun bar_N : N ; fun bar_Prep : Prep ; fun bar_V2 : V2 ; fun baracaldo_PN : PN ; @@ -5891,7 +5874,8 @@ fun betrayal_N : N ; fun betrayer_N : N ; fun betroth_V2 : V2 ; fun betrothal_N : N ; -fun betrothed_N : N ; +fun betrothedMasc_N : N ; +fun betrothedFem_N : N ; fun betsy_PN : PN ; fun better_A : A ; fun better_Adv : Adv ; @@ -6782,7 +6766,6 @@ fun boa_constrictor_N : N ; fun boar_N : N ; fun board_1_N : N ; -- | write it on the board fun board_2_N : N ; -- | board member -fun board_N : N ; --subcat fun board_V : V ; fun board_V2 : V2 ; fun board_out_V2 : V2 ; @@ -7458,7 +7441,6 @@ fun brasserie_N : N ; fun brassie_N : N ; fun brassiere_1_N : N ; fun brassiere_2_N : N ; -fun brassiere_N : N ; fun brassy_A : A ; fun brat_N : N ; fun bratislava_PN : PN ; @@ -8429,7 +8411,6 @@ fun buy_out_V2 : V2 ; fun buy_up_V2 : V2 ; fun buyerFem_N : N ; fun buyerMasc_N : N ; -fun buyer_N : N ; fun buying_N : N ; fun buyout_N : N ; fun buzz_N : N ; @@ -8867,7 +8848,6 @@ fun candida_N : N ; fun candidacy_N : N ; fun candidateFem_N : N ; fun candidateMasc_N : N ; -fun candidate_N : N ; fun candidature_N : N ; fun candidiasis_N : N ; fun candle_N : N ; @@ -8930,7 +8910,6 @@ fun canoe_V2 : V2 ; fun canoeist_N : N ; fun canon_1_N : N ; fun canon_2_N : N ; -fun canon_N : N ; fun canonic_A : A ; fun canonical_A : A ; fun canonist_A : A ; @@ -9006,7 +8985,6 @@ fun capital_1_N : N ; -- | the capital of France fun capital_2_N : N ; -- | risk capital fun capital_3_N : N ; -- | written in capitals fun capital_A : A ; -fun capital_N : N ; fun capitalism_A : A ; fun capitalism_N : N ; fun capitalist_A : A ; @@ -9057,7 +9035,8 @@ fun captious_A : A ; fun captivate_V2 : V2 ; fun captivation_N : N ; fun captive_A : A ; -fun captive_N : N ; +fun captiveMasc_N : N ; +fun captiveFem_N : N ; fun captivity_N : N ; fun captopril_N : N ; fun captor_N : N ; @@ -9339,7 +9318,6 @@ fun cartoon_N : N ; fun cartoon_V2 : V2 ; fun cartoonistFem_N : N ; fun cartoonistMasc_N : N ; -fun cartoonist_N : N ; fun cartouche_N : N ; fun cartridge_N : N ; fun cartridge_belt_N : N ; @@ -9743,7 +9721,6 @@ fun cellarage_N : N ; fun cellblock_N : N ; fun cellistFem_N : N ; fun cellistMasc_N : N ; -fun cellist_N : N ; fun cello_N : N ; fun cellophane_N : N ; fun cellular_A : A ; @@ -9898,7 +9875,6 @@ fun cerous_A : A ; fun cert_N : N ; fun certain_1_A : A ; -- | I am certain fun certain_2_A : A ; -- | a certain house -fun certain_A : A ; fun certainly_Adv : Adv ; fun certainty_N : N ; fun certifiable_A : A ; @@ -10116,7 +10092,6 @@ fun chard_N : N ; fun chard_PN : PN ; fun charge_1_N : N ; -- | battery charge fun charge_2_N : N ; -- | charge against him -fun charge_N : N ; fun charge_V : V ; fun charge_V2 : V2 ; --subcat fun charge_VS : VS ; @@ -10315,7 +10290,6 @@ fun chemisorption_N : N ; fun chemisorptive_A : A ; fun chemistFem_N : N ; fun chemistMasc_N : N ; -fun chemist_N : N ; fun chemistry_N : N ; fun chemoreceptive_A : A ; fun chemoreceptor_N : N ; @@ -10411,7 +10385,6 @@ fun chief_N : N ; fun chiefly_Adv : Adv ; fun chieftainFem_N : N ; fun chieftainMasc_N : N ; -fun chieftain_N : N ; fun chieftaincy_N : N ; fun chiffon_N : N ; fun chiffonier_N : N ; @@ -10932,7 +10905,6 @@ fun cite_V2 : V2 ; fun citified_A : A ; fun citizenFem_N : N ; fun citizenMasc_N : N ; -fun citizen_N : N ; fun citizenry_N : N ; fun citizenship_N : N ; fun citrange_N : N ; @@ -11404,7 +11376,6 @@ fun clozapine_N : N ; fun cloze_A : A ; fun club_1_N : N ; -- | member of the club fun club_2_N : N ; -- | hit the ball with a club -fun club_N : N ; fun club_V : V ; fun club_V2 : V2 ; fun club_footed_A : A ; @@ -11461,7 +11432,6 @@ fun co_star_V2 : V2 ; fun coach_1_N : N ; -- | football coach fun coach_2_N : N ; -- | coach in a train fun coach_3_N : N ; -- | bus -fun coach_N : N ; fun coach_V : V ; fun coach_V2 : V2 ; fun coach_builder_N : N ; @@ -11908,7 +11878,6 @@ fun columniation_N : N ; fun columniform_A : A ; fun columnistFem_N : N ; fun columnistMasc_N : N ; -fun columnist_N : N ; fun colwyn_bay_PN : PN ; fun coma_N : N ; fun comate_A : A ; @@ -12031,7 +12000,6 @@ fun comity_N : N ; fun comma_N : N ; fun command_1_N : N ; -- | she gave us commands fun command_2_N : N ; -- | she took the command -fun command_N : N ; fun command_V : V ; fun command_V2 : V2 ; fun commandant_N : N ; @@ -12102,7 +12070,6 @@ fun commodity_N : N ; fun commodore_N : N ; fun common_1_A : A ; -- | very common fun common_2_A : A ; -- | common to us -fun common_A : A ; fun common_N : N ; fun common_room_N : N ; fun commonage_N : N ; @@ -13362,7 +13329,6 @@ fun corsham_PN : PN ; fun corslet_N : N ; fun cortege_1_N : N ; fun cortege_2_N : N ; -fun cortege_N : N ; fun cortex_N : N ; fun cortical_A : A ; fun corticoafferent_A : A ; @@ -13655,7 +13621,6 @@ fun coursework_N : N ; fun coursing_N : N ; fun court_1_N : N ; -- | the emperor's court fun court_2_N : N ; -- | the supreme court -fun court_N : N ; fun court_V : V ; fun court_V2 : V2 ; fun court_card_N : N ; @@ -13975,7 +13940,6 @@ fun creosol_N : N ; fun creosote_N : N ; fun crepe_1_N : N ; fun crepe_2_N : N ; -fun crepe_N : N ; fun crepitate_V : V ; fun crepitation_N : N ; fun crepuscular_A : A ; @@ -14066,7 +14030,6 @@ fun crith_N : N ; fun critic_N : N ; fun critical_1_A : A ; -- | you are very critical fun critical_2_A : A ; -- | of critical importance -fun critical_A : A ; fun criticality_N : N ; fun critically_Adv : Adv ; fun criticism_N : N ; @@ -14497,7 +14460,6 @@ fun curdle_V2 : V2 ; fun curdling_N : N ; fun cure_1_N : N ; fun cure_2_N : N ; -fun cure_N : N ; fun cure_V : V ; fun cure_V2 : V2 ; fun cure_all_N : N ; @@ -14596,7 +14558,6 @@ fun custom_made_A : A ; fun customary_A : A ; fun customerFem_N : N ; fun customerMasc_N : N ; -fun customer_N : N ; fun customhouse_N : N ; fun customize_V2 : V2 ; fun customs_N : N ; @@ -15021,7 +14982,6 @@ fun date_1_N : N ; -- | the specified day of the month fun date_3_N : N ; -- | she was my first date fun date_3_N : N ; -- | a meeting arranged in advance fun date_7_N : N ; -- | sweet edible fruit of the date palm with a single long woody seed -fun date_N : N ; fun date_V : V ; fun date_V2 : V2 ; fun dateless_A : A ; @@ -15186,7 +15146,8 @@ fun debate_V2 : V2 ; fun debater_N : N ; fun debauch_N : N ; fun debauch_V2 : V2 ; -fun debauchee_N : N ; +fun debaucheeMasc_N : N ; +fun debaucheeFem_N : N ; fun debauchery_N : N ; fun debbie_PN : PN ; fun debby_PN : PN ; @@ -15208,7 +15169,6 @@ fun debrief_V2 : V2 ; fun debriefing_N : N ; fun debris_1_N : N ; fun debris_2_N : N ; -fun debris_N : N ; fun debt_N : N ; fun debtor_N : N ; fun debug_V2 : V2 ; @@ -15216,11 +15176,9 @@ fun debugger_N : N ; fun debunk_V2 : V2 ; fun debut_1_N : N ; fun debut_2_N : N ; -fun debut_N : N ; fun debut_V2 : V2 ; fun debutante_1_N : N ; fun debutante_2_N : N ; -fun debutante_N : N ; fun dec_PN : PN ; fun decade_N : N ; fun decadence_N : N ; @@ -15463,7 +15421,6 @@ fun defendable_A : A ; fun defendant_N : N ; fun defenderFem_N : N ; fun defenderMasc_N : N ; -fun defender_N : N ; fun defenestration_N : N ; fun defense_N : N ; fun defenseless_A : A ; @@ -15552,7 +15509,6 @@ fun degrade_V2 : V2 ; fun degree_1_N : N ; -- | a position on a scale of intensity or amount or quality fun degree_2_N : N ; -- | an award conferred by a college or university signifying that the recipient has satisfactorily completed a course of study fun degree_3_N : N ; -- | a unit of temperature on a specified scale -fun degree_N : N ; fun degressive_A : A ; fun dehiscence_N : N ; fun dehiscent_A : A ; @@ -16819,7 +16775,6 @@ fun discover_V2 : V2 ; fun discover_VS : VS ; fun discovererFem_N : N ; fun discovererMasc_N : N ; -fun discoverer_N : N ; fun discovery_N : N ; fun discredit_N : N ; fun discredit_V2 : V2 ; @@ -17288,7 +17243,6 @@ fun divisible_A : A ; fun division_1_N : N ; -- | division at university fun division_2_N : N ; -- | division in the army fun division_3_N : N ; -- | multiplication and division -fun division_N : N ; fun divisional_A : A ; fun divisor_N : N ; fun divorce_N : N ; @@ -17960,9 +17914,9 @@ fun drive_up_V2 : V2 ; fun drivel_N : N ; fun drivel_V : V ; fun driveller_N : N ; -fun driverFem_N : N ; -fun driverMasc_N : N ; -fun driver_N : N ; +fun driver_N : N ; -- | device driver +fun driverFem_N : N ; -- | taxi driver +fun driverMasc_N : N ; -- | taxi driver fun driveshaft_N : N ; fun driveway_N : N ; fun driving_A : A ; @@ -18583,7 +18537,6 @@ fun economize_V2 : V2 ; fun economizer_N : N ; fun economy_1_N : N ; -- | the country has a good economy fun economy_2_N : N ; -- | saving money -fun economy_N : N ; fun ecosystem_N : N ; fun ecoterrorism_N : N ; fun ecotourism_N : N ; @@ -19252,7 +19205,6 @@ fun encyclopedist_N : N ; fun encysted_A : A ; fun end_1_N : N ; -- | the end of his life fun end_2_N : N ; -- | the other end of the room -fun end_N : N ; fun end_V : V ; fun end_V2 : V2 ; --subcat fun end_VA : VA ; @@ -19554,7 +19506,6 @@ fun entropy_N : N ; fun entrust_V2 : V2 ; fun entry_1_N : N ; -- | no entry fun entry_2_N : N ; -- | lexical entry -fun entry_N : N ; fun entwin_V : V ; fun entwine_V2 : V2 ; fun enucleation_N : N ; @@ -20185,7 +20136,6 @@ fun evict_V2 : V2 ; fun eviction_N : N ; fun evidence_1_N : N ; -- | give me some evidence fun evidence_2_N : N ; -- | the evidence of his opinion -fun evidence_N : N ; fun evidence_V2 : V2 ; fun evident_A : A ; fun evidential_A : A ; @@ -20541,7 +20491,6 @@ fun explore_V2 : V2 ; fun explore_VS : VS ; fun explorerFem_N : N ; fun explorerMasc_N : N ; -fun explorer_N : N ; fun explosion_N : N ; fun explosive_A : A ; fun explosive_N : N ; @@ -20902,7 +20851,6 @@ fun falconry_N : N ; fun falkirk_PN : PN ; fun fall_1_N : N ; -- | rise and fall fun fall_2_N : N ; -- | autumn -fun fall_N : N ; fun fall_V : V ; --subcat fun fall_V2 : V2 ; --subcat fun fall_VA : VA ; @@ -20972,7 +20920,6 @@ fun famulus_N : N ; fun fan_1_N : N ; fun fan_2_N : N ; fun fan_3_N : N ; -fun fan_N : N ; fun fan_V : V ; fun fan_V2 : V2 ; fun fan_belt_N : N ; @@ -21194,7 +21141,6 @@ fun favourable_A : A ; fun favouriteFem_N : N ; fun favouriteMasc_N : N ; fun favourite_A : A ; -fun favourite_N : N ; fun favouritism_N : N ; fun favus_N : N ; fun fawley_PN : PN ; @@ -21344,7 +21290,6 @@ fun feminism_N : N ; fun feministFem_N : N ; fun feministMasc_N : N ; fun feminist_A : A ; -fun feminist_N : N ; fun feminization_N : N ; fun femoral_A : A ; fun femtochemistry_N : N ; @@ -21556,7 +21501,6 @@ fun field_1_N : N ; -- | cotton field fun field_2_N : N ; -- | field work fun field_3_N : N ; -- | sports field fun field_4_N : N ; -- | algebraic structure -fun field_N : N ; fun field_V : V ; fun field_V2 : V2 ; fun field_hospital_N : N ; @@ -21596,7 +21540,6 @@ fun figuration_N : N ; fun figurative_A : A ; fun figure_1_N : N ; -- | a round figure fun figure_2_N : N ; -- | convincing figures -fun figure_N : N ; fun figure_V : V ; --subcat fun figure_V2 : V2 ; --subcat fun figure_V2V : V2V ; @@ -21656,7 +21599,6 @@ fun fillip_N : N ; fun filly_N : N ; fun film_1_N : N ; -- | movie fun film_2_N : N ; -- | thin layer -fun film_N : N ; fun film_V : V ; fun film_V2 : V2 ; fun film_star_N : N ; @@ -21779,7 +21721,6 @@ fun fir_N : N ; fun fir_cone_N : N ; fun fire_1_N : N ; --- ?? fun fire_2_N : N ; --- ?? -fun fire_N : N ; fun fire_V : V ; fun fire_V2 : V2 ; fun fire_alarm_N : N ; @@ -22625,7 +22566,6 @@ fun forehanded_A : A ; fun forehead_N : N ; fun foreign_1_A : A ; -- | a foreign citizen fun foreign_2_A : A ; -- | don't throw foreign objects into the toilet -fun foreign_A : A ; fun foreigner_N : N ; fun foreignness_N : N ; fun foreknow_V : V ; @@ -22711,7 +22651,6 @@ fun forint_N : N ; fun fork_1_N : N ; fun fork_3_N : N ; fun fork_4_N : N ; -fun fork_N : N ; fun fork_V : V ; fun fork_V2 : V2 ; fun fork_out_V : V ; @@ -23457,7 +23396,6 @@ fun futon_N : N ; fun future_1_N : N ; fun future_3_N : N ; fun future_A : A ; -fun future_N : N ; fun futureless_A : A ; fun futurism_N : N ; fun futuristFem_N : N ; @@ -23608,7 +23546,6 @@ fun game_1_N : N ; -- | card game fun game_2_N : N ; -- | children's game fun game_3_N : N ; -- | eat game fun game_A : A ; -fun game_N : N ; fun game_V : V ; fun game_V2 : V2 ; fun game_bag_N : N ; @@ -23691,7 +23628,6 @@ fun garden_V : V ; fun garden_truck_N : N ; fun gardenerFem_N : N ; fun gardenerMasc_N : N ; -fun gardener_N : N ; fun gardenia_N : N ; fun gardening_N : N ; fun gareth_PN : PN ; @@ -24016,7 +23952,6 @@ fun geologic_A : A ; fun geological_A : A ; fun geologistFem_N : N ; fun geologistMasc_N : N ; -fun geologist_N : N ; fun geology_N : N ; fun geomancer_N : N ; fun geomancy_N : N ; @@ -25337,7 +25272,6 @@ fun grouch_V : V ; fun grouchy_A : A ; fun ground_1_N : N ; -- | ground zero fun ground_2_N : N ; -- | on dubious grounds -fun ground_N : N ; fun ground_V : V ; fun ground_V2 : V2 ; fun ground_bait_N : N ; @@ -26108,7 +26042,6 @@ fun harbour_V2 : V2 ; fun harbourage_N : N ; fun hard_1_A : A ; -- | hard surface fun hard_2_A : A ; -- | hard problem -fun hard_A : A ; fun hard_Adv : Adv ; fun hard_baked_A : A ; fun hard_bitten_A : A ; @@ -29164,7 +29097,6 @@ fun indenture_V2 : V2 ; fun independence_N : N ; fun independent_1_A : A ; -- | independent of her parents fun independent_2_A : A ; -- | Andorra is an independent state -fun independent_A : A ; fun independent_N : N ; fun independently_Adv : Adv ; fun indescribable_A : A ; @@ -29859,7 +29791,6 @@ fun intellectual_N : N ; fun intellectualization_N : N ; fun intelligence_1_N : N ; fun intelligence_2_N : N ; -fun intelligence_N : N ; fun intelligent_A : A ; fun intelligentsia_N : N ; fun intelligibility_N : N ; @@ -29934,7 +29865,6 @@ fun interdisciplinary_A : A ; fun interest_1_N : N ; -- | interest in literature fun interest_2_N : N ; -- | loan with a high interest rate fun interest_4_N : N ; -fun interest_N : N ; fun interest_V : V ; fun interest_V2 : V2 ; fun interested_A : A ; @@ -30523,7 +30453,6 @@ fun israeli_A : A ; fun israeli_N : N ; fun issue_1_N : N ; -- | this is not an issue fun issue_2_N : N ; -- | the next issue of the magazine -fun issue_N : N ; fun issue_V : V ; fun issue_V2 : V2 ; fun issue_forth_V : V ; @@ -31360,8 +31289,8 @@ fun keurboom_N : N ; fun kevin_PN : PN ; fun key_1_N : N ; -- | key to my house fun key_2_N : N ; -- | the D major key +fun key_3_N : N ; -- | the keyboard key fun key_A : A ; -fun key_N : N ; fun key_V2 : V2 ; fun key_down_V : V ; fun key_in_V2 : V2 ; @@ -32317,7 +32246,6 @@ fun lavish_V2 : V2 ; fun lavishness_N : N ; fun law_1_N : N ; -- | the law forbids it fun law_2_N : N ; -- | he studies law -fun law_N : N ; fun law_abiding_A : A ; fun law_officer_N : N ; fun lawbreaker_N : N ; @@ -32418,7 +32346,6 @@ fun leaflike_A : A ; fun leafy_A : A ; fun league_1_N : N ; -- | league of criminals fun league_2_N : N ; -- | football league -fun league_N : N ; fun league_V : V ; fun league_V2 : V2 ; fun leak_N : N ; @@ -32735,7 +32662,6 @@ fun lethargy_N : N ; fun lethe_PN : PN ; fun letter_1_N : N ; ---- which is which?? fun letter_2_N : N ; -fun letter_N : N ; fun letter_box_N : N ; fun letter_card_N : N ; fun letter_case_N : N ; @@ -32776,7 +32702,6 @@ fun levee_N : N ; fun level_1_N : N ; -- | reach a high level fun level_2_N : N ; -- | level 4 of the building fun level_A : A ; -fun level_N : N ; fun level_V : V ; fun level_V2 : V2 ; fun level_headed_A : A ; @@ -33259,7 +33184,6 @@ fun listen_out_for_V2 : V2 ; fun listen_up_V : V ; fun listenerFem_N : N ; fun listenerMasc_N : N ; -fun listener_N : N ; fun listening_N : N ; fun lister_N : N ; fun listeria_N : N ; @@ -34996,7 +34920,6 @@ fun mastectomy_N : N ; fun masted_A : A ; fun master_1_N : N ; -- | master and slave fun master_2_N : N ; -- | school master -fun master_N : N ; fun master_V2 : V2 ; fun master_at_arms_N : N ; fun master_key_N : N ; @@ -35037,7 +34960,6 @@ fun matai_N : N ; fun match_1_N : N ; -- | football match fun match_2_N : N ; -- | match box fun match_3_N : N ; -- | perfect match -fun match_N : N ; --subcat fun match_V : V ; fun match_V2 : V2 ; fun match_point_N : N ; @@ -35053,8 +34975,10 @@ fun matchmaking_N : N ; fun matchstick_N : N ; fun matchweed_N : N ; fun matchwood_N : N ; -fun mate_1_N : N ; -fun mate_2_N : N ; +fun mateMasc_1_N : N ; +fun mateFem_1_N : N ; +fun mateMasc_2_N : N ; +fun mateFem_2_N : N ; fun mate_N : N ; fun mate_V : V ; fun mate_V2 : V2 ; @@ -35082,7 +35006,6 @@ fun mathematical_A : A ; fun mathematically_Adv : Adv ; fun mathematicianFem_N : N ; fun mathematicianMasc_N : N ; -fun mathematician_N : N ; fun mathematics_N : N ; fun maths_N : N ; fun matinee_N : N ; @@ -35129,7 +35052,6 @@ fun mature_V2 : V2 ; fun maturity_1_N : N ; fun maturity_2_N : N ; fun maturity_3_N : N ; -fun maturity_N : N ; fun matutinal_A : A ; fun matzo_N : N ; fun maud_PN : PN ; @@ -36238,7 +36160,6 @@ fun miniseries_N : N ; fun miniskirt_N : N ; fun minister_1_N : N ; -- | prime minister fun minister_2_N : N ; -- | minister in church -fun minister_N : N ; fun minister_V : V ; fun ministerial_A : A ; fun ministrant_A : A ; @@ -37187,7 +37108,6 @@ fun movable_A : A ; fun move_1_V : V ; -- | it doesn't move any more fun move_2_V : V ; -- | move to a new house fun move_N : N ; -fun move_V : V ; fun move_V2 : V2 ; --subcat fun move_V2A : V2A ; --subcat fun move_V2V : V2V ; @@ -37488,7 +37408,6 @@ fun musicality_N : N ; fun musically_Adv : Adv ; fun musicianFem_N : N ; fun musicianMasc_N : N ; -fun musician_N : N ; fun musicianship_N : N ; fun musicological_A : A ; fun musicologist_N : N ; @@ -37719,7 +37638,6 @@ fun nairn_PN : PN ; fun nairobi_PN : PN ; fun naive_1_A : A ; fun naive_2_A : A ; -fun naive_A : A ; fun naivete_N : N ; fun naivety_N : N ; fun naked_A : A ; @@ -38545,7 +38463,6 @@ fun nobility_N : N ; fun nobleFem_N : N ; fun nobleMasc_N : N ; fun noble_A : A ; -fun noble_N : N ; fun noble_mindedness_N : N ; fun nobleman_N : N ; fun noblesse_N : N ; @@ -39021,7 +38938,6 @@ fun notch_V2 : V2 ; fun note_1_N : N ; -- | take notes fun note_2_N : N ; -- | make notes fun note_3_N : N ; -- | notes in music -fun note_N : N ; fun note_V : V ; fun note_V2 : V2 ; fun note_VS : VS ; @@ -39148,7 +39064,6 @@ fun numbat_N : N ; fun number_1_N : N ; -- | number five fun number_2_N : N ; -- | a number of people fun number_3_N : N ; -- | numbers singular and plural -fun number_N : N ; fun number_V2 : V2 ; fun numberless_A : A ; fun numberplate_N : N ; @@ -39538,7 +39453,6 @@ fun offend_V : V ; fun offend_V2 : V2 ; fun offenderFem_N : N ; fun offenderMasc_N : N ; -fun offender_N : N ; fun offense_N : N ; fun offenseless_A : A ; fun offensive_A : A ; @@ -39569,11 +39483,9 @@ fun officeholder_N : N ; fun officer_1_N : N ; -- | financial officer fun officer_2_N : N ; -- | army officer fun officer_3_N : N ; -- | police officer -fun officer_N : N ; fun officialFem_N : N ; fun officialMasc_N : N ; fun official_A : A ; -fun official_N : N ; fun officialdom_N : N ; fun officialese_N : N ; fun officially_Adv : Adv ; @@ -39926,7 +39838,6 @@ fun opp_PN : PN ; fun opponentFem_N : N ; fun opponentMasc_N : N ; fun opponent_A : A ; -fun opponent_N : N ; fun opportune_A : A ; fun opportuneness_N : N ; fun opportunism_N : N ; @@ -39997,7 +39908,6 @@ fun orang_utan_N : N ; fun orange_1_N : N ; -- | round yellow to orange fruit of any of several citrus trees fun orange_2_N : N ; -- | orange color or pigment ; any of a range of colors between red and yellow fun orange_A : A ; -fun orange_N : N ; fun orangeade_N : N ; fun orangeman_N : N ; fun orangery_N : N ; @@ -40007,7 +39917,6 @@ fun orate_V : V ; fun oration_N : N ; fun oratorFem_N : N ; fun oratorMasc_N : N ; -fun orator_N : N ; fun oratorical_A : A ; fun oratorio_N : N ; fun oratory_N : N ; @@ -40121,7 +40030,6 @@ fun originate_V : V ; fun originate_V2 : V2 ; fun originatorFem_N : N ; fun originatorMasc_N : N ; -fun originator_N : N ; fun oriole_N : N ; fun orison_N : N ; fun orkney_PN : PN ; @@ -40868,7 +40776,6 @@ fun pacifier_N : N ; fun pacifism_N : N ; fun pacifistFem_N : N ; fun pacifistMasc_N : N ; -fun pacifist_N : N ; fun pacifistically_Adv : Adv ; fun pacify_V2 : V2 ; fun pacing_N : N ; @@ -41119,7 +41026,8 @@ fun pampas_grass_N : N ; fun pamper_V2 : V2 ; fun pamperer_N : N ; fun pamphlet_N : N ; -fun pamphleteer_N : N ; +fun pamphleteerMasc_N : N ; +fun pamphleteerFem_N : N ; fun pamplona_PN : PN ; fun pan_N : N ; fun pan_V : V ; @@ -41550,7 +41458,6 @@ fun parturient_A : A ; fun parturition_N : N ; fun party_1_N : N ; -- | birthday party fun party_2_N : N ; -- | political party -fun party_N : N ; fun party_spirit_N : N ; fun party_spirited_A : A ; fun party_wall_N : N ; @@ -41677,7 +41584,6 @@ fun patchwork_N : N ; fun patchy_A : A ; fun pate_1_N : N ; fun pate_2_N : N ; -fun pate_N : N ; fun pate_de_foie_gras_N : N ; fun patella_N : N ; fun patellar_A : A ; @@ -41899,7 +41805,6 @@ fun pearly_A : A ; fun pearmain_N : N ; fun peasantFem_N : N ; fun peasantMasc_N : N ; -fun peasant_N : N ; fun peasanthood_N : N ; fun peasantry_N : N ; fun pease_N : N ; @@ -42281,7 +42186,6 @@ fun perform_V : V ; fun perform_V2 : V2 ; fun performance_1_N : N ; -- | high level of performance fun performance_2_N : N ; -- | he made a strange performance -fun performance_N : N ; fun performer_N : N ; fun perfume_N : N ; fun perfume_V2 : V2 ; @@ -42329,7 +42233,6 @@ fun perineurium_N : N ; fun period_1_N : N ; -- | it was a long period in her life fun period_2_N : N ; -- | period or comma fun period_3_N : N ; -- | she had her period -fun period_N : N ; fun periodic_A : A ; fun periodical_A : A ; fun periodical_N : N ; @@ -42910,7 +42813,6 @@ fun pianissimo_A : A ; fun pianissimo_Adv : Adv ; fun pianistFem_N : N ; fun pianistMasc_N : N ; -fun pianist_N : N ; fun pianistic_A : A ; fun piano_A : A ; fun piano_Adv : Adv ; @@ -43507,15 +43409,13 @@ fun platysma_N : N ; fun plaudit_N : N ; fun plausibility_N : N ; fun plausible_A : A ; -fun play_1_V : V ; -- | play in a football team +fun play_1_V : V ; -- | play in a football team fun play_1_V2 : V2 ; -- | play football -fun play_2_V : V ; -- | children play +fun play_2_V : V ; -- | children play fun play_2_V2 : V2 ; -- | play mum and dad -fun play_3_V : V ; -- | play in the band +fun play_3_V : V ; -- | play in the band fun play_3_V2 : V2 ; -- | play the guitar fun play_N : N ; -fun play_V : V ; -fun play_V2 : V2 ; --subcat fun play_VV : VV ; fun play_acting_N : N ; fun play_actor_N : N ; @@ -43854,7 +43754,6 @@ fun poilu_N : N ; fun poinsettia_N : N ; fun point_1_N : N ; -- | at this point fun point_2_N : N ; -- | he got six points -fun point_N : N ; fun point_V : V ; fun point_V2 : V2 ; fun point_blank_A : A ; @@ -44154,7 +44053,6 @@ fun poop_out_on_V2 : V2 ; fun poor_1_A : A ; -- | poor or rich fun poor_2_A : A ; -- | poor him fun poor_3_A : A ; -- | poor quality -fun poor_A : A ; fun poor_box_N : N ; fun poor_rate_N : N ; fun poor_spirited_A : A ; @@ -44895,7 +44793,6 @@ fun preside_V : V ; fun presidency_N : N ; fun presidentFem_N : N ; fun presidentMasc_N : N ; -fun president_N : N ; fun presidential_A : A ; fun presidio_N : N ; fun presidium_N : N ; @@ -45346,7 +45243,6 @@ fun programme_N : N ; fun programme_V2 : V2 ; fun programmerFem_N : N ; fun programmerMasc_N : N ; -fun programmer_N : N ; fun programming_N : N ; fun progress_N : N ; fun progress_V : V ; @@ -45505,7 +45401,6 @@ fun properly_Adv : Adv ; fun propertied_A : A ; fun property_1_N : N ; -- | some bad properties fun property_2_N : N ; -- | an enormous property -fun property_N : N ; fun property_man_N : N ; fun property_master_N : N ; fun propertyless_A : A ; @@ -45577,7 +45472,6 @@ fun prosecute_V2 : V2 ; fun prosecution_N : N ; fun prosecutorFem_N : N ; fun prosecutorMasc_N : N ; -fun prosecutor_N : N ; fun proselyte_N : N ; fun proselytism_N : N ; fun proselytize_V : V ; @@ -46705,7 +46599,6 @@ fun rabies_N : N ; fun raccoon_N : N ; fun race_1_N : N ; -- | win the race fun race_2_N : N ; -- | the human race -fun race_N : N ; fun race_V : V ; fun race_V2 : V2 ; fun race_V2V : V2V ; @@ -47509,7 +47402,6 @@ fun record_1_N : N ; -- | Guinness book of records fun record_2_N : N ; -- | Beatles records fun record_3_N : N ; -- | we keep a record of visitors fun record_A : A ; -fun record_N : N ; fun record_V2 : V2 ; fun record_breaking_A : A ; fun record_player_N : N ; @@ -47824,7 +47716,6 @@ fun reggae_N : N ; fun regicide_N : N ; fun regime_1_N : N ; fun regime_2_N : N ; -fun regime_N : N ; fun regimen_N : N ; fun regiment_N : N ; fun regiment_V2 : V2 ; @@ -48110,7 +48001,6 @@ fun rending_A : A ; fun rendition_N : N ; fun renegadeFem_N : N ; fun renegadeMasc_N : N ; -fun renegade_N : N ; fun renegade_V : V ; fun renege_V : V ; fun renegotiate_V2 : V2 ; @@ -48245,7 +48135,6 @@ fun reportage_N : N ; fun reportedly_Adv : Adv ; fun reporterFem_N : N ; fun reporterMasc_N : N ; -fun reporter_N : N ; fun reporting_N : N ; fun repose_N : N ; fun repose_V : V ; @@ -48271,7 +48160,6 @@ fun representations_N : N ; fun representativeFem_N : N ; fun representativeMasc_N : N ; fun representative_A : A ; -fun representative_N : N ; fun repress_V2 : V2 ; fun repression_N : N ; fun repressive_A : A ; @@ -48367,7 +48255,6 @@ fun research_V : V ; fun research_V2 : V2 ; fun researcherFem_N : N ; fun researcherMasc_N : N ; -fun researcher_N : N ; fun reseat_V2 : V2 ; fun reseau_N : N ; fun resection_N : N ; @@ -48932,7 +48819,6 @@ fun ride_out_V2 : V2 ; fun ride_up_V : V ; fun riderFem_N : N ; fun riderMasc_N : N ; -fun rider_N : N ; fun riderless_A : A ; fun ridge_N : N ; fun ridge_V2 : V2 ; @@ -48978,8 +48864,6 @@ fun right_1_A : A ; -- | right or wrong fun right_1_Adv : Adv ; -- | right or wrong fun right_2_A : A ; -- | right or left fun right_2_Adv : Adv ; -- | right or left -fun right_A : A ; -fun right_Adv : Adv ; fun right_Interj : Interj ; fun right_N : N ; fun right_V2 : V2 ; @@ -49258,7 +49142,6 @@ fun roil_V2 : V2 ; fun roisterer_N : N ; fun role_1_N : N ; fun role_2_N : N ; -fun role_N : N ; fun roleplaying_N : N ; fun roll_N : N ; fun roll_V : V ; @@ -50011,7 +49894,6 @@ fun saintliness_N : N ; fun saintly_A : A ; fun sake_1_N : N ; fun sake_2_N : N ; -fun sake_N : N ; fun saki_N : N ; fun sal_volatile_N : N ; fun salaam_N : N ; @@ -51467,7 +51349,6 @@ fun sell_out_V2 : V2 ; fun sell_up_V2 : V2 ; fun sellerFem_N : N ; fun sellerMasc_N : N ; -fun seller_N : N ; fun selling_N : N ; fun selloff_N : N ; fun sellout_N : N ; @@ -51774,7 +51655,6 @@ fun serum_N : N ; fun serval_N : N ; fun servantFem_N : N ; fun servantMasc_N : N ; -fun servant_N : N ; fun serve_N : N ; fun serve_V : V ; fun serve_V2 : V2 ; @@ -51806,8 +51686,7 @@ fun sessile_A : A ; fun session_N : N ; fun sestet_N : N ; fun set_1_N : N ; -- | a reparation set -fun set_2_N : N ; -- | an infinite set -fun set_N : N ; +fun set_2_N : N ; -- | an infinite set --subcat fun set_V : V ; fun set_V2 : V2 ; --subcat fun set_VS : VS ; @@ -52912,7 +52791,6 @@ fun singhalese_A : A ; fun singing_N : N ; fun single_1_A : A ; -- | a single ticket fun single_2_A : A ; -- | a single woman -fun single_A : A ; fun single_N : N ; fun single_V2 : V2 ; fun single_breasted_A : A ; @@ -54062,7 +53940,6 @@ fun solicit_V2 : V2 ; fun solicitation_N : N ; fun solicitorFem_N : N ; fun solicitorMasc_N : N ; -fun solicitor_N : N ; fun solicitor_general_N : N ; fun solicitorship_N : N ; fun solicitous_A : A ; @@ -54562,7 +54439,6 @@ fun spectacular_A : A ; fun spectacular_N : N ; fun spectatorFem_N : N ; fun spectatorMasc_N : N ; -fun spectator_N : N ; fun spectinomycin_N : N ; fun spectral_A : A ; fun spectre_N : N ; @@ -54942,7 +54818,6 @@ fun spotty_A : A ; fun spousal_A : A ; fun spouseFem_N : N ; fun spouseMasc_N : N ; -fun spouse_N : N ; fun spout_N : N ; fun spout_V : V ; fun spout_V2 : V2 ; @@ -55217,7 +55092,6 @@ fun staddle_N : N ; fun stadium_N : N ; fun staff_1_N : N ; -- | staff of 50 persons fun staff_2_N : N ; -- | pike staff -fun staff_N : N ; fun staff_V2 : V2 ; fun staff_office_N : N ; fun staff_up_V2 : V2 ; @@ -55439,7 +55313,6 @@ fun starter_4_N : N ; fun starter_5_N : N ; fun starter_6_N : N ; fun starter_7_N : N ; -fun starter_N : N ; fun starting_gate_N : N ; fun starting_point_N : N ; fun starting_post_N : N ; @@ -55456,7 +55329,6 @@ fun stash_away_V2 : V2 ; fun stasis_N : N ; fun state_1_N : N ; -- | independent state fun state_2_N : N ; -- | state of affairs -fun state_N : N ; fun state_V2 : V2 ; fun state_VS : VS ; fun statecraft_N : N ; @@ -56201,7 +56073,6 @@ fun stridulation_N : N ; fun strife_N : N ; fun strike_1_N : N ; -- | a group's refusal to work in protest against low pay or bad work conditions fun strike_2_N : N ; -- | an attack that is intended to seize or inflict damage on or destroy an objective -fun strike_N : N ; fun strike_V : V ; fun strike_V2 : V2 ; fun strike_back_V : V ; @@ -56320,7 +56191,6 @@ fun stud_mare_N : N ; fun studbook_N : N ; fun studentFem_N : N ; fun studentMasc_N : N ; -fun student_N : N ; fun studentship_N : N ; fun studio_N : N ; fun studious_A : A ; @@ -56466,7 +56336,6 @@ fun subject_1_N : N ; -- | subject matter fun subject_2_N : N ; -- | subject and object fun subject_A : A ; fun subject_A2 : A2 ; -fun subject_N : N ; fun subject_V2 : V2 ; fun subject_to_Prep : Prep ; fun subjection_N : N ; @@ -58141,7 +58010,6 @@ fun teach_in_N : N ; fun teachable_A : A ; fun teacherFem_N : N ; fun teacherMasc_N : N ; -fun teacher_N : N ; fun teachership_N : N ; fun teaching_N : N ; fun teacup_N : N ; @@ -58904,7 +58772,6 @@ fun think_up_V2 : V2 ; fun thinkable_A : A ; fun thinkerFem_N : N ; fun thinkerMasc_N : N ; -fun thinker_N : N ; fun thinking_A : A ; fun thinking_N : N ; fun thinness_N : N ; @@ -59284,7 +59151,6 @@ fun timbre_N : N ; fun timbrel_N : N ; fun time_1_N : N ; -- | we have no time fun time_2_N : N ; -- | I was there four times -fun time_N : N ; fun time_V2 : V2 ; fun time_ball_N : N ; fun time_bomb_N : N ; @@ -61038,7 +60904,6 @@ fun typhus_N : N ; fun typical_1_A : A ; fun typical_2_A : A ; fun typical_3_A : A ; -fun typical_A : A ; fun typicality_N : N ; fun typically_Adv : Adv ; fun typification_N : N ; @@ -61652,7 +61517,8 @@ fun understanding_N : N ; fun understate_V2 : V2 ; fun understatement_N : N ; fun understock_V2 : V2 ; -fun understudy_N : N ; +fun understudyMasc_N : N ; +fun understudyFem_N : N ; fun understudy_V2 : V2 ; fun undersurface_N : N ; fun undertake_V2 : V2 ; @@ -62088,7 +61954,6 @@ fun unit_3_N : N ; fun unit_4_N : N ; fun unit_5_N : N ; fun unit_6_N : N ; -fun unit_N : N ; fun unit_V2V : V2V ; fun unitarian_A : A ; fun unitarian_N : N ; @@ -63023,7 +62888,6 @@ fun useless_A : A ; fun uselessness_N : N ; fun userFem_N : N ; fun userMasc_N : N ; -fun user_N : N ; fun ushaw_moor_PN : PN ; fun usher_N : N ; fun usher_V2 : V2 ; @@ -63246,7 +63110,6 @@ fun variegation_N : N ; fun varietal_N : N ; fun variety_1_N : N ; -- | there's a great variety fun variety_2_N : N ; -- | the best variety -fun variety_N : N ; fun variform_A : A ; fun variolar_A : A ; fun variolation_N : N ; @@ -63642,7 +63505,6 @@ fun vietnamese_A : A ; fun vietnamese_N : N ; fun view_1_N : N ; -- | room with a view fun view_2_N : N ; -- | people with strange views -fun view_N : N ; fun view_V2 : V2 ; fun viewable_A : A ; fun viewer_N : N ; @@ -63720,7 +63582,6 @@ fun violet_PN : PN ; fun violin_N : N ; fun violinistFem_N : N ; fun violinistMasc_N : N ; -fun violinist_N : N ; fun violistFem_N : N ; fun violistMasc_N : N ; fun viomycin_N : N ; @@ -63924,7 +63785,6 @@ fun voluntary_A : A ; fun voluntary_N : N ; fun volunteerFem_N : N ; fun volunteerMasc_N : N ; -fun volunteer_N : N ; fun volunteer_V : V ; fun volunteer_V2 : V2 ; --subcat fun volunteer_V2V : V2V ; @@ -64501,7 +64361,6 @@ fun waxycap_N : N ; fun way_1_N : N ; -- | the way to the city fun way_2_N : N ; -- | do it the proper way fun way_Adv : Adv ; -fun way_N : N ; fun way_out_A : A ; fun waybill_N : N ; fun wayfarer_N : N ; @@ -64575,12 +64434,12 @@ fun weathervane_N : N ; fun weave_N : N ; fun weave_V : V ; fun weave_V2 : V2 ; -fun weaver_N : N ; +fun weaverMasc_N : N ; +fun weaverFem_N : N ; fun weaverbird_N : N ; fun weaving_N : N ; fun web_1_N : N ; -- | www fun web_2_N : N ; -- | spider web -fun web_N : N ; fun web_footed_A : A ; fun web_toed_A : A ; fun webbed_A : A ; @@ -65531,7 +65390,6 @@ fun wordy_A : A ; fun work_1_V : V ; -- | I just work here fun work_2_V : V ; -- | the computer doesn't work fun work_N : N ; -fun work_V : V ; fun work_V2 : V2 ; --subcat fun work_VV : VV ; fun work_in_N : N ; @@ -65905,7 +65763,6 @@ fun yesterday_N : N ; fun yet_1_Adv : Adv ; -- | we are not there yet fun yet_2_Adv : Adv ; -- | yet he was not satisfied fun yet_AdV : AdV ; -fun yet_Adv : Adv ; fun yeti_N : N ; fun yew_N : N ; fun yew_tree_N : N ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index cb162eda3..2a7adb43c 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -669,12 +669,10 @@ lin activism_N = mkN "activism"; lin activistFem_N = mkN feminine (mkN "activist" "activists"); lin activistMasc_N = mkN masculine (mkN "activist" "activists"); lin activist_A = mkA "activist" ; -lin activist_N = mkN "activist" ; lin activity_N = mkN "activity" "activities"; lin actomyosin_N = mkN "actomyosin" ; -lin actor_1_N = mkN "actor" ; -lin actor_2_N = mkN "actor" ; -lin actor_N = mkN masculine (mkN "actor" "actors"); +lin actor_1_N = mkN masculine (mkN "actor" "actors"); +lin actor_2_N = mkN masculine (mkN "actor" "actors"); lin actress_N = mkN feminine (mkN "actress" "actresses"); lin actual_A = compoundA (mkA "actual"); lin actuality_N = mkN "actuality" "actualities"; @@ -855,7 +853,6 @@ lin administrative_A = compoundA (mkA "administrative"); lin administratively_Adv = mkAdv "administratively" ; lin administratorFem_N = mkN feminine (mkN "administrator" "administrators"); lin administratorMasc_N = mkN masculine (mkN "administrator" "administrators"); -lin administrator_N = mkN "administrator" ; lin administrivia_N = mkN "administrivia" ; lin admirability_N = mkN "admirability" ; lin admirable_A = compoundA (mkA "admirable"); @@ -1000,14 +997,12 @@ lin advise_VS = mkVS (mkV "advise" "advises" "advised" "advised" "advising"); lin advisee_N = mkN "advisee" ; lin adviserFem_N = mkN feminine (mkN "adviser" "advisers"); lin adviserMasc_N = mkN masculine (mkN "adviser" "advisers"); -lin adviser_N = mkN "adviser" ; lin advisor_N = mkN "advisor" ; lin advisory_A = compoundA (mkA "advisory"); lin advisory_N = mkN "advisory" ; lin advocacy_N = mkN "advocacy" ; lin advocateFem_N = mkN feminine (mkN "advocate" "advocates"); lin advocateMasc_N = mkN masculine (mkN "advocate" "advocates"); -lin advocate_N = mkN "advocate" ; lin advocate_V2 = mkV2 (mkV "advocate" "advocates" "advocated" "advocated" "advocating"); lin advocate_VS = mkVS (mkV "advocate"); lin advowson_N = mkN "advowson" "advowsons"; @@ -1246,7 +1241,6 @@ lin agenda_N = mkN "agenda" "agendas"; lin agenesis_N = mkN "agenesis" ; lin agentFem_N = mkN feminine (mkN "agent" "agents"); lin agentMasc_N = mkN masculine (mkN "agent" "agents"); -lin agent_N = mkN "agent" ; lin agent_provocateur_N = mkN "agent provocateur" "agents provocateurs"; lin agential_A = mkA "agential" ; lin agerasia_N = mkN "agerasia" ; @@ -1611,7 +1605,6 @@ lin alidade_N = mkN "alidade" ; lin alienFem_N = mkN feminine (mkN "alien" "aliens"); lin alienMasc_N = mkN masculine (mkN "alien" "aliens"); lin alien_A = compoundA (mkA "alien"); -lin alien_N = mkN "alien" ; lin alienable_A = mkA "alienable" ; lin alienage_N = mkN "alienage" ; lin alienate_V2 = mkV2 (mkV "alienate" "alienates" "alienated" "alienated" "alienating"); @@ -1932,7 +1925,6 @@ lin amastia_N = mkN "amastia" ; lin amateurFem_N = mkN feminine (mkN "amateur" "amateurs"); lin amateurMasc_N = mkN masculine (mkN "amateur" "amateurs"); lin amateur_A = mkA "amateur" ; -lin amateur_N = mkN "amateur" ; lin amateurish_A = compoundA (mkA "amateurish"); lin amateurishness_N = mkN "amateurishness" ; lin amateurism_N = mkN "amateurism" ; @@ -2262,7 +2254,6 @@ lin anarchically_Adv = mkAdv "anarchically"; lin anarchism_N = mkN "anarchism" ; lin anarchistFem_N = mkN feminine (mkN "anarchist" "anarchists"); lin anarchistMasc_N = mkN masculine (mkN "anarchist" "anarchists"); -lin anarchist_N = mkN "anarchist" ; lin anarchistic_A = mkA "anarchistic" ; lin anarchy_N = mkN "anarchy" ; lin anarthria_N = mkN "anarthria" ; @@ -2694,7 +2685,6 @@ lin anthropolatry_N = mkN "anthropolatry" ; lin anthropological_A = compoundA (mkA "anthropological"); lin anthropologistFem_N = mkN feminine (mkN "anthropologist" "anthropologists"); lin anthropologistMasc_N = mkN masculine (mkN "anthropologist" "anthropologists"); -lin anthropologist_N = mkN "anthropologist" ; lin anthropology_N = mkN "anthropology" ; lin anthropometric_A = mkA "anthropometric" ; lin anthropometry_N = mkN "anthropometry" ; @@ -3121,8 +3111,7 @@ lin applique_N = mkN "appliqué" ; lin applique_V2 = mkV2 (mkV "appliqué" "appliqués" "appliquéed" "appliquéed" "appliquéing"); lin apply_V = mkV "apply" "applies" "applied" "applied" "applying"; lin apply_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying"); -lin apply_1_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying"); -lin apply_2_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying") for_Prep ; +lin apply_for_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying") for_Prep ; lin apply_V2V = mkV2V (mkV "apply" "applies" "applied" "applied" "applying") noPrep to_Prep ; lin apply_VV = mkVV (mkV "apply" "applies" "applied" "applied" "applying"); lin appoint_V2 = mkV2 (mkV "appoint" "appoints" "appointed" "appointed" "appointing"); @@ -3336,7 +3325,6 @@ lin archipelagic_A = mkA "archipelagic" ; lin archipelago_N = mkN "archipelago" "archipelagos"; lin architectFem_N = mkN feminine (mkN "architect" "architects"); lin architectMasc_N = mkN masculine (mkN "architect" "architects"); -lin architect_N = mkN "architect" ; lin architectonics_N = mkN "architectonics" ; lin architectural_A = compoundA (mkA "architectural"); lin architecture_N = mkN "architecture" ; @@ -3369,7 +3357,6 @@ lin area_3_N = mkN "area" "areas"; lin area_4_N = mkN "area" "areas"; lin area_5_N = mkN "area" "areas"; lin area_6_N = mkN "area" "areas"; -lin area_N = mkN "area" ; lin areal_A = mkA "areal" ; lin areaway_N = mkN "areaway" ; lin areca_N = mkN "areca" "arecas"; @@ -3444,7 +3431,6 @@ lin arity_N = mkN "arity" ; lin arizona_PN = mkPN "Arizona"; lin ark_N = mkN "ark" "arks"; lin arkansas_PN = mkPN "Arkansas"; -lin arm_N = mkN "arm" "arms"; lin arm_1_N = mkN "arm" "arms"; lin arm_2_N = mkN "arm" "arms"; lin arm_V = mkV "arm" "arms" "armed" "armed" "arming"; @@ -3850,7 +3836,8 @@ lin assist_V = mkV "assist" "assists" "assisted" "assisted" "assisting"; lin assist_V2 = mkV2 (mkV "assist" "assists" "assisted" "assisted" "assisting"); lin assistance_N = mkN "assistance" ; lin assistant_A = mkA "assistant" ; -lin assistant_N = mkN human (mkN "assistant" "assistants"); +lin assistantMasc_N = mkN masculine (mkN "assistant" "assistants"); +lin assistantFem_N = mkN feminine (mkN "assistant" "assistants"); lin assistive_A = mkA "assistive" ; lin assize_N = mkN "assize" ; lin assizes_N = mkN "assizes" ; @@ -4252,9 +4239,8 @@ lin authoritarian_A = compoundA (mkA "authoritarian"); lin authoritarian_N = mkN human (mkN "authoritarian" "authoritarians"); lin authoritarianism_N = mkN "authoritarianism" ; lin authoritative_A = compoundA (mkA "authoritative"); -lin authority_1_N = mkN "authority" ; -lin authority_2_N = mkN "authority" ; -lin authority_N = mkN "authority" "authorities"; +lin authority_1_N = mkN "authority" "authorities"; +lin authority_2_N = mkN "authority" "authorities"; lin authorization_N = mkN "authorization" ; lin authorize_V2 = mkV2 (mkV "authorize" "authorizes" "authorized" "authorized" "authorizing"); lin authorize_V2V = mkV2V (mkV "authorize") noPrep to_Prep ; @@ -4389,7 +4375,6 @@ lin aviary_N = mkN "aviary" "aviaries"; lin aviation_N = mkN "aviation" ; lin aviatorFem_N = mkN feminine (mkN "aviator" "aviators"); lin aviatorMasc_N = mkN masculine (mkN "aviator" "aviators"); -lin aviator_N = mkN "aviator" ; lin aviatrix_N = mkN "aviatrix" ; lin avid_A = compoundA (mkA "avid"); lin avidity_N = mkN "avidity" ; @@ -4436,7 +4421,6 @@ lin awash_A = compoundA (mkA "awash"); lin away_1_Adv = mkAdv "away" ; lin away_2_Adv = mkAdv "away" ; lin away_A = compoundA (mkA "away"); -lin away_Adv = mkAdv "away"; lin awayness_N = mkN "awayness" ; lin awe_N = mkN "awe" ; lin awe_V2 = mkV2 (mkV "awe" "awes" "awed" "awed" "awing"); @@ -4985,9 +4969,8 @@ lin baptismal_A = compoundA (mkA "baptismal"); lin baptist_A = compoundA (mkA "baptist"); lin baptist_N = mkN "baptist" "baptists"; lin baptize_V2 = mkV2 (mkV "baptize" "baptizes" "baptized" "baptized" "baptizing"); -lin bar_1_N = mkN "bar" ; -lin bar_2_N = mkN "bar" ; -lin bar_N = mkN "bar" "bars"; +lin bar_1_N = mkN "bar" "bars"; +lin bar_2_N = mkN "bar" "bars"; lin bar_Prep = mkPrep "bar"; lin bar_V2 = mkV2 (mkV "bar" "bars" "barred" "barred" "barring"); lin baracaldo_PN = mkPN "Baracaldo"; @@ -5895,7 +5878,8 @@ lin betrayal_N = mkN "betrayal" "betrayals"; lin betrayer_N = mkN "betrayer" "betrayers"; lin betroth_V2 = mkV2 (mkV "betroth" "betroths" "betrothed" "betrothed" "betrothing"); lin betrothal_N = mkN "betrothal" "betrothals"; -lin betrothed_N = mkN "betrothed" "betrotheds"; +lin betrothedMasc_N = mkN masculine (mkN "betrothed" "betrotheds"); +lin betrothedFem_N = mkN feminine (mkN "betrothed" "betrotheds"); lin betsy_PN = mkPN "Betsy"; lin better_A = mkA "better" ; lin better_Adv = mkAdv "better"; @@ -6784,9 +6768,8 @@ lin bo'sun_N = mkN "bo'sun" "bo'suns"; lin boa_N = mkN "boa" "boas"; lin boa_constrictor_N = mkN "boa-constrictor" "boa-constrictors"; lin boar_N = mkN "boar" "boars"; -lin board_1_N = mkN "board" ; -lin board_2_N = mkN "board" ; -lin board_N = mkN "board" "boards"; +lin board_1_N = mkN "board" "boards"; +lin board_2_N = mkN "board" "boards"; --subcat lin board_V = mkV "board" "boards" "boarded" "boarded" "boarding"; lin board_V2 = mkV2 (mkV "board" "boards" "boarded" "boarded" "boarding"); lin board_out_V2 = mkV2 (partV (mkV "board") "out"); @@ -7462,7 +7445,6 @@ lin brasserie_N = mkN "brasserie" "brasseries"; lin brassie_N = mkN "brassie" ; lin brassiere_1_N = mkN "brassiere" "brassieres"; lin brassiere_2_N = mkN "brassière" "brassières"; -lin brassiere_N = mkN "brassiere" ; lin brassy_A = mkA "brassy" "brassier"; lin brat_N = mkN "brat" "brats"; lin bratislava_PN = mkPN "Bratislava"; @@ -8432,7 +8414,6 @@ lin buy_out_V2 = mkV2 (partV IrregEng.buy_V "out"); lin buy_up_V2 = mkV2 (partV IrregEng.buy_V "up"); lin buyerFem_N = mkN feminine (mkN "buyer" "buyers"); lin buyerMasc_N = mkN masculine (mkN "buyer" "buyers"); -lin buyer_N = mkN "buyer" ; lin buying_N = mkN "buying" ; lin buyout_N = mkN "buyout" ; lin buzz_N = mkN "buzz" "buzzes"; @@ -8870,7 +8851,6 @@ lin candida_N = mkN "candida" ; lin candidacy_N = mkN "candidacy"; lin candidateFem_N = mkN feminine (mkN "candidate" "candidates"); lin candidateMasc_N = mkN masculine (mkN "candidate" "candidates"); -lin candidate_N = mkN "candidate" ; lin candidature_N = mkN "candidature" "candidatures"; lin candidiasis_N = mkN "candidiasis" ; lin candle_N = mkN "candle" "candles"; @@ -8933,7 +8913,6 @@ lin canoe_V2 = mkV2 (mkV "canoe" "canoes" "canoed" "canoed" "canoeing"); lin canoeist_N = mkN "canoeist" "canoeists"; lin canon_1_N = mkN "canon" "canons"; lin canon_2_N = mkN "cañon" "cañons"; -lin canon_N = mkN "canon" ; lin canonic_A = mkA "canonic" ; lin canonical_A = compoundA (mkA "canonical"); lin canonist_A = mkA "canonist" ; @@ -9005,11 +8984,10 @@ lin capful_N = mkN "capful" ; lin capillarity_N = mkN "capillarity" ; lin capillary_A = mkA "capillary" ; lin capillary_N = mkN "capillary" "capillaries"; -lin capital_1_N = mkN "capital" ; -lin capital_2_N = mkN "capital" ; -lin capital_3_N = mkN "capital" ; +lin capital_1_N = mkN "capital" "capitals"; +lin capital_2_N = mkN "capital" "capitals"; +lin capital_3_N = mkN "capital" "capitals"; lin capital_A = compoundA (mkA "capital"); -lin capital_N = mkN "capital" "capitals"; lin capitalism_A = compoundA (mkA "capitalism"); lin capitalism_N = mkN "capitalism" ; lin capitalist_A = mkA "capitalist" ; @@ -9060,7 +9038,8 @@ lin captious_A = compoundA (mkA "captious"); lin captivate_V2 = mkV2 (mkV "captivate" "captivates" "captivated" "captivated" "captivating"); lin captivation_N = mkN "captivation" ; lin captive_A = compoundA (mkA "captive"); -lin captive_N = mkN "captive" "captives"; +lin captiveMasc_N = mkN masculine (mkN "captive" "captives"); +lin captiveFem_N = mkN feminine (mkN "captive" "captives"); lin captivity_N = mkN "captivity" ; lin captopril_N = mkN "captopril" ; lin captor_N = mkN "captor" "captors"; @@ -9342,7 +9321,6 @@ lin cartoon_N = mkN "cartoon" "cartoons"; lin cartoon_V2 = mkV2 (mkV "cartoon" "cartoons" "cartooned" "cartooned" "cartooning"); lin cartoonistFem_N = mkN feminine (mkN "cartoonist" "cartoonists"); lin cartoonistMasc_N = mkN masculine (mkN "cartoonist" "cartoonists"); -lin cartoonist_N = mkN "cartoonist" ; lin cartouche_N = mkN "cartouche" ; lin cartridge_N = mkN "cartridge" "cartridges"; lin cartridge_belt_N = mkN "cartridge-belt" "cartridge-belts"; @@ -9746,7 +9724,6 @@ lin cellarage_N = mkN "cellarage" "cellarages"; lin cellblock_N = mkN "cellblock" ; lin cellistFem_N = mkN feminine (mkN "cellist" "cellists"); lin cellistMasc_N = mkN masculine (mkN "cellist" "cellists"); -lin cellist_N = mkN "cellist" ; lin cello_N = mkN "cello" "cellos"; lin cellophane_N = mkN "cellophane" ; lin cellular_A = compoundA (mkA "cellular"); @@ -9899,9 +9876,8 @@ lin cernuous_A = mkA "cernuous" ; lin cero_N = mkN "cero" ; lin cerous_A = mkA "cerous" ; lin cert_N = mkN "cert" "certs"; -lin certain_1_A = mkA "certain" ; -lin certain_2_A = mkA "certain" ; -lin certain_A = compoundA (mkA "certain"); +lin certain_1_A = compoundA (mkA "certain"); +lin certain_2_A = compoundA (mkA "certain"); lin certainly_Adv = mkAdv "certainly" ; lin certainty_N = mkN "certainty" "certainties"; lin certifiable_A = compoundA (mkA "certifiable"); @@ -10117,9 +10093,8 @@ lin charcoal_burner_N = mkN "charcoal-burner" "charcoal-burners"; lin charcuterie_N = mkN "charcuterie" ; lin chard_N = mkN "chard" "chards"; lin chard_PN = mkPN "Chard"; -lin charge_1_N = mkN "charge" ; -lin charge_2_N = mkN "charge" ; -lin charge_N = mkN "charge" "charges"; +lin charge_1_N = mkN "charge" "charges"; +lin charge_2_N = mkN "charge" "charges"; lin charge_V = mkV "charge" "charges" "charged" "charged" "charging"; lin charge_V2 = mkV2 (mkV "charge" "charges" "charged" "charged" "charging"); --subcat lin charge_VS = mkVS (mkV "charge" "charges" "charged" "charged" "charging"); @@ -10318,7 +10293,6 @@ lin chemisorption_N = mkN "chemisorption" ; lin chemisorptive_A = mkA "chemisorptive" ; lin chemistFem_N = mkN feminine (mkN "chemist" "chemists"); lin chemistMasc_N = mkN masculine (mkN "chemist" "chemists"); -lin chemist_N = mkN "chemist" ; lin chemistry_N = mkN "chemistry" ; lin chemoreceptive_A = mkA "chemoreceptive" ; lin chemoreceptor_N = mkN "chemoreceptor" ; @@ -10414,7 +10388,6 @@ lin chief_N = mkN "chief" "chiefs"; lin chiefly_Adv = mkAdv "chiefly" ; lin chieftainFem_N = mkN feminine (mkN "chieftain" "chieftains"); lin chieftainMasc_N = mkN masculine (mkN "chieftain" "chieftains"); -lin chieftain_N = mkN "chieftain" ; lin chieftaincy_N = mkN "chieftaincy" "chieftaincies"; lin chiffon_N = mkN "chiffon" ; lin chiffonier_N = mkN "chiffonier" "chiffoniers"; @@ -10934,7 +10907,6 @@ lin cite_V2 = mkV2 (mkV "cite" "cites" "cited" "cited" "citing"); lin citified_A = mkA "citified" ; lin citizenFem_N = mkN feminine (mkN "citizen" "citizens"); lin citizenMasc_N = mkN masculine (mkN "citizen" "citizens"); -lin citizen_N = mkN "citizen" ; lin citizenry_N = mkN "citizenry" ; lin citizenship_N = mkN "citizenship" "citizenships"; lin citrange_N = mkN "citrange" ; @@ -11404,9 +11376,8 @@ lin cloy_V2 = mkV2 (mkV "cloy" "cloys" "cloyed" "cloyed" "cloying"); lin cloyingly_Adv = mkAdv "cloyingly" ; lin clozapine_N = mkN "clozapine" ; lin cloze_A = mkA "cloze" ; -lin club_1_N = mkN "club" ; -lin club_2_N = mkN "club" ; -lin club_N = mkN "club" "clubs"; +lin club_1_N = mkN "club" "clubs"; +lin club_2_N = mkN "club" "clubs"; lin club_V = mkV "club" "clubs" "clubbed" "clubbed" "clubbing"; lin club_V2 = mkV2 (mkV "club" "clubs" "clubbed" "clubbed" "clubbing"); lin club_footed_A = compoundA (mkA "club-footed"); @@ -11460,10 +11431,9 @@ lin co_sponsor_V2 = mkV2 (mkV "co-sponsor"); lin co_star_N = mkN "co-star" "co-stars"; lin co_star_V = mkV "co-star" "co-stars" "co-starred" "co-starred" "co-starring"; lin co_star_V2 = mkV2 (mkV "co-star" "co-stars" "co-starred" "co-starred" "co-starring"); -lin coach_1_N = mkN "coach" ; -lin coach_2_N = mkN "coach" ; -lin coach_3_N = mkN "coach" ; -lin coach_N = mkN "coach" "coaches"; +lin coach_1_N = mkN "coach" "coaches"; +lin coach_2_N = mkN "coach" "coaches"; +lin coach_3_N = mkN "coach" "coaches"; lin coach_V = mkV "coach" "coaches" "coached" "coached" "coaching"; lin coach_V2 = mkV2 (mkV "coach" "coaches" "coached" "coached" "coaching"); lin coach_builder_N = mkN "coach-builder" "coach-builders"; @@ -11910,7 +11880,6 @@ lin columniation_N = mkN "columniation" ; lin columniform_A = mkA "columniform" ; lin columnistFem_N = mkN feminine (mkN "columnist" "columnists"); lin columnistMasc_N = mkN masculine (mkN "columnist" "columnists"); -lin columnist_N = mkN "columnist" ; lin colwyn_bay_PN = mkPN "Colwyn bay"; lin coma_N = mkN "coma" "comas"; lin comate_A = mkA "comate" ; @@ -12031,9 +12000,8 @@ lin coming_A = mkA "coming" ; lin coming_N = mkN "coming" "comings"; lin comity_N = mkN "comity" ; lin comma_N = mkN "comma" "commas"; -lin command_1_N = mkN "command" ; -lin command_2_N = mkN "command" ; -lin command_N = mkN "command" "commands"; +lin command_1_N = mkN "command" "commands"; +lin command_2_N = mkN "command" "commands"; lin command_V = mkV "command" "commands" "commanded" "commanded" "commanding"; lin command_V2 = mkV2 (mkV "command" "commands" "commanded" "commanded" "commanding"); lin commandant_N = mkN "commandant" "commandants"; @@ -12102,9 +12070,8 @@ lin commode_N = mkN "commode" "commodes"; lin commodious_A = compoundA (mkA "commodious"); lin commodity_N = mkN "commodity" "commodities"; lin commodore_N = mkN "commodore" "commodores"; -lin common_1_A = mkA "common" ; -lin common_2_A = mkA "common" ; -lin common_A = variants {compoundA (mkA "common"); mkA "common" "commoner"}; +lin common_1_A = variants {compoundA (mkA "common"); mkA "common" "commoner"}; +lin common_2_A = variants {compoundA (mkA "common"); mkA "common" "commoner"}; lin common_N = mkN "common" "commons"; lin common_room_N = mkN "common-room" "common-rooms"; lin commonage_N = mkN "commonage" ; @@ -13364,8 +13331,7 @@ lin corsham_PN = mkPN "Corsham"; lin corslet_N = mkN "corslet" "corslets"; lin cortege_1_N = mkN "cortege" "corteges"; lin cortege_2_N = mkN "cortège" "cortèges"; -lin cortege_N = mkN "cortege" ; -lin cortex_N = mkN "cortex" "cortices" {- FIXME: guessed plural form -}; +lin cortex_N = mkN "cortex" "cortices"; lin cortical_A = compoundA (mkA "cortical"); lin corticoafferent_A = mkA "corticoafferent" ; lin corticoefferent_A = mkA "corticoefferent" ; @@ -13655,9 +13621,8 @@ lin course_V2 = mkV2 (mkV "course" "courses" "coursed" "coursed" "coursing"); lin courser_N = mkN "courser" "coursers"; lin coursework_N = mkN "coursework" ; lin coursing_N = mkN "coursing" "coursings"; -lin court_1_N = mkN "court" ; -lin court_2_N = mkN "court" ; -lin court_N = mkN "court" "courts"; +lin court_1_N = mkN "court" "courts"; +lin court_2_N = mkN "court" "courts"; lin court_V = mkV "court" "courts" "courted" "courted" "courting"; lin court_V2 = mkV2 (mkV "court" "courts" "courted" "courted" "courting"); lin court_card_N = mkN "court-card" "court-cards"; @@ -13977,7 +13942,6 @@ lin creosol_N = mkN "creosol" ; lin creosote_N = mkN "creosote" ; lin crepe_1_N = mkN "crepe" ; lin crepe_2_N = mkN "crêpe" ; -lin crepe_N = mkN "crepe" ; lin crepitate_V = mkV "crepitate" "crepitates" "crepitated" "crepitated" "crepitating"; lin crepitation_N = mkN "crepitation" "crepitations"; lin crepuscular_A = compoundA (mkA "crepuscular"); @@ -14068,7 +14032,6 @@ lin crith_N = mkN "crith" ; lin critic_N = mkN human (mkN "critic" "critics"); lin critical_1_A = mkA "critical" ; lin critical_2_A = mkA "critical" ; -lin critical_A = compoundA (mkA "critical"); lin criticality_N = mkN "criticality" ; lin critically_Adv = mkAdv "critically" ; lin criticism_N = mkN "criticism" "criticisms"; @@ -14499,7 +14462,6 @@ lin curdle_V2 = mkV2 (mkV "curdle" "curdles" "curdled" "curdled" "curdling"); lin curdling_N = mkN "curdling" ; lin cure_1_N = mkN "cure" "cures"; lin cure_2_N = mkN "curé" "curés"; -lin cure_N = mkN "cure" ; lin cure_V = mkV "cure" "cures" "cured" "cured" "curing"; lin cure_V2 = mkV2 (mkV "cure" "cures" "cured" "cured" "curing"); lin cure_all_N = mkN "cure-all" "cure-alls"; @@ -14598,7 +14560,6 @@ lin custom_made_A = compoundA (mkA "custom-made"); lin customary_A = compoundA (mkA "customary"); lin customerFem_N = mkN feminine (mkN "customer" "customers"); lin customerMasc_N = mkN masculine (mkN "customer" "customers"); -lin customer_N = mkN "customer" ; lin customhouse_N = mkN "customhouse" ; lin customize_V2 = mkV2 (mkV "customize"); lin customs_N = mkN "customs" ; @@ -15020,7 +14981,6 @@ lin datable_A = compoundA (mkA "datable"); lin date_1_N = mkN "date" "dates"; lin date_3_N = mkN "date" "dates"; lin date_7_N = mkN "date" "dates"; -lin date_N = mkN "date" ; lin date_V = mkV "date" "dates" "dated" "dated" "dating"; lin date_V2 = mkV2 (mkV "date" "dates" "dated" "dated" "dating"); lin dateless_A = compoundA (mkA "dateless"); @@ -15185,7 +15145,8 @@ lin debate_V2 = mkV2 (mkV "debate" "debates" "debated" "debated" "debating"); lin debater_N = mkN "debater" "debaters"; lin debauch_N = mkN "debauch" "debauches"; lin debauch_V2 = mkV2 (mkV "debauch" "debauches" "debauched" "debauched" "debauching"); -lin debauchee_N = mkN "debauchee" "debauchees"; +lin debaucheeMasc_N = mkN masculine (mkN "debauchee" "debauchees"); +lin debaucheeFem_N = mkN feminine (mkN "debauchee" "debauchees"); lin debauchery_N = mkN "debauchery" "debaucheries"; lin debbie_PN = mkPN "Debbie"; lin debby_PN = mkPN "Debby"; @@ -15207,7 +15168,6 @@ lin debrief_V2 = mkV2 (mkV "debrief" "debriefs" "debriefed" "debriefed" "debrief lin debriefing_N = mkN "debriefing" ; lin debris_1_N = mkN "debris" ; lin debris_2_N = mkN "débris" ; -lin debris_N = mkN "debris" ; lin debt_N = mkN "debt" "debts"; lin debtor_N = mkN "debtor" "debtors"; lin debug_V2 = mkV2 (mkV "debug" "debugs" "debugged" "debugged" "debugging"); @@ -15215,11 +15175,9 @@ lin debugger_N = mkN "debugger" ; lin debunk_V2 = mkV2 (mkV "debunk" "debunks" "debunked" "debunked" "debunking"); lin debut_1_N = mkN "debut" "debuts"; lin debut_2_N = mkN "début" "débuts"; -lin debut_N = mkN "debut" ; lin debut_V2 = mkV2 (mkV "debut"); lin debutante_1_N = mkN "debutante" "debutantes"; lin debutante_2_N = mkN "débutante" "débutantes"; -lin debutante_N = mkN "debutante" ; lin dec_PN = mkPN "Dec"; lin decade_N = mkN "decade" "decades"; lin decadence_N = mkN "decadence" ; @@ -15462,7 +15420,6 @@ lin defendable_A = mkA "defendable" ; lin defendant_N = mkN human (mkN "defendant" "defendants"); lin defenderFem_N = mkN feminine (mkN "defender" "defenders"); lin defenderMasc_N = mkN masculine (mkN "defender" "defenders"); -lin defender_N = mkN "defender" ; lin defenestration_N = mkN "defenestration" ; lin defense_N = mkN "defense" ; lin defenseless_A = mkA "defenseless" ; @@ -15551,7 +15508,6 @@ lin degrade_V2 = mkV2 (mkV "degrade" "degrades" "degraded" "degraded" "degrading lin degree_1_N = mkN "degree" "degrees"; lin degree_2_N = mkN "degree" "degrees"; lin degree_3_N = mkN "degree" "degrees"; -lin degree_N = mkN "degree" ; lin degressive_A = mkA "degressive" ; lin dehiscence_N = mkN "dehiscence" ; lin dehiscent_A = mkA "dehiscent" ; @@ -16818,7 +16774,6 @@ lin discover_V2 = mkV2 (mkV "discover" "discovers" "discovered" "discovered" "di lin discover_VS = mkVS (mkV "discover" "discovers" "discovered" "discovered" "discovering"); lin discovererFem_N = mkN feminine (mkN "discoverer" "discoverers"); lin discovererMasc_N = mkN masculine (mkN "discoverer" "discoverers"); -lin discoverer_N = mkN "discoverer" ; lin discovery_N = mkN "discovery" "discoveries"; lin discredit_N = mkN "discredit" ; lin discredit_V2 = mkV2 (mkV "discredit" "discredits" "discredited" "discredited" "discrediting"); @@ -17284,10 +17239,9 @@ lin diving_suit_N = mkN "diving-suit" "diving-suits"; lin divinity_N = mkN "divinity" "divinities"; lin divisibility_N = mkN "divisibility" ; lin divisible_A = compoundA (mkA "divisible"); -lin division_1_N = mkN "division" ; -lin division_2_N = mkN "division" ; -lin division_3_N = mkN "division" ; -lin division_N = mkN "division" "divisions"; +lin division_1_N = mkN "division" "divisions"; +lin division_2_N = mkN "division" "divisions"; +lin division_3_N = mkN "division" "divisions"; lin divisional_A = compoundA (mkA "divisional"); lin divisor_N = mkN "divisor" "divisors"; lin divorce_N = mkN "divorce" "divorces"; @@ -17959,9 +17913,9 @@ lin drive_up_V2 = mkV2 (partV IrregEng.drive_V "up"); lin drivel_N = mkN "drivel" ; lin drivel_V = mkV "drivel" "drivels" "drivelled" "drivelled" "drivelling"; lin driveller_N = mkN "driveller" "drivellers"; +lin driver_N = mkN feminine (mkN "driver" "drivers"); lin driverFem_N = mkN feminine (mkN "driver" "drivers"); lin driverMasc_N = mkN masculine (mkN "driver" "drivers"); -lin driver_N = mkN "driver" "drivers"; lin driveshaft_N = mkN "driveshaft" ; lin driveway_N = mkN "driveway" "driveways"; lin driving_A = mkA "driving" ; @@ -18581,7 +18535,6 @@ lin economize_V2 = mkV2 (mkV "economize" "economizes" "economized" "economized" lin economizer_N = mkN "economizer" ; lin economy_1_N = mkN "economy" ; lin economy_2_N = mkN "economy" ; -lin economy_N = mkN "economy" "economies"; lin ecosystem_N = mkN "ecosystem" "ecosystems"; lin ecoterrorism_N = mkN "ecoterrorism" ; lin ecotourism_N = mkN "ecotourism" ; @@ -19248,9 +19201,8 @@ lin encyclopedia_N = mkN "encyclopedia" "encyclopedias"; lin encyclopedic_A = compoundA (mkA "encyclopedic"); lin encyclopedist_N = mkN "encyclopedist" ; lin encysted_A = mkA "encysted" ; -lin end_1_N = mkN "end" ; -lin end_2_N = mkN "end" ; -lin end_N = mkN "end" "ends"; +lin end_1_N = mkN "end" "ends"; +lin end_2_N = mkN "end" "ends"; lin end_V = mkV "end" "ends" "ended" "ended" "ending"; lin end_V2 = mkV2 (mkV "end" "ends" "ended" "ended" "ending"); --subcat lin end_VA = mkVA (mkV "end" "ends" "ended" "ended" "ending"); @@ -19551,9 +19503,8 @@ lin entrepreneur_N = mkN "entrepreneur" "entrepreneurs"; lin entrepreneurial_A = compoundA (mkA "entrepreneurial"); lin entropy_N = mkN "entropy" ; lin entrust_V2 = mkV2 (mkV "entrust" "entrusts" "entrusted" "entrusted" "entrusting"); -lin entry_1_N = mkN "entry" ; -lin entry_2_N = mkN "entry" ; -lin entry_N = mkN "entry" "entries"; +lin entry_1_N = mkN "entry" "entries"; +lin entry_2_N = mkN "entry" "entries"; lin entwin_V = mkV "entwin"; lin entwine_V2 = mkV2 (mkV "entwine" "entwines" "entwined" "entwined" "entwining"); lin enucleation_N = mkN "enucleation" ; @@ -20184,7 +20135,6 @@ lin evict_V2 = mkV2 (mkV "evict" "evicts" "evicted" "evicted" "evicting"); lin eviction_N = mkN "eviction" "evictions"; lin evidence_1_N = mkN "evidence" ; lin evidence_2_N = mkN "evidence" ; -lin evidence_N = mkN "evidence" ; lin evidence_V2 = mkV2 (mkV "evidence" "evidences" "evidenced" "evidenced" "evidencing"); lin evident_A = compoundA (mkA "evident"); lin evidential_A = mkA "evidential" ; @@ -20540,7 +20490,6 @@ lin explore_V2 = mkV2 (mkV "explore" "explores" "explored" "explored" "exploring lin explore_VS = mkVS (mkV "explore"); lin explorerFem_N = mkN feminine (mkN "explorer" "explorers"); lin explorerMasc_N = mkN masculine (mkN "explorer" "explorers"); -lin explorer_N = mkN "explorer" ; lin explosion_N = mkN "explosion" "explosions"; lin explosive_A = compoundA (mkA "explosive"); lin explosive_N = mkN "explosive" "explosives"; @@ -20899,9 +20848,8 @@ lin falconer_N = mkN "falconer" ; lin falconine_A = mkA "falconine" ; lin falconry_N = mkN "falconry" ; lin falkirk_PN = mkPN "Falkirk"; -lin fall_1_N = mkN "fall" ; -lin fall_2_N = mkN "fall" ; -lin fall_N = mkN "fall" "falls"; +lin fall_1_N = mkN "fall" "falls"; +lin fall_2_N = mkN "fall" "falls"; lin fall_V = IrregEng.fall_V; --subcat lin fall_V2 = mkV2 (IrregEng.fall_V); --subcat lin fall_VA = mkVA (IrregEng.fall_V); @@ -20971,7 +20919,6 @@ lin famulus_N = mkN "famulus" ; lin fan_1_N = mkN "fan" "fans"; lin fan_2_N = mkN "fan" "fans"; lin fan_3_N = mkN "fan" "fans"; -lin fan_N = mkN "fan" ; lin fan_V = mkV "fan" "fans" "fanned" "fanned" "fanning"; lin fan_V2 = mkV2 (mkV "fan" "fans" "fanned" "fanned" "fanning"); lin fan_belt_N = mkN "fan-belt" "fan-belts"; @@ -21193,7 +21140,6 @@ lin favourable_A = mkA (variants {"favourable"; "favorable"}) ; lin favouriteFem_N = mkN feminine (mkN (variants {"favourite"; "favorite"})); lin favouriteMasc_N = mkN masculine (mkN (variants {"favourite"; "favorite"})); lin favourite_A = compoundA (mkA (variants {"favourite"; "favorite"})); -lin favourite_N = mkN "favourite" ; lin favouritism_N = mkN "favouritism" ; lin favus_N = mkN "favus" ; lin fawley_PN = mkPN "Fawley"; @@ -21343,7 +21289,6 @@ lin feminism_N = mkN "feminism" ; lin feministFem_N = mkN feminine (mkN "feminist" "feminists"); lin feministMasc_N = mkN masculine (mkN "feminist" "feminists"); lin feminist_A = mkA "feminist" ; -lin feminist_N = mkN "feminist" ; lin feminization_N = mkN "feminization" ; lin femoral_A = mkA "femoral" ; lin femtochemistry_N = mkN "femtochemistry" ; @@ -21555,7 +21500,6 @@ lin field_1_N = mkN "field" ; lin field_2_N = mkN "field" ; lin field_3_N = mkN "field" ; lin field_4_N = mkN "field" ; -lin field_N = mkN "field" "fields"; lin field_V = mkV "field" "fields" "fielded" "fielded" "fielding"; lin field_V2 = mkV2 (mkV "field" "fields" "fielded" "fielded" "fielding"); lin field_hospital_N = mkN "field-hospital" "field-hospitals"; @@ -21593,9 +21537,8 @@ lin figment_N = mkN "figment" "figments"; lin figural_A = mkA "figural" ; lin figuration_N = mkN "figuration" ; lin figurative_A = compoundA (mkA "figurative"); -lin figure_1_N = mkN "figure" ; -lin figure_2_N = mkN "figure" ; -lin figure_N = mkN "figure" "figures"; +lin figure_1_N = mkN "figure" "figures"; +lin figure_2_N = mkN "figure" "figures"; lin figure_V = mkV "figure" "figures" "figured" "figured" "figuring"; --subcat lin figure_V2 = mkV2 (mkV "figure" "figures" "figured" "figured" "figuring"); --subcat lin figure_V2V = mkV2V (mkV "figure" "figures" "figured" "figured" "figuring") noPrep to_Prep ; @@ -21653,9 +21596,8 @@ lin fillet_V2 = mkV2 (mkV "fillet" "fillets" "filleted" "filleted" "filleting"); lin filling_N = mkN "filling" "fillings"; lin fillip_N = mkN "fillip" "fillips"; lin filly_N = mkN "filly" "fillies"; -lin film_1_N = mkN "film" ; -lin film_2_N = mkN "film" ; -lin film_N = mkN "film" "films"; +lin film_1_N = mkN "film" "films"; +lin film_2_N = mkN "film" "films"; lin film_V = mkV "film" "films" "filmed" "filmed" "filming"; lin film_V2 = mkV2 (mkV "film" "films" "filmed" "filmed" "filming"); lin film_star_N = mkN "film-star" "film-stars"; @@ -21777,7 +21719,6 @@ lin fir_N = mkN "fir" "firs"; lin fir_cone_N = mkN "fir-cone" "fir-cones"; lin fire_1_N = mkN "fire" "fires"; lin fire_2_N = mkN "fire" "fires"; -lin fire_N = mkN "fire" ; lin fire_V = mkV "fire" "fires" "fired" "fired" "firing"; lin fire_V2 = mkV2 (mkV "fire" "fires" "fired" "fired" "firing"); lin fire_alarm_N = mkN "fire-alarm" "fire-alarms"; @@ -22621,9 +22562,8 @@ lin forehand_A = compoundA (mkA "forehand"); lin forehand_N = mkN "forehand" ; lin forehanded_A = mkA "forehanded" ; lin forehead_N = mkN "forehead" "foreheads"; -lin foreign_1_A = mkA "foreign" ; -lin foreign_2_A = mkA "foreign" ; -lin foreign_A = compoundA (mkA "foreign"); +lin foreign_1_A = compoundA (mkA "foreign"); +lin foreign_2_A = compoundA (mkA "foreign"); lin foreigner_N = mkN "foreigner" "foreigners"; lin foreignness_N = mkN "foreignness" ; lin foreknow_V = mkV "fore" IrregEng.know_V; @@ -22709,7 +22649,6 @@ lin forint_N = mkN "forint" ; lin fork_1_N = mkN "fork" "forks"; lin fork_3_N = mkN "fork" "forks"; lin fork_4_N = mkN "fork" "forks"; -lin fork_N = mkN "fork" ; lin fork_V = mkV "fork" "forks" "forked" "forked" "forking"; lin fork_V2 = mkV2 (mkV "fork" "forks" "forked" "forked" "forking"); lin fork_out_V = partV (mkV "fork") "out"; @@ -23455,7 +23394,6 @@ lin futon_N = mkN "futon" ; lin future_1_N = mkN "future" "futures"; lin future_3_N = mkN "future" "futures"; lin future_A = compoundA (mkA "future"); -lin future_N = mkN "future" ; lin futureless_A = compoundA (mkA "futureless"); lin futurism_N = mkN "futurism" ; lin futuristFem_N = mkN feminine (mkN "futurist" "futurists"); @@ -23606,7 +23544,6 @@ lin game_1_N = mkN "game" ; lin game_2_N = mkN "game" ; lin game_3_N = mkN "game" ; lin game_A = compoundA (mkA "game"); -lin game_N = mkN "game" "games"; lin game_V = mkV "game" "games" "gamed" "gamed" "gaming"; lin game_V2 = mkV2 (mkV "game" "games" "gamed" "gamed" "gaming"); lin game_bag_N = mkN "game-bag" "game-bags"; @@ -23689,7 +23626,6 @@ lin garden_V = mkV "garden" "gardens" "gardened" "gardened" "gardening"; lin garden_truck_N = mkN "garden-truck" "garden-trucks"; lin gardenerFem_N = mkN feminine (mkN "gardener" "gardeners"); lin gardenerMasc_N = mkN masculine (mkN "gardener" "gardeners"); -lin gardener_N = mkN "gardener" ; lin gardenia_N = mkN "gardenia" "gardenias"; lin gardening_N = mkN "gardening" ; lin gareth_PN = mkPN "Gareth"; @@ -24014,7 +23950,6 @@ lin geologic_A = mkA "geologic" ; lin geological_A = compoundA (mkA "geological"); lin geologistFem_N = mkN feminine (mkN "geologist" "geologists"); lin geologistMasc_N = mkN masculine (mkN "geologist" "geologists"); -lin geologist_N = mkN "geologist" ; lin geology_N = mkN "geology" ; lin geomancer_N = mkN "geomancer" ; lin geomancy_N = mkN "geomancy" ; @@ -25333,9 +25268,8 @@ lin grotty_A = mkA "grotty" "grottier"; lin grouch_N = mkN "grouch" "grouches"; lin grouch_V = mkV "grouch" "grouches" "grouched" "grouched" "grouching"; lin grouchy_A = mkA "grouchy" "grouchier"; -lin ground_1_N = mkN "ground" ; -lin ground_2_N = mkN "ground" ; -lin ground_N = mkN "ground" "grounds"; +lin ground_1_N = mkN "ground" "grounds"; +lin ground_2_N = mkN "ground" "grounds"; lin ground_V = mkV "ground" "grounds" "grounded" "grounded" "grounding"; lin ground_V2 = mkV2 (mkV "ground" "grounds" "grounded" "grounded" "grounding"); lin ground_bait_N = mkN "ground-bait" ; @@ -26104,9 +26038,8 @@ lin harbour_N = mkN "harbour" "harbours"; lin harbour_V = mkV "harbour" "harbours" "harboured" "harboured" "harbouring"; lin harbour_V2 = mkV2 (mkV "harbour" "harbours" "harboured" "harboured" "harbouring"); lin harbourage_N = mkN "harbourage" "harbourages"; -lin hard_1_A = mkA "hard" ; -lin hard_2_A = mkA "hard" ; -lin hard_A = mkA "hard" "harder"; +lin hard_1_A = mkA "hard" "harder"; +lin hard_2_A = mkA "hard" "harder"; lin hard_Adv = mkAdv "hard"; lin hard_baked_A = compoundA (mkA "hard-baked"); lin hard_bitten_A = compoundA (mkA "hard-bitten"); @@ -29162,7 +29095,6 @@ lin indenture_V2 = mkV2 (mkV "indenture" "indentures" "indentured" "indentured" lin independence_N = mkN "independence" ; lin independent_1_A = mkA "independent" ; lin independent_2_A = mkA "independent" ; -lin independent_A = compoundA (mkA "independent"); lin independent_N = mkN "independent" "independents"; lin independently_Adv = mkAdv "independently" ; lin indescribable_A = compoundA (mkA "indescribable"); @@ -29857,7 +29789,6 @@ lin intellectual_N = mkN "intellectual" "intellectuals"; lin intellectualization_N = mkN "intellectualization" ; lin intelligence_1_N = mkN "intelligence" ; lin intelligence_2_N = mkN "intelligence" ; -lin intelligence_N = mkN "intelligence" ; lin intelligent_A = compoundA (mkA "intelligent"); lin intelligentsia_N = mkN "intelligentsia" "intelligentsias"; lin intelligibility_N = mkN "intelligibility" ; @@ -29929,10 +29860,9 @@ lin interdict_N = mkN "interdict" "interdicts"; lin interdict_V2 = mkV2 (mkV "interdict" "interdicts" "interdicted" "interdicted" "interdicting"); lin interdiction_N = mkN "interdiction" "interdictions"; lin interdisciplinary_A = compoundA (mkA "interdisciplinary"); -lin interest_1_N = mkN "interest" ; -lin interest_2_N = mkN "interest" ; +lin interest_1_N = mkN "interest" "interests"; +lin interest_2_N = mkN "interest" "interests"; lin interest_4_N = mkN "interest" "interests"; -lin interest_N = mkN "interest" "interests"; lin interest_V = mkV "interest"; lin interest_V2 = mkV2 (mkV "interest" "interests" "interested" "interested" "interesting"); lin interested_A = mkA "interested"; @@ -30517,9 +30447,8 @@ lin isotropy_N = mkN "isotropy" ; lin israel_PN = mkPN "Israel"; lin israeli_A = compoundA (mkA "israeli"); lin israeli_N = mkN "israeli" "israelis"; -lin issue_1_N = mkN "issue" ; -lin issue_2_N = mkN "issue" ; -lin issue_N = mkN "issue" "issues"; +lin issue_1_N = mkN "issue" "issues"; +lin issue_2_N = mkN "issue" "issues"; lin issue_V = mkV "issue" "issues" "issued" "issued" "issuing"; lin issue_V2 = mkV2 (mkV "issue" "issues" "issued" "issued" "issuing"); lin issue_forth_V = partV (mkV "issue") "forth"; @@ -31356,8 +31285,8 @@ lin keurboom_N = mkN "keurboom" ; lin kevin_PN = mkPN "Kevin"; lin key_1_N = mkN "key" ; lin key_2_N = mkN "key" ; +lin key_3_N = mkN "key" ; lin key_A = mkA "key"; -lin key_N = mkN "key"; lin key_V2 = mkV2 (mkV "key" "keys" "keyed" "keyed" "keying"); lin key_down_V = partV (mkV "key") "down"; lin key_in_V2 = mkV2 (partV (mkV "key") "in"); @@ -32313,7 +32242,6 @@ lin lavish_V2 = mkV2 (mkV "lavish" "lavishes" "lavished" "lavished" "lavishing") lin lavishness_N = mkN "lavishness" ; lin law_1_N = mkN "law" ; lin law_2_N = mkN "law" ; -lin law_N = mkN "law" "laws"; lin law_abiding_A = compoundA (mkA "law-abiding"); lin law_officer_N = mkN "law-officer" "law-officers"; lin lawbreaker_N = mkN "lawbreaker" "lawbreakers"; @@ -32412,9 +32340,8 @@ lin leafless_A = compoundA (mkA "leafless"); lin leaflet_N = mkN "leaflet" "leaflets"; lin leaflike_A = mkA "leaflike" ; lin leafy_A = mkA "leafy" "leafier"; -lin league_1_N = mkN "league" ; -lin league_2_N = mkN "league" ; -lin league_N = mkN "league" "leagues"; +lin league_1_N = mkN "league" "leagues"; +lin league_2_N = mkN "league" "leagues"; lin league_V = mkV "league" "leagues" "leagued" "leagued" "leaguing"; lin league_V2 = mkV2 (mkV "league" "leagues" "leagued" "leagued" "leaguing"); lin leak_N = mkN "leak" "leaks"; @@ -32731,7 +32658,6 @@ lin lethargy_N = mkN "lethargy" ; lin lethe_PN = mkPN "Lethe"; lin letter_1_N = mkN "letter" "letters"; lin letter_2_N = mkN "letter" "letters"; -lin letter_N = mkN "letter" ; lin letter_box_N = mkN "letter-box" "letter-boxes"; lin letter_card_N = mkN "letter-card" "letter-cards"; lin letter_case_N = mkN "letter-case" "letter-cases"; @@ -32772,7 +32698,6 @@ lin levee_N = mkN "levee" "levees"; lin level_1_N = mkN "level" "levels"; lin level_2_N = mkN "level" "levels"; lin level_A = compoundA (mkA "level"); -lin level_N = mkN "level" "levels"; lin level_V = mkV "level" "levels" "levelled" "levelled" "levelling"; lin level_V2 = mkV2 (mkV "level" "levels" "levelled" "levelled" "levelling"); lin level_headed_A = compoundA (mkA "level-headed"); @@ -33255,7 +33180,6 @@ lin listen_out_for_V2 = prepV2 (partV (mkV "listen") "out") (mkPrep "for"); lin listen_up_V = partV (mkV "listen") "up"; lin listenerFem_N = mkN feminine (mkN "listener" "listeners"); lin listenerMasc_N = mkN masculine (mkN "listener" "listeners"); -lin listener_N = mkN "listener" ; lin listening_N = mkN "listening" ; lin lister_N = mkN "lister" ; lin listeria_N = mkN "listeria" ; @@ -34989,9 +34913,8 @@ lin mastaba_N = mkN "mastaba" ; lin mastalgia_N = mkN "mastalgia" ; lin mastectomy_N = mkN "mastectomy" ; lin masted_A = mkA "masted" ; -lin master_1_N = mkN "master" ; -lin master_2_N = mkN "master" ; -lin master_N = mkN "master" "masters"; +lin master_1_N = mkN "master" "masters"; +lin master_2_N = mkN "master" "masters"; lin master_V2 = mkV2 (mkV "master" "masters" "mastered" "mastered" "mastering"); lin master_at_arms_N = mkN "master-at-arms" "masters-at-arms"; lin master_key_N = mkN "master-key" "master-keys"; @@ -35029,10 +34952,9 @@ lin mat_V = mkV "mat" "mats" "matted" "matted" "matting"; lin mat_V2 = mkV2 (mkV "mat" "mats" "matted" "matted" "matting"); lin matador_N = mkN "matador" "matadors"; lin matai_N = mkN "matai" ; -lin match_1_N = mkN "match" ; -lin match_2_N = mkN "match" ; -lin match_3_N = mkN "match" ; -lin match_N = mkN "match" "matches"; +lin match_1_N = mkN "match" "matches"; +lin match_2_N = mkN "match" "matches"; +lin match_3_N = mkN "match" "matches"; --subcat lin match_V = mkV "match" "matches" "matched" "matched" "matching"; lin match_V2 = mkV2 (mkV "match" "matches" "matched" "matched" "matching"); lin match_point_N = mkN "match-point" "match-points"; @@ -35048,9 +34970,11 @@ lin matchmaking_N = mkN "matchmaking" ; lin matchstick_N = mkN "matchstick" ; lin matchweed_N = mkN "matchweed" ; lin matchwood_N = mkN "matchwood" ; -lin mate_1_N = mkN "mate" "mates"; -lin mate_2_N = mkN "maté" "matés" ; -lin mate_N = mkN "mate" ; +lin mateMasc_1_N = mkN "mate" "mates"; +lin mateFem_1_N = mkN "mate" "mates"; +lin mateMasc_2_N = mkN "mate" "mates"; +lin mateFem_2_N = mkN "mate" "mates"; +lin mate_N = mkN "maté" "matés" ; lin mate_V = mkV "mate" "mates" "mated" "mated" "mating"; lin mate_V2 = mkV2 (mkV "mate" "mates" "mated" "mated" "mating"); lin mateless_A = mkA "mateless" ; @@ -35077,7 +35001,6 @@ lin mathematical_A = compoundA (mkA "mathematical"); lin mathematically_Adv = mkAdv "mathematically" ; lin mathematicianFem_N = mkN feminine (mkN "mathematician" "mathematicians"); lin mathematicianMasc_N = mkN masculine (mkN "mathematician" "mathematicians"); -lin mathematician_N = mkN "mathematician" ; lin mathematics_N = mkN "mathematics" "mathematics"; lin maths_N = mkN "maths" "maths"; lin matinee_N = mkN "matinée" "matinées"; @@ -35124,7 +35047,6 @@ lin mature_V2 = mkV2 (mkV "mature" "matures" "matured" "matured" "maturing"); lin maturity_1_N = mkN "maturity"; lin maturity_2_N = mkN "maturity"; lin maturity_3_N = mkN "maturity"; -lin maturity_N = mkN "maturity" ; lin matutinal_A = compoundA (mkA "matutinal"); lin matzo_N = mkN "matzo" ; lin maud_PN = mkPN "Maud"; @@ -36230,9 +36152,8 @@ lin mining_N = mkN "mining" ; lin minion_N = mkN "minion" "minions"; lin miniseries_N = mkN "miniseries" ; lin miniskirt_N = mkN "miniskirt" ; -lin minister_1_N = mkN "minister" ; -lin minister_2_N = mkN "minister" ; -lin minister_N = mkN "minister" "ministers"; +lin minister_1_N = mkN "minister" "ministers"; +lin minister_2_N = mkN "minister" "ministers"; lin minister_V = mkV "minister" "ministers" "ministered" "ministered" "ministering"; lin ministerial_A = compoundA (mkA "ministerial"); lin ministrant_A = compoundA (mkA "ministrant"); @@ -37181,7 +37102,6 @@ lin movable_A = compoundA (mkA "movable"); lin move_1_V = mkV "move" ; lin move_2_V = mkV "move" ; lin move_N = mkN "move" "moves"; -lin move_V = mkV "move" "moves" "moved" "moved" "moving"; lin move_V2 = mkV2 (mkV "move" "moves" "moved" "moved" "moving"); --subcat lin move_V2A = mkV2A (mkV "move" "moves" "moved" "moved" "moving") noPrep; --subcat lin move_V2V = mkV2V (mkV "move" "moves" "moved" "moved" "moving") noPrep to_Prep; @@ -37482,7 +37402,6 @@ lin musicality_N = mkN "musicality" ; lin musically_Adv = mkAdv "musically" ; lin musicianFem_N = mkN feminine (mkN "musician" "musicians"); lin musicianMasc_N = mkN masculine (mkN "musician" "musicians"); -lin musician_N = mkN "musician" ; lin musicianship_N = mkN "musicianship" ; lin musicological_A = mkA "musicological" ; lin musicologist_N = mkN "musicologist" ; @@ -37713,7 +37632,6 @@ lin nairn_PN = mkPN "Nairn"; lin nairobi_PN = mkPN "Nairobi"; lin naive_1_A = compoundA (mkA "naive"); lin naive_2_A = compoundA (mkA "naïve"); -lin naive_A = mkA "naive" ; lin naivete_N = mkN "naiveté" "naivetés"; lin naivety_N = mkN "naivety" "naiveties"; lin naked_A = compoundA (mkA "naked"); @@ -38539,7 +38457,6 @@ lin nobility_N = mkN "nobility" ; lin nobleFem_N = mkN feminine (mkN "noble" "nobles"); lin nobleMasc_N = mkN masculine (mkN "noble" "nobles"); lin noble_A = mkA "noble" "nobler"; -lin noble_N = mkN "noble" ; lin noble_mindedness_N = mkN "noble-mindedness" ; lin nobleman_N = mkN masculine (mkN "nobleman" "noblemen"); lin noblesse_N = mkN "noblesse" "IRREG"; @@ -39012,10 +38929,9 @@ lin notary_N = mkN "notary" "notaries"; lin notation_N = mkN "notation" "notations"; lin notch_N = mkN "notch" "notches"; lin notch_V2 = mkV2 (mkV "notch" "notches" "notched" "notched" "notching"); -lin note_1_N = mkN "note" ; -lin note_2_N = mkN "note" ; -lin note_3_N = mkN "note" ; -lin note_N = mkN "note" "notes"; +lin note_1_N = mkN "note" "notes"; +lin note_2_N = mkN "note" "notes"; +lin note_3_N = mkN "note" "notes"; lin note_V = mkV "note"; lin note_V2 = mkV2 (mkV "note" "notes" "noted" "noted" "noting"); lin note_VS = mkVS (mkV "note"); @@ -39139,10 +39055,9 @@ lin nullity_N = mkN "nullity" ; lin numb_A = compoundA (mkA "numb"); lin numb_V2 = mkV2 (mkV "numb" "numbs" "numbed" "numbed" "numbing"); lin numbat_N = mkN "numbat" ; -lin number_1_N = mkN "number" ; -lin number_2_N = mkN "number" ; -lin number_3_N = mkN "number" ; -lin number_N = mkN "number" "numbers"; +lin number_1_N = mkN "number" "numbers"; +lin number_2_N = mkN "number" "numbers"; +lin number_3_N = mkN "number" "numbers"; lin number_V2 = mkV2 (mkV "number" "numbers" "numbered" "numbered" "numbering"); lin numberless_A = compoundA (mkA "numberless"); lin numberplate_N = mkN "numberplate" "numberplates"; @@ -39532,7 +39447,6 @@ lin offend_V = mkV "offend" "offends" "offended" "offended" "offending"; lin offend_V2 = mkV2 (mkV "offend" "offends" "offended" "offended" "offending"); lin offenderFem_N = mkN feminine (mkN "offender" "offenders"); lin offenderMasc_N = mkN masculine (mkN "offender" "offenders"); -lin offender_N = mkN "offender" ; lin offense_N = mkN "offense" ; lin offenseless_A = mkA "offenseless" ; lin offensive_A = compoundA (mkA "offensive"); @@ -39563,11 +39477,9 @@ lin officeholder_N = mkN "officeholder" ; lin officer_1_N = mkN "officer" ; lin officer_2_N = mkN "officer" ; lin officer_3_N = mkN "officer" ; -lin officer_N = mkN "officer" "officers"; lin officialFem_N = mkN feminine (mkN "official" "officials"); lin officialMasc_N = mkN masculine (mkN "official" "officials"); lin official_A = compoundA (mkA "official"); -lin official_N = mkN "official" ; lin officialdom_N = mkN "officialdom" "officialdoms"; lin officialese_N = mkN "officialese" ; lin officially_Adv = mkAdv "officially" ; @@ -39920,7 +39832,6 @@ lin opp_PN = mkPN "Opp"; lin opponentFem_N = mkN feminine (mkN "opponent" "opponents"); lin opponentMasc_N = mkN masculine (mkN "opponent" "opponents"); lin opponent_A = mkA "opponent" ; -lin opponent_N = mkN "opponent" ; lin opportune_A = compoundA (mkA "opportune"); lin opportuneness_N = mkN "opportuneness" ; lin opportunism_N = mkN "opportunism" ; @@ -39991,7 +39902,6 @@ lin orang_utan_N = mkN "orang-utan" "orang-utans"; lin orange_1_N = mkN "orange" "oranges"; lin orange_2_N = mkN "orange" "oranges"; lin orange_A = compoundA (mkA "orange"); -lin orange_N = mkN "orange" ; lin orangeade_N = mkN "orangeade" ; lin orangeman_N = mkN masculine (mkN "orangeman" "orangemen"); lin orangery_N = mkN "orangery" ; @@ -40001,7 +39911,6 @@ lin orate_V = mkV "orate" "orates" "orated" "orated" "orating"; lin oration_N = mkN "oration" "orations"; lin oratorFem_N = mkN feminine (mkN "orator" "orators"); lin oratorMasc_N = mkN masculine (mkN "orator" "orators"); -lin orator_N = mkN "orator" ; lin oratorical_A = compoundA (mkA "oratorical"); lin oratorio_N = mkN "oratorio" "oratorios"; lin oratory_N = mkN "oratory" "oratories"; @@ -40115,7 +40024,6 @@ lin originate_V = mkV "originate" "originates" "originated" "originated" "origin lin originate_V2 = mkV2 (mkV "originate" "originates" "originated" "originated" "originating"); lin originatorFem_N = mkN feminine (mkN "originator" "originators"); lin originatorMasc_N = mkN masculine (mkN "originator" "originators"); -lin originator_N = mkN "originator" ; lin oriole_N = mkN "oriole" "orioles"; lin orison_N = mkN "orison" "orisons"; lin orkney_PN = mkPN "Orkney"; @@ -40862,7 +40770,6 @@ lin pacifier_N = mkN "pacifier" ; lin pacifism_N = mkN "pacifism" ; lin pacifistFem_N = mkN feminine (mkN "pacifist" "pacifists"); lin pacifistMasc_N = mkN masculine (mkN "pacifist" "pacifists"); -lin pacifist_N = mkN "pacifist" ; lin pacifistically_Adv = mkAdv "pacifistically" ; lin pacify_V2 = mkV2 (mkV "pacify" "pacifies" "pacified" "pacified" "pacifying"); lin pacing_N = mkN "pacing" ; @@ -41113,7 +41020,8 @@ lin pampas_grass_N = mkN "pampas-grass" ; lin pamper_V2 = mkV2 (mkV "pamper" "pampers" "pampered" "pampered" "pampering"); lin pamperer_N = mkN "pamperer" ; lin pamphlet_N = mkN "pamphlet" "pamphlets"; -lin pamphleteer_N = mkN "pamphleteer" "pamphleteers"; +lin pamphleteerMasc_N = mkN masculine (mkN "pamphleteer" "pamphleteers"); +lin pamphleteerFem_N = mkN feminine (mkN "pamphleteer" "pamphleteers"); lin pamplona_PN = mkPN "Pamplona"; lin pan_N = mkN "pan" "pans"; lin pan_V = mkV "pan" "pans" "panned" "panned" "panning"; @@ -41542,9 +41450,8 @@ lin partsong_N = mkN "partsong" ; lin parturiency_N = mkN "parturiency" ; lin parturient_A = mkA "parturient" ; lin parturition_N = mkN "parturition" ; -lin party_1_N = mkN "party" ; -lin party_2_N = mkN "party" ; -lin party_N = mkN "party" "parties"; +lin party_1_N = mkN "party" "parties"; +lin party_2_N = mkN "party" "parties"; lin party_spirit_N = mkN "party-spirit" ; lin party_spirited_A = compoundA (mkA "party-spirited"); lin party_wall_N = mkN "party-wall" "party-walls"; @@ -41671,7 +41578,6 @@ lin patchwork_N = mkN "patchwork" ; lin patchy_A = mkA "patchy" "patchier"; lin pate_1_N = mkN "pate" "pates"; lin pate_2_N = mkN "pâté" "pâtés"; -lin pate_N = mkN "pate" ; lin pate_de_foie_gras_N = mkN "pate de foie gras" ; lin patella_N = mkN "patella" "patellas"; lin patellar_A = mkA "patellar" ; @@ -41893,7 +41799,6 @@ lin pearly_A = mkA "pearly" "pearlier"; lin pearmain_N = mkN "pearmain" "pearmains"; lin peasantFem_N = mkN feminine (mkN "peasant" "peasants"); lin peasantMasc_N = mkN masculine (mkN "peasant" "peasants"); -lin peasant_N = mkN "peasant" ; lin peasanthood_N = mkN "peasanthood" ; lin peasantry_N = mkN "peasantry" "peasantries"; lin pease_N = mkN "pease" ; @@ -42273,9 +42178,8 @@ lin perforation_N = mkN "perforation" "perforations"; lin perforce_Adv = mkAdv "perforce"; lin perform_V = mkV "perform" "performs" "performed" "performed" "performing"; lin perform_V2 = mkV2 (mkV "perform" "performs" "performed" "performed" "performing"); -lin performance_1_N = mkN "performance" ; -lin performance_2_N = mkN "performance" ; -lin performance_N = mkN "performance" "performances"; +lin performance_1_N = mkN "performance" "performances"; +lin performance_2_N = mkN "performance" "performances"; lin performer_N = mkN "performer" "performers"; lin perfume_N = mkN "perfume" "perfumes"; lin perfume_V2 = mkV2 (mkV "perfume" "perfumes" "perfumed" "perfumed" "perfuming"); @@ -42323,7 +42227,6 @@ lin perineurium_N = mkN "perineurium" ; lin period_1_N = mkN "period" ; lin period_2_N = mkN "period" ; lin period_3_N = mkN "period" ; -lin period_N = mkN "period" "periods"; lin periodic_A = compoundA (mkA "periodic"); lin periodical_A = compoundA (mkA "periodical"); lin periodical_N = mkN "periodical" "periodicals"; @@ -42904,7 +42807,6 @@ lin pianissimo_A = compoundA (mkA "pianissimo"); lin pianissimo_Adv = mkAdv "pianissimo"; lin pianistFem_N = mkN feminine (mkN "pianist" "pianists"); lin pianistMasc_N = mkN masculine (mkN "pianist" "pianists"); -lin pianist_N = mkN "pianist" ; lin pianistic_A = mkA "pianistic" ; lin piano_A = compoundA (mkA "piano"); lin piano_Adv = mkAdv "piano"; @@ -43508,8 +43410,6 @@ lin play_2_V2 = mkV2 "play" ; lin play_3_V = mkV "play" ; lin play_3_V2 = mkV2 "play" ; lin play_N = mkN "play" "plays"; -lin play_V = mkV "play" "plays" "played" "played" "playing"; -lin play_V2 = mkV2 (mkV "play" "plays" "played" "played" "playing"); --subcat lin play_VV = mkVV (mkV "play" "plays" "played" "played" "playing"); lin play_acting_N = mkN "play-acting" ; lin play_actor_N = mkN "play-actor" "play-actors"; @@ -43846,9 +43746,8 @@ lin poikilotherm_N = mkN "poikilotherm" ; lin poikilothermic_A = mkA "poikilothermic" ; lin poilu_N = mkN "poilu" ; lin poinsettia_N = mkN "poinsettia" "poinsettias"; -lin point_1_N = mkN "point" ; -lin point_2_N = mkN "point" ; -lin point_N = mkN "point" "points"; +lin point_1_N = mkN "point" "points"; +lin point_2_N = mkN "point" "points"; lin point_V = mkV "point" "points" "pointed" "pointed" "pointing"; lin point_V2 = mkV2 (mkV "point" "points" "pointed" "pointed" "pointing"); lin point_blank_A = compoundA (mkA "point-blank"); @@ -44145,10 +44044,9 @@ lin poona_PN = mkPN "Poona"; lin poop_N = mkN "poop" "poops"; lin poop_out_V = partV (mkV "poop") "out"; lin poop_out_on_V2 = prepV2 (partV (mkV "poop") "out") (mkPrep "on"); -lin poor_1_A = mkA "poor" ; -lin poor_2_A = mkA "poor" ; -lin poor_3_A = mkA "poor" ; -lin poor_A = mkA "poor" "poorer"; +lin poor_1_A = mkA "poor" "poorer"; +lin poor_2_A = mkA "poor" "poorer"; +lin poor_3_A = mkA "poor" "poorer"; lin poor_box_N = mkN "poor-box" "poor-boxes"; lin poor_rate_N = mkN "poor-rate" "poor-rates"; lin poor_spirited_A = compoundA (mkA "poor-spirited"); @@ -44889,7 +44787,6 @@ lin preside_V = mkV "preside" "presides" "presided" "presided" "presiding"; lin presidency_N = mkN "presidency" "presidencies"; lin presidentFem_N = mkN feminine (mkN "president" "presidents"); lin presidentMasc_N = mkN masculine (mkN "president" "presidents"); -lin president_N = mkN "president" ; lin presidential_A = compoundA (mkA "presidential"); lin presidio_N = mkN "presidio" ; lin presidium_N = mkN "presidium" "presidiums"; @@ -45340,7 +45237,6 @@ lin programme_N = mkN "programme" "programmes"; lin programme_V2 = mkV2 (mkV "programme" "programmes" "programmed" "programmed" "programming"); lin programmerFem_N = mkN feminine (mkN "programmer" "programmers"); lin programmerMasc_N = mkN masculine (mkN "programmer" "programmers"); -lin programmer_N = mkN "programmer" ; lin programming_N = mkN "programming" ; lin progress_N = mkN "progress" "progresses"; lin progress_V = mkV "progress" "progresses" "progressed" "progressed" "progressing"; @@ -45497,9 +45393,8 @@ lin propensity_N = mkN "propensity" "propensities"; lin proper_A = compoundA (mkA "proper"); lin properly_Adv = mkAdv "properly" ; lin propertied_A = compoundA (mkA "propertied"); -lin property_1_N = mkN "property" ; -lin property_2_N = mkN "property" ; -lin property_N = mkN "property" "properties"; +lin property_1_N = mkN "property" "properties"; +lin property_2_N = mkN "property" "properties"; lin property_man_N = mkN masculine (mkN "property-man" "property-men"); lin property_master_N = mkN "property-master" "property-masters"; lin propertyless_A = mkA "propertyless" ; @@ -45571,7 +45466,6 @@ lin prosecute_V2 = mkV2 (mkV "prosecute" "prosecutes" "prosecuted" "prosecuted" lin prosecution_N = mkN "prosecution" "prosecutions"; lin prosecutorFem_N = mkN feminine (mkN "prosecutor" "prosecutors"); lin prosecutorMasc_N = mkN masculine (mkN "prosecutor" "prosecutors"); -lin prosecutor_N = mkN "prosecutor" ; lin proselyte_N = mkN "proselyte" "proselytes"; lin proselytism_N = mkN "proselytism" ; lin proselytize_V = mkV "proselytize" "proselytizes" "proselytized" "proselytized" "proselytizing"; @@ -46697,9 +46591,8 @@ lin rabelaisian_A = compoundA (mkA "rabelaisian"); lin rabid_A = compoundA (mkA "rabid"); lin rabies_N = mkN "rabies" ; lin raccoon_N = mkN "raccoon" "raccoons"; -lin race_1_N = mkN "race" ; -lin race_2_N = mkN "race" ; -lin race_N = mkN "race" "races"; +lin race_1_N = mkN "race" "races"; +lin race_2_N = mkN "race" "races"; lin race_V = mkV "race" "races" "raced" "raced" "racing"; lin race_V2 = mkV2 (mkV "race" "races" "raced" "raced" "racing"); lin race_V2V = mkV2V (mkV "race" "races" "raced" "raced" "racing") noPrep to_Prep ; @@ -47499,11 +47392,10 @@ lin reconstruct_V2 = mkV2 (mkV "reconstruct" "reconstructs" "reconstructed" "rec lin reconstruction_N = mkN "reconstruction" "reconstructions"; lin reconstructive_A = mkA "reconstructive" ; lin reconvict_V2 = mkV2 (mkV "reconvict" "reconvicts" "reconvicted" "reconvicted" "reconvicting"); -lin record_1_N = mkN "record" ; -lin record_2_N = mkN "record" ; -lin record_3_N = mkN "record" ; +lin record_1_N = mkN "record" "records"; +lin record_2_N = mkN "record" "records"; +lin record_3_N = mkN "record" "records"; lin record_A = mkA "record" ; -lin record_N = mkN "record" "records"; lin record_V2 = mkV2 (mkV "record" "records" "recorded" "recorded" "recording"); lin record_breaking_A = compoundA (mkA "record-breaking"); lin record_player_N = mkN "record-player" "record-players"; @@ -47818,7 +47710,6 @@ lin reggae_N = mkN "reggae" ; lin regicide_N = mkN "regicide" "regicides"; lin regime_1_N = mkN "regime" "regimes"; lin regime_2_N = mkN "régime" "régimes"; -lin regime_N = mkN "regime" ; lin regimen_N = mkN "regimen" "regimens"; lin regiment_N = mkN "regiment" "regiments"; lin regiment_V2 = mkV2 (mkV "regiment" "regiments" "regimented" "regimented" "regimenting"); @@ -48104,7 +47995,6 @@ lin rending_A = mkA "rending" ; lin rendition_N = mkN "rendition" "renditions"; lin renegadeFem_N = mkN feminine (mkN "renegade" "renegades"); lin renegadeMasc_N = mkN masculine (mkN "renegade" "renegades"); -lin renegade_N = mkN "renegade" ; lin renegade_V = mkV "renegade" "renegades" "renegaded" "renegaded" "renegading"; lin renege_V = mkV "renege" "reneges" "reneged" "reneged" "reneging"; lin renegotiate_V2 = mkV2 (mkV "renegotiate"); @@ -48239,7 +48129,6 @@ lin reportage_N = mkN "reportage" ; lin reportedly_Adv = mkAdv "reportedly"; lin reporterFem_N = mkN feminine (mkN "reporter" "reporters"); lin reporterMasc_N = mkN masculine (mkN "reporter" "reporters"); -lin reporter_N = mkN "reporter" ; lin reporting_N = mkN "reporting" ; lin repose_N = mkN "repose" ; lin repose_V = mkV "repose" "reposes" "reposed" "reposed" "reposing"; @@ -48265,7 +48154,6 @@ lin representations_N = mkN "representations" ; lin representativeFem_N = mkN feminine (mkN "representative" "representatives"); lin representativeMasc_N = mkN masculine (mkN "representative" "representatives"); lin representative_A = compoundA (mkA "representative"); -lin representative_N = mkN "representative" ; lin repress_V2 = mkV2 (mkV "repress" "represses" "repressed" "repressed" "repressing"); lin repression_N = mkN "repression" "repressions"; lin repressive_A = compoundA (mkA "repressive"); @@ -48361,7 +48249,6 @@ lin research_V = mkV "research" "researches" "researched" "researched" "research lin research_V2 = mkV2 (mkV "research" "researches" "researched" "researched" "researching"); lin researcherFem_N = mkN feminine (mkN "researcher" "researchers"); lin researcherMasc_N = mkN masculine (mkN "researcher" "researchers"); -lin researcher_N = mkN "researcher" ; lin reseat_V2 = mkV2 (mkV "reseat" "reseats" "reseated" "reseated" "reseating"); lin reseau_N = mkN "reseau" ; lin resection_N = mkN "resection" ; @@ -48926,7 +48813,6 @@ lin ride_out_V2 = mkV2 (partV IrregEng.ride_V "out"); lin ride_up_V = partV IrregEng.ride_V "up"; lin riderFem_N = mkN feminine (mkN "rider" "riders"); lin riderMasc_N = mkN masculine (mkN "rider" "riders"); -lin rider_N = mkN "rider" ; lin riderless_A = compoundA (mkA "riderless"); lin ridge_N = mkN "ridge" "ridges"; lin ridge_V2 = mkV2 (mkV "ridge" "ridges" "ridged" "ridged" "ridging"); @@ -48972,8 +48858,6 @@ lin right_1_A = mkA "right" ; lin right_1_Adv = mkAdv "right" ; lin right_2_A = mkA "right" ; lin right_2_Adv = mkAdv "right" ; -lin right_A = compoundA (mkA "right"); -lin right_Adv = mkAdv "right"; lin right_Interj = mkInterj "right" ; lin right_N = mkN "right" "rights"; lin right_V2 = mkV2 (mkV "right" "rights" "righted" "righted" "righting"); @@ -49252,7 +49136,6 @@ lin roil_V2 = mkV2 (mkV "roil"); lin roisterer_N = mkN "roisterer" "roisterers"; lin role_1_N = mkN "role" "roles"; lin role_2_N = mkN "rôle" "rôles"; -lin role_N = mkN "role" ; lin roleplaying_N = mkN "roleplaying" ; lin roll_N = mkN "roll" "rolls"; lin roll_V = mkV "roll" "rolls" "rolled" "rolled" "rolling"; @@ -50005,7 +49888,6 @@ lin saintliness_N = mkN "saintliness" ; lin saintly_A = mkA "saintly" "saintlier"; lin sake_1_N = mkN "sake" "sakes"; lin sake_2_N = mkN "saké" "sakés" ; -lin sake_N = mkN "sake" ; lin saki_N = mkN "saki" ; lin sal_volatile_N = mkN "sal volatile" "sal volatiles" ; lin salaam_N = mkN "salaam" "salaams"; @@ -51460,7 +51342,6 @@ lin sell_out_V2 = mkV2 (partV IrregEng.sell_V "out"); lin sell_up_V2 = mkV2 (partV IrregEng.sell_V "up"); lin sellerFem_N = mkN feminine (mkN "seller" "sellers"); lin sellerMasc_N = mkN masculine (mkN "seller" "sellers"); -lin seller_N = mkN "seller" ; lin selling_N = mkN "selling" ; lin selloff_N = mkN "selloff" ; lin sellout_N = mkN "sellout" "sellouts"; @@ -51767,7 +51648,6 @@ lin serum_N = mkN "serum" ; lin serval_N = mkN "serval" ; lin servantFem_N = mkN feminine (mkN "servant" "servants"); lin servantMasc_N = mkN masculine (mkN "servant" "servants"); -lin servant_N = mkN "servant" ; lin serve_N = mkN "serve" "serves"; lin serve_V = mkV "serve" "serves" "served" "served" "serving"; lin serve_V2 = mkV2 (mkV "serve" "serves" "served" "served" "serving"); @@ -51798,9 +51678,8 @@ lin sesquipedality_N = mkN "sesquipedality" ; lin sessile_A = mkA "sessile" ; lin session_N = mkN "session" "sessions"; lin sestet_N = mkN "sestet" ; -lin set_1_N = mkN "set" ; -lin set_2_N = mkN "set" ; -lin set_N = mkN "set" "sets"; +lin set_1_N = mkN "set" "sets"; +lin set_2_N = mkN "set" "sets"; --subcat lin set_V = IrregEng.set_V; lin set_V2 = mkV2 (IrregEng.set_V); --subcat lin set_VS = mkVS (IrregEng.set_V); @@ -52903,9 +52782,8 @@ lin singe_V2 = mkV2 (mkV "singe" "IRREG" "IRREG" "IRREG" "IRREG"); lin singer_N = mkN "singer" "singers"; lin singhalese_A = compoundA (mkA "singhalese"); lin singing_N = mkN "singing" ; -lin single_1_A = mkA "single" ; -lin single_2_A = mkA "single" ; -lin single_A = compoundA (mkA "single"); +lin single_1_A = compoundA (mkA "single"); +lin single_2_A = compoundA (mkA "single"); lin single_N = mkN "single" "singles"; lin single_V2 = mkV2 (mkV "single" "singles" "singled" "singled" "singling"); lin single_breasted_A = compoundA (mkA "single-breasted"); @@ -54056,7 +53934,6 @@ lin solicit_V2 = mkV2 (mkV "solicit" "solicits" "solicited" "solicited" "solicit lin solicitation_N = mkN "solicitation" "solicitations"; lin solicitorFem_N = mkN feminine (mkN "solicitor" "solicitors"); lin solicitorMasc_N = mkN masculine (mkN "solicitor" "solicitors"); -lin solicitor_N = mkN "solicitor" ; lin solicitor_general_N = mkN "solicitor-general" "solicitor-generals"; lin solicitorship_N = mkN "solicitorship" ; lin solicitous_A = compoundA (mkA "solicitous"); @@ -54556,7 +54433,6 @@ lin spectacular_A = compoundA (mkA "spectacular"); lin spectacular_N = mkN "spectacular" "spectaculars"; lin spectatorFem_N = mkN feminine (mkN "spectator" "spectators"); lin spectatorMasc_N = mkN masculine (mkN "spectator" "spectators"); -lin spectator_N = mkN "spectator" ; lin spectinomycin_N = mkN "spectinomycin" ; lin spectral_A = compoundA (mkA "spectral"); lin spectre_N = mkN "spectre" "spectres"; @@ -54936,7 +54812,6 @@ lin spotty_A = mkA "spotty" "spottier"; lin spousal_A = mkA "spousal" ; lin spouseFem_N = mkN feminine (mkN "spouse" "spouses"); lin spouseMasc_N = mkN masculine (mkN "spouse" "spouses"); -lin spouse_N = mkN "spouse" ; lin spout_N = mkN "spout" "spouts"; lin spout_V = mkV "spout" "spouts" "spouted" "spouted" "spouting"; lin spout_V2 = mkV2 (mkV "spout" "spouts" "spouted" "spouted" "spouting"); @@ -55209,9 +55084,8 @@ lin stackup_N = mkN "stackup"; lin stacte_N = mkN "stacte" ; lin staddle_N = mkN "staddle" ; lin stadium_N = mkN "stadium" "stadiums"; -lin staff_1_N = mkN "staff" ; -lin staff_2_N = mkN "staff" ; -lin staff_N = mkN "staff" "staffs"; +lin staff_1_N = mkN "staff" "staffs"; +lin staff_2_N = mkN "staff" "staffs"; lin staff_V2 = mkV2 (mkV "staff" "staffs" "staffed" "staffed" "staffing"); lin staff_office_N = mkN "staff-office" "staff-offices"; lin staff_up_V2 = mkV2 (partV (mkV "staff") "up"); @@ -55434,7 +55308,6 @@ lin starter_4_N = mkN human (mkN "starter" "starters"); lin starter_5_N = mkN "starter" "starters"; lin starter_6_N = mkN "starter" "starters"; lin starter_7_N = mkN "starter" "starters"; -lin starter_N = mkN "starter" ; lin starting_gate_N = mkN "starting-gate" "starting-gates"; lin starting_point_N = mkN "starting-point" "starting-points"; lin starting_post_N = mkN "starting-post" "starting-posts"; @@ -55449,9 +55322,8 @@ lin starveling_N = mkN "starveling" "starvelings"; lin stash_V2 = mkV2 (mkV "stash" "stashes" "stashed" "stashed" "stashing"); lin stash_away_V2 = mkV2 (partV (mkV "stash") "away"); lin stasis_N = mkN "stasis" ; -lin state_1_N = mkN "state" ; -lin state_2_N = mkN "state" ; -lin state_N = mkN "state" "states"; +lin state_1_N = mkN "state" "states"; +lin state_2_N = mkN "state" "states"; lin state_V2 = mkV2 (mkV "state" "states" "stated" "stated" "stating"); lin state_VS = mkVS (mkV "state"); lin statecraft_N = mkN "statecraft" ; @@ -56196,7 +56068,6 @@ lin stridulation_N = mkN "stridulation" "stridulations"; lin strife_N = mkN "strife" ; lin strike_1_N = mkN "strike" "strikes"; lin strike_2_N = mkN "strike" "strikes"; -lin strike_N = mkN "strike" ; lin strike_V = IrregEng.strike_V; lin strike_V2 = mkV2 (IrregEng.strike_V); lin strike_back_V = partV IrregEng.strike_V "back"; @@ -56315,7 +56186,6 @@ lin stud_mare_N = mkN "stud-mare" "stud-mares"; lin studbook_N = mkN "studbook" "studbooks"; lin studentFem_N = mkN feminine (mkN "student" "students"); lin studentMasc_N = mkN masculine (mkN "student" "students"); -lin student_N = mkN "student" ; lin studentship_N = mkN "studentship" ; lin studio_N = mkN "studio" "studios"; lin studious_A = compoundA (mkA "studious"); @@ -56457,11 +56327,10 @@ lin subgroup_N = mkN "subgroup" "subgroups"; lin subheading_N = mkN "subheading" "subheadings"; lin subhuman_A = compoundA (mkA "subhuman"); lin subjacent_A = mkA "subjacent" ; -lin subject_1_N = mkN "subject" ; -lin subject_2_N = mkN "subject" ; +lin subject_1_N = mkN "subject" "subjects"; +lin subject_2_N = mkN "subject" "subjects"; lin subject_A = mkA "subject" ; lin subject_A2 = mkA2 (compoundA (mkA "subject")) to_Prep; -lin subject_N = mkN "subject" "subjects"; lin subject_V2 = mkV2 (mkV "subject" "subjects" "subjected" "subjected" "subjecting"); lin subject_to_Prep = mkPrep "subject to"; lin subjection_N = mkN "subjection" ; @@ -58136,7 +58005,6 @@ lin teach_in_N = mkN "teach-in" "teach-ins"; lin teachable_A = compoundA (mkA "teachable"); lin teacherFem_N = mkN feminine (mkN "teacher" "teachers"); lin teacherMasc_N = mkN masculine (mkN "teacher" "teachers"); -lin teacher_N = mkN "teacher" ; lin teachership_N = mkN "teachership" ; lin teaching_N = mkN "teaching" "teachings"; lin teacup_N = mkN "teacup" "teacups"; @@ -58899,7 +58767,6 @@ lin think_up_V2 = mkV2 (partV IrregEng.think_V "up"); lin thinkable_A = compoundA (mkA "thinkable"); lin thinkerFem_N = mkN feminine (mkN "thinker" "thinkers"); lin thinkerMasc_N = mkN masculine (mkN "thinker" "thinkers"); -lin thinker_N = mkN "thinker" ; lin thinking_A = mkA "thinking" ; lin thinking_N = mkN "thinking" ; lin thinness_N = mkN "thinness" ; @@ -59277,9 +59144,8 @@ lin timbered_A = compoundA (mkA "timbered"); lin timberman_N = mkN masculine (mkN "timberman"); lin timbre_N = mkN "timbre" "timbres"; lin timbrel_N = mkN "timbrel" "timbrels"; -lin time_1_N = mkN "time" ; -lin time_2_N = mkN "time" ; -lin time_N = mkN "time" "times"; +lin time_1_N = mkN "time" "times"; +lin time_2_N = mkN "time" "times"; lin time_V2 = mkV2 (mkV "time" "times" "timed" "timed" "timing"); lin time_ball_N = mkN "time-ball" "time-balls"; lin time_bomb_N = mkN "time-bomb" "time-bombs"; @@ -61032,7 +60898,6 @@ lin typhus_N = mkN "typhus" ; lin typical_1_A = compoundA (mkA "typical"); lin typical_2_A = compoundA (mkA "typical"); lin typical_3_A = compoundA (mkA "typical"); -lin typical_A = mkA "typical" ; lin typicality_N = mkN "typicality" ; lin typically_Adv = mkAdv "typically" ; lin typification_N = mkN "typification" ; @@ -61646,7 +61511,8 @@ lin understanding_N = mkN "understanding" "understandings"; lin understate_V2 = mkV2 (mkV "understate" "understates" "understated" "understated" "understating"); lin understatement_N = mkN "understatement" "understatements"; lin understock_V2 = mkV2 (mkV "understock" "understocks" "understocked" "understocked" "understocking"); -lin understudy_N = mkN "understudy" "understudies"; +lin understudyMasc_N = mkN masculine (mkN "understudy" "understudies"); +lin understudyFem_N = mkN feminine (mkN "understudy" "understudies"); lin understudy_V2 = mkV2 (mkV "understudy" "understudies" "understudied" "understudied" "understudying"); lin undersurface_N = mkN "undersurface" "undersurfaces"; lin undertake_V2 = mkV2 (mkV "under" IrregEng.take_V); @@ -62082,7 +61948,6 @@ lin unit_3_N = mkN "unit" "units"; lin unit_4_N = mkN "unit" "units"; lin unit_5_N = mkN "unit" "units"; lin unit_6_N = mkN "unit" "units"; -lin unit_N = mkN "unit" ; lin unit_V2V = mkV2V (mkV "unit") noPrep to_Prep ; lin unitarian_A = compoundA (mkA "unitarian"); lin unitarian_N = mkN "unitarian" "unitarians"; @@ -63017,7 +62882,6 @@ lin useless_A = compoundA (mkA "useless"); lin uselessness_N = mkN "uselessness" ; lin userFem_N = mkN feminine (mkN "user" "users"); lin userMasc_N = mkN masculine (mkN "user" "users"); -lin user_N = mkN "user" ; lin ushaw_moor_PN = mkPN "Ushaw moor"; lin usher_N = mkN "usher" "ushers"; lin usher_V2 = mkV2 (mkV "usher" "ushers" "ushered" "ushered" "ushering"); @@ -63238,9 +63102,8 @@ lin variedness_N = mkN "variedness" ; lin variegated_A = compoundA (mkA "variegated"); lin variegation_N = mkN "variegation" "variegations"; lin varietal_N = mkN "varietal" ; -lin variety_1_N = mkN "variety" ; -lin variety_2_N = mkN "variety" ; -lin variety_N = mkN "variety" "varieties"; +lin variety_1_N = mkN "variety" "varieties"; +lin variety_2_N = mkN "variety" "varieties"; lin variform_A = compoundA (mkA "variform"); lin variolar_A = mkA "variolar" ; lin variolation_N = mkN "variolation" ; @@ -63636,7 +63499,6 @@ lin vietnamese_A = compoundA (mkA "Vietnamese"); lin vietnamese_N = mkN "Vietnamese" "Vietnamese"; lin view_1_N = mkN "view" ; lin view_2_N = mkN "view" ; -lin view_N = mkN "view" "views"; lin view_V2 = mkV2 (mkV "view" "views" "viewed" "viewed" "viewing"); lin viewable_A = mkA "viewable" ; lin viewer_N = mkN "viewer" "viewers"; @@ -63714,7 +63576,6 @@ lin violet_PN = mkPN "Violet"; lin violin_N = mkN "violin" "violins"; lin violinistFem_N = mkN feminine (mkN "violinist" "violinists"); lin violinistMasc_N = mkN masculine (mkN "violinist" "violinists"); -lin violinist_N = mkN "violinist" ; lin violistFem_N = mkN feminine (mkN "violist"); lin violistMasc_N = mkN masculine (mkN "violist"); lin viomycin_N = mkN "viomycin" ; @@ -63918,7 +63779,6 @@ lin voluntary_A = compoundA (mkA "voluntary"); lin voluntary_N = mkN "voluntary" "voluntaries"; lin volunteerFem_N = mkN feminine (mkN "volunteer" "volunteers"); lin volunteerMasc_N = mkN masculine (mkN "volunteer" "volunteers"); -lin volunteer_N = mkN "volunteer" ; lin volunteer_V = mkV "volunteer" "volunteers" "volunteered" "volunteered" "volunteering"; lin volunteer_V2 = mkV2 (mkV "volunteer" "volunteers" "volunteered" "volunteered" "volunteering"); --subcat lin volunteer_V2V = mkV2V (mkV "volunteer" "volunteers" "volunteered" "volunteered" "volunteering") noPrep to_Prep ; @@ -64495,7 +64355,6 @@ lin waxycap_N = mkN "waxycap" ; lin way_1_N = mkN "way" ; lin way_2_N = mkN "way" ; lin way_Adv = mkAdv "way"; -lin way_N = mkN "way" "ways"; lin way_out_A = compoundA (mkA "way-out"); lin waybill_N = mkN "waybill" "waybills"; lin wayfarer_N = mkN "wayfarer" "wayfarers"; @@ -64569,12 +64428,12 @@ lin weathervane_N = mkN "weathervane" ; lin weave_N = mkN "weave" "weaves"; lin weave_V = IrregEng.weave_V; lin weave_V2 = mkV2 (IrregEng.weave_V); -lin weaver_N = mkN "weaver" "weavers"; +lin weaverMasc_N = mkN masculine (mkN "weaver" "weavers"); +lin weaverFem_N = mkN feminine (mkN "weaver" "weavers"); lin weaverbird_N = mkN "weaverbird" "weaverbirds"; lin weaving_N = mkN "weaving" ; -lin web_1_N = mkN "web" ; -lin web_2_N = mkN "web" ; -lin web_N = mkN "web" "webs"; +lin web_1_N = mkN "web" "webs"; +lin web_2_N = mkN "web" "webs"; lin web_footed_A = compoundA (mkA "web-footed"); lin web_toed_A = compoundA (mkA "web-toed"); lin webbed_A = compoundA (mkA "webbed"); @@ -65525,7 +65384,6 @@ lin wordy_A = mkA "wordy" "wordier"; lin work_1_V = mkV "work" ; lin work_2_V = mkV "work" ; lin work_N = mkN "work" "works"; -lin work_V = mkV "work" "works" "worked" "worked" "working"; lin work_V2 = mkV2 (mkV "work" "works" "worked" "worked" "working"); --subcat lin work_VV = mkVV (mkV "work" "works" "worked" "worked" "working"); lin work_in_N = mkN "work-in" "work-ins"; @@ -65899,7 +65757,6 @@ lin yesterday_N = mkN "yesterday" "yesterdays"; lin yet_1_Adv = mkAdv "yet" ; lin yet_2_Adv = mkAdv "yet" ; lin yet_AdV = mkAdV "yet"; -lin yet_Adv = mkAdv "yet"; lin yeti_N = mkN "yeti" "yetis"; lin yew_N = mkN "yew" "yews"; lin yew_tree_N = mkN "yew-tree" "yew-trees";