diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 5d7f4b411..c65ddeca3 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -1579,6 +1579,7 @@ lin applique_V2 = mkV2 (mkV "appliqué" "appliqués" "appliquéed" "appliquéed" lin apply_V = mkV "apply" "applies" "applied" "applied" "applying"; lin apply_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying"); 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"); lin appoint_V2V = mkV2V (mkV "appoint") noPrep to_Prep ; lin appoint_VS = mkVS (mkV "appoint"); @@ -5103,8 +5104,10 @@ lin canary_wine_N = mkN "canary-wine" "canary-wines"; lin canasta_N = mkN "canasta" "canastas"; lin canberra_PN = mkPN "Canberra"; lin cancan_N = mkN "cancan" "cancans"; -lin cancel_V = mkV "cancel" "cancels" "cancelled" "cancelled" "cancelling"; -lin cancel_V2 = mkV2 (mkV "cancel" "cancels" "cancelled" "cancelled" "cancelling"); +lin cancel_V = variants {mkV "cancel" "cancels" "canceled" "canceled" "canceling"; + mkV "cancel" "cancels" "cancelled" "cancelled" "cancelling"}; +lin cancel_V2 = mkV2 (variants {mkV "cancel" "cancels" "canceled" "canceled" "canceling"; + mkV "cancel" "cancels" "cancelled" "cancelled" "cancelling"}); lin cancellation_N = mkN "cancellation" "cancellations"; lin cancer_N = mkN "cancer" "cancers"; lin cancer_PN = mkPN "Cancer"; @@ -6124,6 +6127,7 @@ lin choose_V = IrregEng.choose_V; lin choose_V2 = mkV2 (IrregEng.choose_V); lin choose_V2V = mkV2V (IrregEng.choose_V) noPrep to_Prep ; lin choose_VS = mkVS (IrregEng.choose_V); +lin choose_VV = mkVV (IrregEng.choose_V) ; lin choosey_A = compoundA (mkA "choosey"); lin choosy_A = mkA "choosy" "choosier"; lin chop_N = mkN "chop" "chops"; @@ -6952,6 +6956,7 @@ lin combine_N = mkN "combine" "combines"; lin combine_V = mkV "combine" "combines" "combined" "combined" "combining"; lin combine_V2 = mkV2 (mkV "combine" "combines" "combined" "combined" "combining"); lin combine_V2V = mkV2V (mkV "combine" "combines" "combined" "combined" "combining") noPrep to_Prep ; +lin combine_VV = mkVV (mkV "combine" "combines" "combined" "combined" "combining"); lin combustible_A = compoundA (mkA "combustible"); lin combustible_N = mkN "combustible" "combustibles"; lin combustion_N = mkN "combustion" ; @@ -9844,6 +9849,7 @@ lin determinative_N = mkN "determinative" "determinatives"; lin determine_V = mkV "determine" "determines" "determined" "determined" "determining"; lin determine_V2 = mkV2 (mkV "determine" "determines" "determined" "determined" "determining"); lin determine_V2V = mkV2V (mkV "determine" "determines" "determined" "determined" "determining") noPrep to_Prep ; +lin determine_VV = mkVV (mkV "determine" "determines" "determined" "determined" "determining") ; lin determine_VS = mkVS (mkV "determine" "determines" "determined" "determined" "determining"); lin determinedly_Adv = mkAdv "determinedly"; lin determiner_N = mkN "determiner" "determiners"; @@ -12553,6 +12559,7 @@ lin examiner_N = mkN "examiner" "examiners"; lin example_N = mkN "example" "examples"; lin exasperate_V2 = mkV2 (mkV "exasperate" "exasperates" "exasperated" "exasperated" "exasperating"); lin exasperation_N = mkN "exasperation" ; +lin excavate_V = mkV "excavate" "excavates" "excavated" "excavated" "excavating"; lin excavate_V2 = mkV2 (mkV "excavate" "excavates" "excavated" "excavated" "excavating"); lin excavation_N = mkN "excavation" "excavations"; lin excavator_N = mkN "excavator" "excavators"; @@ -12874,7 +12881,7 @@ lin exult_V = mkV "exult" "exults" "exulted" "exulted" "exulting"; lin exultant_A = compoundA (mkA "exultant"); lin exultation_N = mkN "exultation" ; lin eye_N = mkN "eye" "eyes"; -lin eye_V2 = mkV2 (mkV "eye" "eyes" "eyed" "eyed" "eying"); +lin eye_V2 = mkV2 (mkV "eye" "eyes" "eyed" "eyed" "eyeing"); lin eye_catching_A = compoundA (mkA "eye-catching"); lin eye_opener_N = mkN "eye-opener" "eye-openers"; lin eye_shadow_N = mkN "eye-shadow" ; @@ -13174,8 +13181,8 @@ lin faun_N = mkN "faun" "fauns"; lin faux_pas_N = mkN "faux pas" "faux pas"; lin faversham_PN = mkPN "Faversham"; lin favor_V = mkV "favor"; -lin favor_V2 = mkV2 (mkV "favor"); -lin favor_VS = mkVS (mkV "favor"); +lin favor_V2 = mkV2 (mkV "favor" "favored"); +lin favor_VS = mkVS (mkV "favor" "favored"); lin favour_N = mkN "favour" "favours"; lin favour_V2 = mkV2 (mkV "favour" "favours" "favoured" "favoured" "favouring"); lin favourable_A = compoundA (mkA "favourable"); @@ -14613,8 +14620,12 @@ lin fuddle_V2 = mkV2 (mkV "fuddle" "fuddles" "fuddled" "fuddled" "fuddling"); lin fuddy_duddy_N = mkN "fuddy-duddy" "fuddy-duddies"; lin fudge_N = mkN "fudge" "fudges"; lin fuel_N = mkN "fuel" "fuels"; -lin fuel_V = mkV "fuel" "fuels" "fuelled" "fuelled" "fuelling"; -lin fuel_V2 = mkV2 (mkV "fuel" "fuels" "fuelled" "fuelled" "fuelling"); +lin fuel_V = variants {mkV "fuel" "fuels" "fueled" "fueled" "fueling"; -- US + mkV "fuel" "fuels" "fuelled" "fuelled" "fuelling"; + }; +lin fuel_V2 = mkV2 (variants {mkV "fuel" "fuels" "fueled" "fueled" "fueling"; -- US + mkV "fuel" "fuels" "fuelled" "fuelled" "fuelling"; + }); lin fug_N = mkN "fug" "fugs"; lin fuggy_A = mkA "fuggy" "fuggier"; lin fugitive_A = compoundA (mkA "fugitive"); @@ -16844,6 +16855,7 @@ lin herd_N = mkN "herd" "herds"; lin herd_V = mkV "herd" "herds" "herded" "herded" "herding"; lin herd_V2 = mkV2 (mkV "herd" "herds" "herded" "herded" "herding"); lin herdsman_N = mkN "herdsman" "herdsmen" {- FIXME: guessed plural form -}; +lin here_Adv = mkAdv "here"; lin hereabouts_Adv = mkAdv "hereabouts"; lin hereafter_Adv = mkAdv "hereafter"; lin hereafter_N = mkN "hereafter" "IRREG"; @@ -18229,6 +18241,7 @@ lin inclosure_N = mkN "inclosure" "inclosures"; lin include_V = mkV "include"; lin include_V2 = mkV2 (mkV "include" "includes" "included" "included" "including"); lin include_VS = mkVS (mkV "include"); +lin include_VV = ingVV (mkV "include"); lin inclusion_N = mkN "inclusion" ; lin inclusive_A = compoundA (mkA "inclusive"); lin incognito_A = compoundA (mkA "incognito"); @@ -19714,6 +19727,7 @@ lin jump_N = mkN "jump" "jumps"; lin jump_V = mkV "jump" "jumps" "jumped" "jumped" "jumping"; lin jump_V2 = mkV2 (mkV "jump" "jumps" "jumped" "jumped" "jumping"); lin jump_V2V = mkV2V (mkV "jump" "jumps" "jumped" "jumped" "jumping") noPrep to_Prep ; +lin jump_VV = mkVV (mkV "jump" "jumps" "jumped" "jumped" "jumping") ; lin jumped_up_A = compoundA (mkA "jumped-up"); lin jumper_N = mkN "jumper" "jumpers"; lin jumpiness_N = mkN "jumpiness" ; @@ -21142,6 +21156,7 @@ lin live_A = compoundA (mkA "live"); lin live_Adv = mkAdv "live"; lin live_V = mkV "live" "lives" "lived" "lived" "living"; lin live_V2 = mkV2 (mkV "live" "lives" "lived" "lived" "living"); +lin live_VV = mkVV (mkV "live" "lives" "lived" "lived" "living"); lin live_birth_N = mkN "live-birth" "live-births"; lin liveable_A = compoundA (mkA "liveable"); lin livelihood_N = mkN "livelihood" "livelihoods"; @@ -23294,6 +23309,8 @@ lin moke_N = mkN "moke" "mokes"; lin molar_A = compoundA (mkA "molar"); lin molar_N = mkN "molar" "molars"; lin molasses_N = mkN "molasses" ; +lin mold_V = mkV "mold"; +lin mold_V2 = mkV2 "mold"; lin mold_PN = mkPN "Mold"; lin moldy_A = mkA "moldy" "moldier"; lin mole_N = mkN "mole" "moles"; @@ -23551,6 +23568,7 @@ lin moss_N = mkN "moss" "mosses"; lin moss_grown_A = compoundA (mkA "moss-grown"); lin mossley_PN = mkPN "Mossley"; lin mossy_A = mkA "mossy" "mossier"; +lin most_Det = mkDeterminer plural "most"; lin mostly_Adv = mkAdv "mostly"; lin mote_N = mkN "mote" "motes"; lin motel_N = mkN "motel" "motels"; @@ -23646,6 +23664,7 @@ 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"); lin move_V2V = mkV2V (mkV "move" "moves" "moved" "moved" "moving") noPrep to_Prep ; +lin move_VV = mkVV (mkV "move" "moves" "moved" "moved" "moving") ; lin movement_N = mkN "movement" "movements"; lin mover_N = mkN "mover" "movers"; lin movie_N = mkN "movie" "movies"; @@ -28490,6 +28509,7 @@ lin presumable_A = compoundA (mkA "presumable"); lin presume_V = mkV "presume" "presumes" "presumed" "presumed" "presuming"; lin presume_V2 = mkV2 (mkV "presume" "presumes" "presumed" "presumed" "presuming"); lin presume_VS = mkVS (mkV "presume" "presumes" "presumed" "presumed" "presuming"); +lin presume_VV = mkVV (mkV "presume" "presumes" "presumed" "presumed" "presuming"); lin presuming_A = compoundA (mkA "presuming"); lin presumption_N = mkN "presumption" "presumptions"; lin presumptive_A = compoundA (mkA "presumptive"); @@ -29500,6 +29520,7 @@ lin quern_N = mkN "quern" "querns"; lin querulous_A = compoundA (mkA "querulous"); lin querulousness_N = mkN "querulousness" ; lin query_N = mkN "query" "queries"; +lin query_V = mkV "query" "queries" "queried" "queried" "querying"; lin query_V2 = mkV2 (mkV "query" "queries" "queried" "queried" "querying"); lin quest_N = mkN "quest" "quests"; lin quest_V = mkV "quest" "quests" "quested" "quested" "questing"; @@ -29632,6 +29653,7 @@ lin race_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 ; +lin race_VV = mkVV (mkV "race" "races" "raced" "raced" "racing") ; lin race_meeting_N = mkN "race-meeting" "race-meetings"; lin racecard_N = mkN "racecard" "racecards"; lin racecourse_N = mkN "racecourse" "racecourses"; @@ -30641,8 +30663,10 @@ lin remit_V2 = mkV2 (mkV "remit" "remits" "remitted" "remitted" "remitting"); lin remittance_N = mkN "remittance" "remittances"; lin remittent_A = compoundA (mkA "remittent"); lin remnant_N = mkN "remnant" "remnants"; -lin remodel_V = mkV "remodel"; -lin remodel_V2 = mkV2 (mkV "remodel" "remodels" "remodelled" "remodelled" "remodelling"); +lin remodel_V = variants {mkV "remodel" "remodels" "remodeled" "remodeled" "remodeling"; + mkV "remodel" "remodels" "remodelled" "remodelled" "remodelling"}; +lin remodel_V2 = mkV2 (variants {mkV "remodel" "remodels" "remodeled" "remodeled" "remodeling"; + mkV "remodel" "remodels" "remodelled" "remodelled" "remodelling"}); lin remonstrance_N = mkN "remonstrance" "remonstrances"; lin remonstrate_V = mkV "remonstrate" "remonstrates" "remonstrated" "remonstrated" "remonstrating"; lin remorse_N = mkN "remorse" ; @@ -30894,6 +30918,7 @@ lin resell_V2 = mkV2 (mkV "re" IrregEng.sell_V); lin resemblance_N = mkN "resemblance" "resemblances"; lin resemble_V2 = mkV2 (mkV "resemble" "resembles" "resembled" "resembled" "resembling"); lin resent_V2 = mkV2 (mkV "resent" "resents" "resented" "resented" "resenting"); +lin resent_VS = mkVS (mkV "resent" "resents" "resented" "resented" "resenting"); lin resentful_A = compoundA (mkA "resentful"); lin resentment_N = mkN "resentment" ; lin reservation_N = mkN "reservation" "reservations"; @@ -30924,6 +30949,7 @@ lin resign_V = mkV "resign" "resigns" "resigned" "resigned" "resigning"; lin resign_V2 = mkV2 (mkV "resign" "resigns" "resigned" "resigned" "resigning"); lin resign_V2V = mkV2V (mkV "resign" "resigns" "resigned" "resigned" "resigning") noPrep to_Prep ; lin resign_VS = mkVS (mkV "resign" "resigns" "resigned" "resigned" "resigning"); +lin resign_VV = mkVV (mkV "resign" "resigns" "resigned" "resigned" "resigning") ; lin resignation_N = mkN "resignation" "resignations"; lin resigned_A = compoundA (mkA "resigned"); lin resilience_N = mkN "resilience" ; @@ -32655,6 +32681,7 @@ lin scram_V = mkV "scram" "scrams" "scrammed" "scrammed" "scramming"; lin scramble_N = mkN "scramble" "scrambles"; lin scramble_V = mkV "scramble" "scrambles" "scrambled" "scrambled" "scrambling"; lin scramble_V2 = mkV2 (mkV "scramble" "scrambles" "scrambled" "scrambled" "scrambling"); +lin scramble_VV = mkVV (mkV "scramble" "scrambles" "scrambled" "scrambled" "scrambling"); lin scramble_V2V = mkV2V (mkV "scramble" "scrambles" "scrambled" "scrambled" "scrambling") noPrep to_Prep ; lin scrambler_N = mkN "scrambler" "scramblers"; lin scrap_N = mkN "scrap" "scraps"; @@ -37158,6 +37185,8 @@ lin swazi_N = mkN "swazi" "swazis"; lin swaziland_PN = mkPN "Swaziland"; lin swear_V = IrregEng.swear_V; lin swear_V2 = mkV2 (IrregEng.swear_V); +lin swear_V2V = mkV2V (IrregEng.swear_V) noPrep to_Prep ; +lin swear_VV = mkVV (IrregEng.swear_V) ; lin swearer_N = mkN "swearer" "swearers"; lin swearing_N = mkN "swearing" ; lin swearword_N = mkN "swearword" "swearwords"; @@ -37280,8 +37309,6 @@ lin swordplay_N = mkN "swordplay" ; lin swordsman_N = mkN "swordsman" "swordsmen" {- FIXME: guessed plural form -}; lin swordsmanship_N = mkN "swordsmanship" ; lin swordstick_N = mkN "swordstick" "swordsticks"; -lin swore_V2V = mkV2V (mkV "swore") noPrep to_Prep ; -lin sworn_A = compoundA (mkA "sworn"); lin swot_N = mkN "swot" "swots"; lin swot_V = mkV "swot" "swots" "swotted" "swotted" "swotting"; lin swot_V2 = mkV2 (mkV "swot" "swots" "swotted" "swotted" "swotting"); @@ -38124,6 +38151,7 @@ lin therapeutical_A = compoundA (mkA "therapeutical"); lin therapeutics_N = mkN "therapeutics" "therapeutics"; lin therapist_N = mkN "therapist" "therapists"; lin therapy_N = mkN "therapy" "therapies"; +lin there_Adv = mkAdv "there"; lin thereabout_Adv = mkAdv "thereabout"; lin thereabouts_Adv = mkAdv "thereabouts"; lin thereafter_Adv = mkAdv "thereafter"; @@ -38633,6 +38661,7 @@ lin togolese_N = mkN "togolese" "togolese"; lin toil_N = mkN "toil" "toils"; lin toil_V = mkV "toil" "toils" "toiled" "toiled" "toiling"; lin toil_V2V = mkV2V (mkV "toil" "toils" "toiled" "toiled" "toiling") noPrep to_Prep ; +lin toil_VV = mkVV (mkV "toil" "toils" "toiled" "toiled" "toiling") ; lin toiler_N = mkN "toiler" "toilers"; lin toilet_N = mkN "toilet" "toilets"; lin toilet_paper_N = mkN "toilet-paper" "toilet-papers"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index c5e3a0d1e..dd33a978e 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -1574,6 +1574,7 @@ fun applique_V2 : V2; fun apply_V : V; fun apply_V2 : V2; fun apply_V2V : V2V; +fun apply_VV : VV; fun appoint_V2 : V2; fun appoint_V2V : V2V; fun appoint_VS : VS; @@ -6108,6 +6109,7 @@ fun choose_V : V; fun choose_V2 : V2; fun choose_V2V : V2V; fun choose_VS : VS; +fun choose_VV : VV; fun choosey_A : A; fun choosy_A : A; fun chop_N : N; @@ -6936,6 +6938,7 @@ fun combine_N : N; fun combine_V : V; fun combine_V2 : V2; fun combine_V2V : V2V; +fun combine_VV : VV; fun combustible_A : A; fun combustible_N : N; fun combustion_N : N; @@ -9828,6 +9831,7 @@ fun determinative_N : N; fun determine_V : V; fun determine_V2 : V2; fun determine_V2V : V2V; +fun determine_VV : VV; fun determine_VS : VS; fun determinedly_Adv : Adv; fun determiner_N : N; @@ -12536,6 +12540,7 @@ fun examiner_N : N; fun example_N : N; fun exasperate_V2 : V2; fun exasperation_N : N; +fun excavate_V : V; fun excavate_V2 : V2; fun excavation_N : N; fun excavator_N : N; @@ -16827,6 +16832,7 @@ fun herd_N : N; fun herd_V : V; fun herd_V2 : V2; fun herdsman_N : N; +fun here_Adv : Adv; fun hereabouts_Adv : Adv; fun hereafter_Adv : Adv; fun hereafter_N : N; @@ -18212,6 +18218,7 @@ fun inclosure_N : N; fun include_V : V; fun include_V2 : V2; fun include_VS : VS; +fun include_VV : VV; fun inclusion_N : N; fun inclusive_A : A; fun incognito_A : A; @@ -19697,6 +19704,7 @@ fun jump_N : N; fun jump_V : V; fun jump_V2 : V2; fun jump_V2V : V2V; +fun jump_VV : VV; fun jumped_up_A : A; fun jumper_N : N; fun jumpiness_N : N; @@ -21125,6 +21133,7 @@ fun live_A : A; fun live_Adv : Adv; fun live_V : V; fun live_V2 : V2; +fun live_VV : VV; fun live_birth_N : N; fun liveable_A : A; fun livelihood_N : N; @@ -23262,6 +23271,8 @@ fun moke_N : N; fun molar_A : A; fun molar_N : N; fun molasses_N : N; +fun mold_V : V; +fun mold_V2 : V2; fun mold_PN : PN; fun moldy_A : A; fun mole_N : N; @@ -23519,6 +23530,7 @@ fun moss_N : N; fun moss_grown_A : A; fun mossley_PN : PN; fun mossy_A : A; +fun most_Det : Det; fun mostly_Adv : Adv; fun mote_N : N; fun motel_N : N; @@ -23614,6 +23626,7 @@ fun move_N : N; fun move_V : V; fun move_V2 : V2; fun move_V2V : V2V; +fun move_VV : VV; fun movement_N : N; fun mover_N : N; fun movie_N : N; @@ -28447,6 +28460,7 @@ fun presumable_A : A; fun presume_V : V; fun presume_V2 : V2; fun presume_VS : VS; +fun presume_VV : VV; fun presuming_A : A; fun presumption_N : N; fun presumptive_A : A; @@ -29457,6 +29471,7 @@ fun quern_N : N; fun querulous_A : A; fun querulousness_N : N; fun query_N : N; +fun query_V : V; fun query_V2 : V2; fun quest_N : N; fun quest_V : V; @@ -29589,6 +29604,7 @@ fun race_N : N; fun race_V : V; fun race_V2 : V2; fun race_V2V : V2V; +fun race_VV : VV; fun race_meeting_N : N; fun racecard_N : N; fun racecourse_N : N; @@ -30851,6 +30867,7 @@ fun resell_V2 : V2; fun resemblance_N : N; fun resemble_V2 : V2; fun resent_V2 : V2; +fun resent_VS : VS; fun resentful_A : A; fun resentment_N : N; fun reservation_N : N; @@ -30880,6 +30897,7 @@ fun residue_N : N; fun resign_V : V; fun resign_V2 : V2; fun resign_V2V : V2V; +fun resign_VV : VV; fun resign_VS : VS; fun resignation_N : N; fun resigned_A : A; @@ -32613,6 +32631,7 @@ fun scramble_N : N; fun scramble_V : V; fun scramble_V2 : V2; fun scramble_V2V : V2V; +fun scramble_VV : VV; fun scrambler_N : N; fun scrap_N : N; fun scrap_V : V; @@ -37104,6 +37123,8 @@ fun swazi_N : N; fun swaziland_PN : PN; fun swear_V : V; fun swear_V2 : V2; +fun swear_V2V : V2V; +fun swear_VV : VV; fun swearer_N : N; fun swearing_N : N; fun swearword_N : N; @@ -37226,8 +37247,6 @@ fun swordplay_N : N; fun swordsman_N : N; fun swordsmanship_N : N; fun swordstick_N : N; -fun swore_V2V : V2V; -fun sworn_A : A; fun swot_N : N; fun swot_V : V; fun swot_V2 : V2; @@ -38069,6 +38088,7 @@ fun therapeutical_A : A; fun therapeutics_N : N; fun therapist_N : N; fun therapy_N : N; +fun there_Adv : Adv; fun thereabout_Adv : Adv; fun thereabouts_Adv : Adv; fun thereafter_Adv : Adv; @@ -38578,6 +38598,7 @@ fun togolese_N : N; fun toil_N : N; fun toil_V : V; fun toil_V2V : V2V; +fun toil_VV : VV; fun toiler_N : N; fun toilet_N : N; fun toilet_paper_N : N;