diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 45600cc40..37abef71d 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -53,8 +53,8 @@ lin abate_V = mkV "abate" "abates" "abated" "abated" "abating"; lin abate_V2 = mkV2 (mkV "abate" "abates" "abated" "abated" "abating"); lin abatement_N = mkN "abatement" ; lin abattoir_N = mkN "abattoir" "abattoirs"; -lin abbe_N = mkN "abbé" "abbés"; -lin abbess_N = mkN "abbess" "abbesses"; +lin abbe_N = mkN masculine (mkN "abbé" "abbés"); +lin abbess_N = mkN feminine (mkN "abbess" "abbesses"); lin abbey_N = mkN "abbey" "abbeys"; lin abbot_N = mkN "abbot" "abbots"; lin abbreviate_V2 = mkV2 (mkV "abbreviate" "abbreviates" "abbreviated" "abbreviated" "abbreviating"); @@ -1469,9 +1469,9 @@ lin anxiety_N = mkN "anxiety" "anxieties"; lin anxious_A = compoundA (mkA "anxious"); lin anyPl_Det = mkDeterminer plural "any"; lin anySg_Det = mkDeterminer singular "any"; -lin anybody_NP = regNP "anybody" singular; +lin anybody_NP = mkNP "anybody" "anybody" "anybody's" singular P3 human; lin anyhow_Adv = mkAdv "anyhow"; -lin anyone_NP = regNP "anyone" singular; +lin anyone_NP = mkNP "anyone" "anyone" "anyone's" singular P3 human; lin anyplace_Adv = mkAdv "anyplace"; lin anything_NP = regNP "anything" singular; lin anyway_Adv = mkAdv "anyway"; @@ -1914,6 +1914,7 @@ lin ask_V2 = mkV2 (mkV "ask"); lin ask_V2V = mkV2V (mkV "ask") noPrep to_Prep; lin ask_VS = mkVS (mkV "ask" "asks" "asked" "asked" "asking"); lin ask_VV = mkVV (mkV "ask" "asks" "asked" "asked" "asking"); +lin ask_VQ = mkVQ (mkV "ask" "asks" "asked" "asked" "asking"); lin askance_Adv = mkAdv "askance"; lin askern_PN = mkPN "Askern"; lin askew_A = compoundA (mkA "askew"); @@ -3035,6 +3036,7 @@ lin befitting_A = compoundA (mkA "befitting"); lin befogged_A = compoundA (mkA "befogged"); lin before_Adv = mkAdv "before"; lin before_Prep = mkPrep "before"; +lin before_Subj = mkSubj "before"; lin beforehand_A = compoundA (mkA "beforehand"); lin beforehand_Adv = mkAdv "beforehand"; lin befoul_V2 = mkV2 (mkV "befoul" "befouls" "befouled" "befouled" "befouling"); @@ -4149,10 +4151,10 @@ lin boxing_day_PN = mkPN "Boxing day"; lin boxing_glove_N = mkN "boxing - glove" "boxing - gloves"; lin boxing_match_N = mkN "boxing - match" "boxing - matches"; lin boxwood_N = mkN "boxwood" ; -lin boy_N = mkN human (mkN "boy" "boys"); +lin boy_N = mkN masculine (mkN "boy" "boys"); lin boycott_N = mkN "boycott" "boycotts"; lin boycott_V2 = mkV2 (mkV "boycott" "boycotts" "boycotted" "boycotted" "boycotting"); -lin boyfriend_N = mkN human (mkN "boyfriend" "boyfriends"); +lin boyfriend_N = mkN masculine (mkN "boyfriend" "boyfriends"); lin boyhood_N = mkN "boyhood" ; lin boyish_A = compoundA (mkA "boyish"); lin bra_N = mkN "bra" "bras"; @@ -4412,7 +4414,7 @@ lin brit_N = mkN "brit" "brits"; lin britain_PN = mkPN "Britain"; lin britannic_A = compoundA (mkA "britannic"); lin british_A = compoundA (mkA "British"); -lin britisher_N = mkN "britisher" "britishers"; +lin britisher_N = mkN masculine (mkN "Britisher" "Britishers"); lin briton_A = compoundA (mkA "briton"); lin briton_N = mkN "briton" "britons"; lin brittle_A = compoundA (mkA "brittle"); @@ -4809,6 +4811,7 @@ lin busy_V2 = mkV2 (mkV "busy" "busies" "busied" "busied" "busying"); lin busybody_N = mkN "busybody" "busybodies"; lin but_Adv = mkAdv "but"; lin but_Prep = mkPrep "but"; +lin but_PConj = {s="but"}; lin but_Subj = mkSubj "but"; lin butane_N = mkN "butane" ; lin butch_A = compoundA (mkA "butch"); @@ -6932,7 +6935,7 @@ lin colour_wash_N = mkN "colour - wash" "colour - washes"; lin coloured_A = compoundA (mkA "coloured"); lin colourful_A = compoundA (mkA "colourful"); lin colouring_N = mkN "colouring" ; -lin colourless_A = compoundA (mkA "colourless"); +lin colourless_A = variants {compoundA (mkA "colourless"); compoundA (mkA "colorless")}; lin colt_N = mkN "colt" "colts"; lin coltish_A = compoundA (mkA "coltish"); lin columbia_PN = mkPN "Columbia"; @@ -7110,6 +7113,7 @@ lin compatible_A = compoundA (mkA "compatible"); lin compatriot_N = mkN "compatriot" "compatriots"; lin compeer_N = mkN "compeer" "compeers"; lin compel_V2 = mkV2 (mkV "compel" "compels" "compelled" "compelled" "compelling"); +lin compel_V2V = mkV2V (mkV "compel" "compels" "compelled" "compelled" "compelling") noPrep noPrep; lin compel_VV = mkVV (mkV "compel" "compels" "compelled" "compelled" "compelling"); lin compendious_A = compoundA (mkA "compendious"); lin compendium_N = mkN "compendium" "compendiums"; @@ -12049,8 +12053,8 @@ lin engineering_N = mkN "engineering" ; lin england_PN = mkPN "England"; lin english_A = compoundA (mkA "English"); lin english_N = mkN "English" ; -lin englishman_N = mkN "englishman" "englishmen" {- FIXME: guessed plural form -}; -lin englishwoman_N = mkN "englishwoman" "englishwomen" {- FIXME: guessed plural form -}; +lin englishman_N = mkN masculine (mkN "englishman" "englishmen"); +lin englishwoman_N = mkN feminine (mkN "englishwoman" "englishwomen"); lin engraft_V2 = mkV2 (mkV "engraft" "engrafts" "engrafted" "engrafted" "engrafting"); lin engrave_V2 = mkV2 (mkV "engrave" "engraves" "engraved" "engraved" "engraving"); lin engraver_N = mkN "engraver" "engravers"; @@ -12495,6 +12499,7 @@ lin evelyn_PN = mkPN "Evelyn"; lin even_A = compoundA (mkA "even"); lin even_AdA = mkAdA "even"; lin even_Adv = mkAdv "even"; +lin even_AdV = mkAdV "even"; lin even_N = mkN "even" "evens"; lin even_V2 = mkV2 (mkV "even" "evens" "evened" "evened" "evening"); lin even_handed_A = compoundA (mkA "even - handed"); @@ -12513,11 +12518,12 @@ lin evergreen_N = mkN "evergreen" "evergreens"; lin everlasting_A = compoundA (mkA "everlasting"); lin evermore_Adv = mkAdv "evermore"; lin every_Det = mkDeterminerSpec singular "every" "everyone" False ; -lin everybody_NP = regNP "everybody" singular ; +lin everybody_NP = mkNP "everybody" "everybody" "everybody's" singular P3 human; lin everyday_A = compoundA (mkA "everyday"); -lin everyone_NP = regNP "everyone" singular; +lin everyone_NP = mkNP "everyone" "everyone" "everyone's" singular P3 human; lin everyplace_Adv = mkAdv "everyplace"; lin everything_NP = regNP "everything" singular; +lin everywhere_Adv = mkAdv "everywhere"; lin evesham_PN = mkPN "Evesham"; lin evict_V2 = mkV2 (mkV "evict" "evicts" "evicted" "evicted" "evicting"); lin eviction_N = mkN "eviction" "evictions"; @@ -12926,7 +12932,7 @@ lin fabric_N = mkN "fabric" "fabrics"; lin fabricate_V2 = mkV2 (mkV "fabricate" "fabricates" "fabricated" "fabricated" "fabricating"); lin fabrication_N = mkN "fabrication" "fabrications"; lin fabulous_A = compoundA (mkA "fabulous"); -lin facade_N = mkN "façade" "façades"; +lin facade_N = variants {mkN "façade" "façades"; mkN "facade" "facades"}; lin face_N = mkN "face" "faces"; lin face_V = mkV "face" "faces" "faced" "faced" "facing"; lin face_V2 = mkV2 (mkV "face" "faces" "faced" "faced" "facing"); @@ -13501,6 +13507,7 @@ lin find_N = mkN "find" "finds"; lin find_V = IrregEng.find_V; lin find_V2 = mkV2 (IrregEng.find_V); lin find_V2V = mkV2V (IrregEng.find_V) noPrep to_Prep ; +lin find_V2A = mkV2A (IrregEng.find_V) noPrep; lin find_VS = mkVS (IrregEng.find_V); lin finder_N = mkN "finder" "finders"; lin finding_N = mkN "finding" "findings"; @@ -13621,7 +13628,7 @@ lin fishball_N = mkN "fishball" "fishballs"; lin fishbone_N = mkN "fishbone" "fishbones"; lin fishcake_N = mkN "fishcake" "fishcakes"; lin fisher_N = mkN "fisher" "fishers"; -lin fisherman_N = mkN "fisherman" "fishermen"; +lin fisherman_N = mkN masculine (mkN "fisherman" "fishermen"); lin fishery_N = mkN "fishery" "fisheries"; lin fishing_N = mkN "fishing" ; lin fishing_line_N = mkN "fishing - line" "fishing - lines"; @@ -15263,8 +15270,8 @@ lin gird_V2 = mkV2 (mkV "gird" "girds" "girded" "girded" "girding"); lin girder_N = mkN "girder" "girders"; lin girdle_N = mkN "girdle" "girdles"; lin girdle_V2 = mkV2 (mkV "girdle" "girdles" "girdled" "girdled" "girdling"); -lin girl_N = mkN human (mkN "girl" "girls"); -lin girlfriend_N = mkN human (mkN "girlfriend" "girlfriends"); +lin girl_N = mkN feminine (mkN "girl" "girls"); +lin girlfriend_N = mkN feminine (mkN "girlfriend" "girlfriends"); lin girlhood_N = mkN "girlhood" ; lin girlish_A = compoundA (mkA "girlish"); lin girlishness_N = mkN "girlishness" ; @@ -15532,7 +15539,7 @@ lin gong_V2 = mkV2 (mkV "gong" "gongs" "gonged" "gonged" "gonging"); lin gonorrhea_N = mkN "gonorrhea" ; lin gonorrhoea_N = mkN "gonorrhoea" ; lin goo_N = mkN "goo" ; -lin good_A = mkA "good" "goodder*"; +lin good_A = mkA "good" "better" "best" "well"; lin good_N = mkN "good" ; lin good_fellowship_N = mkN "good - fellowship" ; lin good_for_naught_A = compoundA (mkA "good - for - naught"); @@ -16110,7 +16117,7 @@ lin guttural_A = compoundA (mkA "guttural"); lin guttural_N = mkN "guttural" "gutturals"; lin guvnor_N = mkN "guvnor" "guvnors"; lin guy's_PN = mkPN "Guy's"; -lin guy_N = mkN "guy" "guys"; +lin guy_N = mkN masculine (mkN "guy" "guys"); lin guy_PN = mkPN "Guy"; lin guy_V2 = mkV2 (mkV "guy" "guys" "guyed" "guyed" "guying"); lin guyana_PN = mkPN "Guyana"; @@ -16567,6 +16574,7 @@ lin have_V = IrregEng.have_V; lin have_V2 = mkV2 (IrregEng.have_V); lin have_VS = mkVS (IrregEng.have_V); lin have_VV = mkVV IrregEng.have_V; +lin have_V2V = mkV2V IrregEng.have_V noPrep to_Prep; lin haven_N = mkN "haven" "havens"; lin haverfordwest_PN = mkPN "Haverfordwest"; lin haverhill_PN = mkPN "Haverhill"; @@ -17465,7 +17473,8 @@ lin hove_PN = mkPN "Hove"; lin hovel_N = mkN "hovel" "hovels"; lin hover_V = mkV "hover" "hovers" "hovered" "hovered" "hovering"; lin hovercraft_N = mkN "hovercraft" "hovercraft"; -lin how_Adv = mkAdv "how"; +lin how_IAdv = {s="how"}; +lin how8many_IDet = mkDeterminer plural "how many" ; lin how_d'ye_do_N = mkN "how - d'ye - do" "how - d'ye - dos"; lin howard_PN = mkPN "Howard"; lin howdah_N = mkN "howdah" "howdahs"; @@ -17616,9 +17625,9 @@ lin hurt_V2 = mkV2 (IrregEng.hurt_V); lin hurt_VS = mkVS (IrregEng.hurt_V); lin hurtful_A = compoundA (mkA "hurtful"); lin hurtle_V = mkV "hurtle" "hurtles" "hurtled" "hurtled" "hurtling"; -lin husband_N = mkN "husband" "husbands"; +lin husband_N = mkN masculine (mkN "husband" "husbands"); lin husband_V2 = mkV2 (mkV "husband" "husbands" "husbanded" "husbanded" "husbanding"); -lin husbandman_N = mkN "husbandman" "husbandmen" {- FIXME: guessed plural form -}; +lin husbandman_N = mkN "husbandman" "husbandmen"; lin husbandry_N = mkN "husbandry" ; lin hush_N = mkN "hush" "hushes"; lin hush_V = mkV "hush" "hushes" "hushed" "hushed" "hushing"; @@ -17805,8 +17814,8 @@ lin idleness_N = mkN "idleness" ; lin idler_N = mkN "idler" "idlers"; lin idly_Adv = mkAdv "idly"; lin idol_N = mkN "idol" "idols"; -lin idolater_N = mkN "idolater" "idolaters"; -lin idolatress_N = mkN "idolatress" "idolatresses"; +lin idolater_N = mkN masculine (mkN "idolater" "idolaters"); +lin idolatress_N = mkN feminine (mkN "idolatress" "idolatresses"); lin idolatrous_A = compoundA (mkA "idolatrous"); lin idolatry_N = mkN "idolatry" "idolatries"; lin idolization_N = mkN "idolization" "idolizations"; @@ -19964,7 +19973,7 @@ lin kindred_N = mkN "kindred" ; lin kinetic_A = compoundA (mkA "kinetic"); lin kinetics_N = mkN "kinetics" "kinetics"; lin king's_lynn_PN = mkPN "King's lynn"; -lin king_N = mkN "king" "kings"; +lin king_N = mkN masculine (mkN "king" "kings"); lin king_size_A = compoundA (mkA "king - size"); lin king_sized_A = compoundA (mkA "king - sized"); lin kingcup_N = mkN "kingcup" "kingcups"; @@ -20578,7 +20587,6 @@ lin leasehold_A = compoundA (mkA "leasehold"); lin leasehold_N = mkN "leasehold" "leaseholds"; lin leaseholder_N = mkN "leaseholder" "leaseholders"; lin leash_N = mkN "leash" "leashes"; -lin least_A = compoundA (mkA "least"); lin least_Adv = mkAdv "least"; lin least_N = mkN "least" "IRREG"; lin leastways_Adv = mkAdv "leastways"; @@ -20736,14 +20744,12 @@ lin lesion_N = mkN "lesion" "lesions"; lin lesley_PN = mkPN "Lesley"; lin leslie_PN = mkPN "Leslie"; lin lesotho_PN = mkPN "Lesotho"; -lin less_A = compoundA (mkA "less"); lin less_AdA = mkAdA "less"; lin less_Adv = mkAdv "less"; -lin less_N = mkN "less" ; +lin less_Det = mkDeterminer singular (variants {"less"; "lesser"}) ; lin lessee_N = mkN "lessee" "lessees"; lin lessen_V = mkV "lessen" "lessens" "lessened" "lessened" "lessening"; lin lessen_V2 = mkV2 (mkV "lessen" "lessens" "lessened" "lessened" "lessening"); -lin lesser_A = compoundA (mkA "lesser"); lin lesson_N = mkN "lesson" "lessons"; lin lessor_N = mkN "lessor" "lessors"; lin lest_Prep = mkPrep "lest"; @@ -21150,9 +21156,10 @@ lin litter_V2 = mkV2 (mkV "litter" "litters" "littered" "littered" "littering"); lin litter_basket_N = mkN "litter - basket" "litter - baskets"; lin litter_lout_N = mkN "litter - lout" "litter - louts"; lin litterbin_N = mkN "litterbin" "litterbins"; -lin little_A = mkA "little" "littler"; -lin little_Adv = mkAdv "little"; -lin little_N = mkN "little" ; +lin little_A = variants {mkA "little" "less" "least" "little"; + mkA "little" "lesser" "least" "little"; + mkA "little" "littler" "littlest" "little"}; +lin little_Det = mkDeterminer singular "little" ; lin littlehampton_PN = mkPN "Littlehampton"; lin littleness_N = mkN "littleness" ; lin littoral_A = compoundA (mkA "littoral"); @@ -21836,7 +21843,9 @@ lin majority_N = mkN "majority" "majorities"; lin make_N = mkN "make" "makes"; lin make_V = IrregEng.make_V; lin make_V2 = mkV2 (IrregEng.make_V); +lin make_V2A = mkV2A (IrregEng.make_V) noPrep; lin make_V2V = mkV2V (IrregEng.make_V) noPrep to_Prep ; +lin make_V3 = mkV3 (IrregEng.make_V); lin make_VA = mkVA (IrregEng.make_V); lin make_VV = mkVV (IrregEng.make_V); lin make_VS = mkVS (IrregEng.make_V); @@ -21931,7 +21940,7 @@ lin mammal_N = mkN "mammal" "mammals"; lin mammon_N = mkN "mammon" ; lin mammoth_N = mkN "mammoth" "mammoths"; lin mammy_N = mkN "mammy" "mammies"; -lin man_N = mkN human (mkN "man" "men"); +lin man_N = mkN masculine (mkN "man" "men"); lin man_V2 = mkV2 (mkV "man" "mans" "manned" "manned" "manning"); lin man_at_arms_N = mkN "man - at - arms" "men*-at - arms"; lin man_eater_N = mkN "man - eater" "man - eaters"; @@ -23386,7 +23395,7 @@ lin monifieth_PN = mkPN "Monifieth"; lin monitor_N = mkN "monitor" "monitors"; lin monitor_V = mkV "monitor" "monitors" "monitored" "monitored" "monitoring"; lin monitor_V2 = mkV2 (mkV "monitor" "monitors" "monitored" "monitored" "monitoring"); -lin monk_N = mkN "monk" "monks"; +lin monk_N = mkN masculine (mkN "monk" "monks"); lin monkey_N = mkN "monkey" "monkeys"; lin monkey_V = mkV "monkey" "monkeys" "monkeyed" "monkeyed" "monkeying"; lin monkey_jacket_N = mkN "monkey - jacket" "monkey - jackets"; @@ -24198,8 +24207,8 @@ lin neighbourhood_N = mkN "neighbourhood" "neighbourhoods"; lin neighbourliness_N = mkN "neighbourliness" ; lin neighbourly_A = compoundA (mkA "neighbourly"); lin neil_PN = mkPN "Neil"; -lin neither7nor_DConj = mkConj "neither" "nor"; -lin neither_A = compoundA (mkA "neither"); +lin neither7nor_DConj = mkConj "neither" "nor" singular; +lin neither_Det = mkDeterminer singular "neither"; lin neither_Adv = mkAdv "neither"; lin neither_Prep = mkPrep "neither"; lin nell_PN = mkPN "Nell"; @@ -24486,7 +24495,7 @@ lin nobleman_N = mkN "nobleman" "noblemen" {- FIXME: guessed plural form -}; lin noblesse_N = mkN "noblesse" "IRREG"; lin noblesse_oblige_N = mkN "noblesse oblige" ; lin nobly_Adv = mkAdv "nobly"; -lin nobody_NP = regNP "nobody" singular; +lin nobody_NP = mkNP "nobody" "nobody" "nobody's" singular P3 human; lin noctambulist_N = mkN "noctambulist" "noctambulists"; lin nocturnal_A = compoundA (mkA "nocturnal"); lin nocturne_N = mkN "nocturne" "nocturnes"; @@ -24773,7 +24782,7 @@ lin numinous_A = compoundA (mkA "numinous"); lin numismatics_N = mkN "numismatics" "numismatics"; lin numismatist_N = mkN "numismatist" "numismatists"; lin numskull_N = mkN "numskull" "numskulls"; -lin nun_N = mkN "nun" "nuns"; +lin nun_N = mkN feminine (mkN "nun" "nuns"); lin nuncio_N = mkN "nuncio" "nuncios"; lin nuneaton_PN = mkPN "Nuneaton"; lin nunnery_N = mkN "nunnery" "nunneries"; @@ -26918,7 +26927,7 @@ lin persimmon_N = mkN "persimmon" "persimmons"; lin persist_V = mkV "persist" "persists" "persisted" "persisted" "persisting"; lin persistence_N = mkN "persistence" ; lin persistent_A = compoundA (mkA "persistent"); -lin person_N = mkN "person" "persons"; +lin person_N = mkN masculine (mkN "person" "persons"); lin persona_N = mkN "persona" "personas"; lin persona_grata_N = mkN "persona grata" "persona gratae" {- FIXME: guessed plural form -}; lin persona_non_grata_N = mkN "persona non grata" "persona non gratae" {- FIXME: guessed plural form -}; @@ -27578,6 +27587,7 @@ lin plausible_A = compoundA (mkA "plausible"); 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"); +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"; lin play_box_N = mkN "play - box" "play - boxes"; @@ -29515,7 +29525,7 @@ lin queasily_Adv = mkAdv "queasily"; lin queasiness_N = mkN "queasiness" ; lin queasy_A = mkA "queasy" "queasier"; lin quebec_PN = mkPN "Quebec"; -lin queen_N = mkN "queen" "queens"; +lin queen_N = mkN feminine (mkN "queen" "queens"); lin queen_V2 = mkV2 (mkV "queen" "queens" "queened" "queened" "queening"); lin queenborough_in_sheppey_PN = mkPN "Queenborough - in - sheppey"; lin queenly_A = mkA "queenly" "queenlier"; @@ -31939,7 +31949,7 @@ lin rummy_N = mkN "rummy" ; lin rumor_V2 = mkV2 (mkV "rumor" "rumors" "rumored" "rumored" "rumoring"); lin rumor_V2V = mkV2V (mkV "rumor" "rumors" "rumored" "rumored" "rumoring") noPrep to_Prep ; lin rumor_VS = mkVS (mkV "rumor" "rumors" "rumored" "rumored" "rumoring"); -lin rumour_N = mkN "rumour" "rumours"; +lin rumour_N = variants {mkN "rumour" "rumours"; mkN "rumor" "rumors"}; lin rumour_V2 = mkV2 (mkV "rumour" "rumours" "rumoured" "rumoured" "rumouring"); lin rumour_monger_N = mkN "rumour - monger" "rumour - mongers"; lin rump_N = mkN "rump" "rumps"; @@ -34865,6 +34875,7 @@ lin snugness_N = mkN "snugness" ; lin so_AdA = mkAdA "so"; lin so_N = mkN "so" "si" {- FIXME: guessed plural form -}; lin so_Subj = mkSubj "so"; +lin so_PConj = {s="so"}; lin so_and_so_N = mkN "so - and - so" "so - and - sos"; lin so_called_A = compoundA (mkA "so - called"); lin so_so_A = compoundA (mkA "so - so"); @@ -35034,11 +35045,11 @@ lin sombre_A = compoundA (mkA "sombre"); lin sombreness_N = mkN "sombreness" ; lin sombrero_N = mkN "sombrero" "sombreros"; lin some_Quant = mkQuant "some" "some"; -lin somebody_NP = regNP "somebody" singular; +lin somebody_NP = mkNP "somebody" "somebody" "somebody's" Sg P3 human; lin someday_Adv = mkAdv "someday"; lin somehow_Adv = mkAdv "somehow"; lin somehow_AdV = mkAdV "somehow"; -lin someone_NP = regNP "someone" singular; +lin someone_NP = mkNP "someone" "someone" "someone's" Sg P3 human; lin someplace_Adv = mkAdv "someplace"; lin somercotes_PN = mkPN "Somercotes"; lin somersault_N = mkN "somersault" "somersaults"; @@ -35049,6 +35060,7 @@ lin sometime_Adv = mkAdv "sometime"; lin sometimes_Adv = mkAdv "sometimes"; lin someway_Adv = mkAdv "someway"; lin somewhat_Adv = mkAdv "somewhat"; +lin somewhere_Adv = mkAdv "somewhere"; lin somnambulism_N = mkN "somnambulism" ; lin somnambulist_N = mkN "somnambulist" "somnambulists"; lin somnolence_N = mkN "somnolence" ; @@ -37418,8 +37430,8 @@ lin syphon_V = mkV "syphon" "syphons" "syphoned" "syphoned" "syphoning"; lin syphon_V2 = mkV2 (mkV "syphon" "syphons" "syphoned" "syphoned" "syphoning"); lin syracuse_PN = mkPN "Syracuse"; lin syria_PN = mkPN "Syria"; -lin syrian_A = compoundA (mkA "syrian"); -lin syrian_N = mkN "syrian" "syrians"; +lin syrian_A = compoundA (mkA "Syrian"); +lin syrian_N = mkN "Syrian" "Syrians"; lin syringa_N = mkN "syringa" "syringas"; lin syringe_N = mkN "syringe" "syringes"; lin syringe_V2 = mkV2 (mkV "syringe" "syringes" "syringed" "syringed" "syringing"); @@ -37908,6 +37920,8 @@ lin tell_V = IrregEng.tell_V; lin tell_V2 = mkV2 (IrregEng.tell_V); lin tell_V2V = mkV2V (IrregEng.tell_V) noPrep to_Prep; lin tell_V2S = mkV2S (IrregEng.tell_V) noPrep; +lin tell_V2Q = mkV2Q (IrregEng.tell_V) noPrep; +lin tell_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep; lin tell_VV = mkVV (IrregEng.tell_V); lin tell_VS = mkVS (IrregEng.tell_V); lin teller_N = mkN "teller" "tellers"; @@ -38428,8 +38442,8 @@ lin thyroid_N = mkN "thyroid" "thyroids"; lin ti_N = mkN "ti" "IRREG"; lin tiara_N = mkN "tiara" "tiaras"; lin tibet_PN = mkPN "Tibet"; -lin tibetan_A = compoundA (mkA "tibetan"); -lin tibetan_N = mkN "tibetan" "tibetans"; +lin tibetan_A = compoundA (mkA "Tibetan"); +lin tibetan_N = mkN "Tibetan" "Tibetans"; lin tibia_N = mkN "tibia" "tibiae" {- FIXME: guessed plural form -}; lin tic_N = mkN "tic" "tics"; lin tick_N = mkN "tick" "ticks"; @@ -38616,7 +38630,7 @@ lin titivate_V = mkV "titivate" "titivates" "titivated" "titivated" "titivating" lin titivate_V2 = mkV2 (mkV "titivate" "titivates" "titivated" "titivated" "titivating"); lin titlark_N = mkN "titlark" "titlarks"; lin title_N = mkN "title" "titles"; -lin title_VS = mkVS (mkV "title"); +lin title_V3 = mkV3 (mkV "title") noPrep noPrep; lin title_deed_N = mkN "title - deed" "title - deeds"; lin title_page_N = mkN "title - page" "title - pages"; lin title_role_N = mkN "title - role" "title - roles"; @@ -39025,12 +39039,12 @@ lin training_N = mkN "training" ; lin training_college_N = mkN "training - college" "training - colleges"; lin training_ship_N = mkN "training - ship" "training - ships"; lin trainload_N = mkN "trainload" "trainloads"; -lin trainman_N = mkN "trainman" "trainmen" {- FIXME: guessed plural form -}; +lin trainman_N = mkN masculine (mkN "trainman" "trainmen"); lin traipse_V = mkV "traipse" "traipses" "traipsed" "traipsed" "traipsing"; lin trait_N = mkN "trait" "traits"; -lin traitor_N = mkN "traitor" "traitors"; +lin traitor_N = mkN masculine (mkN "traitor" "traitors"); lin traitorous_A = compoundA (mkA "traitorous"); -lin traitress_N = mkN "traitress" "traitresses"; +lin traitress_N = mkN feminine (mkN "traitress" "traitresses"); lin trajectory_N = mkN "trajectory" "trajectories"; lin tralee_PN = mkPN "Tralee"; lin tram_N = mkN "tram" "trams"; @@ -41624,10 +41638,10 @@ lin wait_N = mkN "wait" "waits"; lin wait_V = mkV "wait" "waits" "waited" "waited" "waiting"; lin wait_V2 = mkV2 (mkV "wait" "waits" "waited" "waited" "waiting"); lin wait_VV = mkVV (mkV "wait" "waits" "waited" "waited" "waiting"); -lin waiter_N = mkN human (mkN "waiter" "waiters"); +lin waiter_N = mkN masculine (mkN "waiter" "waiters"); lin waiting_list_N = mkN "waiting - list" "waiting - lists"; lin waiting_room_N = mkN "waiting - room" "waiting - rooms"; -lin waitress_N = mkN human (mkN "waitress" "waitresses"); +lin waitress_N = mkN feminine (mkN "waitress" "waitresses"); lin waive_V2 = mkV2 (mkV "waive" "waives" "waived" "waived" "waiving"); lin waiver_N = mkN "waiver" "waivers"; lin waiver_V = mkV "waiver"; @@ -42372,7 +42386,7 @@ lin whore_N = mkN "whore" "whores"; lin whoremonger_N = mkN "whoremonger" "whoremongers"; lin whorl_N = mkN "whorl" "whorls"; lin whorled_A = compoundA (mkA "whorled"); -lin why_Adv = mkAdv "why"; +lin why_IAdv = {s="why"}; lin why_N = mkN "why" "whys"; lin wi_N = mkN "wi" ; lin wick_N = mkN "wick" "wicks"; @@ -42402,7 +42416,7 @@ lin widowhood_N = mkN "widowhood" ; lin width_N = mkN "width" "widths"; lin wield_V2 = mkV2 (mkV "wield" "wields" "wielded" "wielded" "wielding"); lin wiesbaden_PN = mkPN "Wiesbaden"; -lin wife_N = mkN "wife" "wives" {- FIXME: guessed plural form -}; +lin wife_N = mkN feminine (mkN "wife" "wives"); lin wifelike_A = compoundA (mkA "wifelike"); lin wifely_A = mkA "wifely" "wifelier"; lin wig_N = mkN "wig" "wigs"; @@ -42440,7 +42454,7 @@ lin willie_PN = mkPN "Willie"; lin willing_A = compoundA (mkA "willing"); lin willingness_N = mkN "willingness" ; lin willington_PN = mkPN "Willington"; -lin willow_N = mkN "willow" "willows"; +lin willow_N = mkN feminine (mkN "willow" "willows"); lin willow_pattern_N = mkN "willow - pattern" ; lin willow_tree_N = mkN "willow - tree" "willow - trees"; lin willowy_A = compoundA (mkA "willowy"); @@ -42635,7 +42649,7 @@ lin wolfish_A = compoundA (mkA "wolfish"); lin wolfram_N = mkN "wolfram" ; lin wolverhampton_PN = mkPN "Wolverhampton"; lin wolverton_PN = mkPN "Wolverton"; -lin woman_N = mkN "woman" "women" {- FIXME: guessed plural form -}; +lin woman_N = mkN feminine (mkN "woman" "women") {- FIXME: guessed plural form -}; lin womanhood_N = mkN "womanhood" ; lin womanish_A = compoundA (mkA "womanish"); lin womanize_V = mkV "womanize" "womanizes" "womanized" "womanized" "womanizing"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 271dd66b2..280955ff3 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -1909,6 +1909,7 @@ fun ask_V2 : V2; fun ask_V2V : V2V; fun ask_VS : VS; fun ask_VV : VV; +fun ask_VQ : VQ; fun askance_Adv : Adv; fun askern_PN : PN; fun askew_A : A; @@ -3030,6 +3031,7 @@ fun befitting_A : A; fun befogged_A : A; fun before_Adv : Adv; fun before_Prep : Prep ; +fun before_Subj : Subj ; fun beforehand_A : A; fun beforehand_Adv : Adv; fun befoul_V2 : V2; @@ -4804,6 +4806,7 @@ fun busy_V2 : V2; fun busybody_N : N; fun but_Adv : Adv; fun but_Prep : Prep; +fun but_PConj : PConj; fun but_Subj : Subj; fun butane_N : N; fun butch_A : A; @@ -7092,6 +7095,7 @@ fun compatible_A : A; fun compatriot_N : N; fun compeer_N : N; fun compel_V2 : V2; +fun compel_V2V : V2V; fun compel_VV : VV; fun compendious_A : A; fun compendium_N : N; @@ -12475,6 +12479,7 @@ fun evelyn_PN : PN; fun even_A : A; fun even_AdA : AdA; fun even_Adv : Adv; +fun even_AdV : AdV; fun even_N : N; fun even_V2 : V2; fun even_handed_A : A; @@ -12498,6 +12503,7 @@ fun everyday_A : A; fun everyone_NP : NP; fun everyplace_Adv : Adv; fun everything_NP : NP; +fun everywhere_Adv : Adv; fun evesham_PN : PN; fun evict_V2 : V2; fun eviction_N : N; @@ -13481,6 +13487,7 @@ fun find_N : N; fun find_V : V; fun find_V2 : V2; fun find_V2V : V2V; +fun find_V2A : V2A; fun find_VS : VS; fun finder_N : N; fun finding_N : N; @@ -16543,6 +16550,7 @@ fun have_V : V; fun have_V2 : V2; fun have_VS : VS; fun have_VV : VV; +fun have_V2V : V2V; fun haven_N : N; fun haverfordwest_PN : PN; fun haverhill_PN : PN; @@ -17441,7 +17449,8 @@ fun hove_PN : PN; fun hovel_N : N; fun hover_V : V; fun hovercraft_N : N; -fun how_Adv : Adv; +fun how_IAdv : IAdv; +fun how8many_IDet : IDet; fun how_d'ye_do_N : N; fun howard_PN : PN; fun howdah_N : N; @@ -20554,7 +20563,6 @@ fun leasehold_A : A; fun leasehold_N : N; fun leaseholder_N : N; fun leash_N : N; -fun least_A : A; fun least_Adv : Adv; fun least_N : N; fun leastways_Adv : Adv; @@ -20712,14 +20720,12 @@ fun lesion_N : N; fun lesley_PN : PN; fun leslie_PN : PN; fun lesotho_PN : PN; -fun less_A : A; fun less_AdA : AdA; fun less_Adv : Adv; -fun less_N : N; +fun less_Det : Det; fun lessee_N : N; fun lessen_V : V; fun lessen_V2 : V2; -fun lesser_A : A; fun lesson_N : N; fun lessor_N : N; fun lest_Prep : Prep ; @@ -21127,8 +21133,7 @@ fun litter_basket_N : N; fun litter_lout_N : N; fun litterbin_N : N; fun little_A : A; -fun little_Adv : Adv; -fun little_N : N; +fun little_Det : Det; fun littlehampton_PN : PN; fun littleness_N : N; fun littoral_A : A; @@ -21812,7 +21817,9 @@ fun majority_N : N; fun make_N : N; fun make_V : V; fun make_V2 : V2; +fun make_V2A : V2A; fun make_V2V : V2V; +fun make_V3 : V3; fun make_VA : VA; fun make_VV : VV; fun make_VS : VS; @@ -24149,7 +24156,7 @@ fun neighbourliness_N : N; fun neighbourly_A : A; fun neil_PN : PN; fun neither7nor_DConj : Conj; -fun neither_A : A; +fun neither_Det : Det; fun neither_Adv : Adv; fun neither_Prep : Prep ; fun nell_PN : PN; @@ -27528,6 +27535,7 @@ fun plausible_A : A; fun play_N : N; fun play_V : V; fun play_V2 : V2; +fun play_VV : VV; fun play_acting_N : N; fun play_actor_N : N; fun play_box_N : N; @@ -34802,6 +34810,7 @@ fun snugness_N : N; fun so_AdA : AdA; fun so_N : N; fun so_Subj : Subj ; +fun so_PConj : PConj ; fun so_and_so_N : N; fun so_called_A : A; fun so_so_A : A; @@ -34986,6 +34995,7 @@ fun sometime_Adv : Adv; fun sometimes_Adv : Adv; fun someway_Adv : Adv; fun somewhat_Adv : Adv; +fun somewhere_Adv : Adv; fun somnambulism_N : N; fun somnambulist_N : N; fun somnolence_N : N; @@ -37844,6 +37854,8 @@ fun tell_V : V; fun tell_V2 : V2; fun tell_V2V : V2V; fun tell_V2S : V2S; +fun tell_V2Q : V2Q; +fun tell_V3 : V3; fun tell_VV : VV; fun tell_VS : VS; fun teller_N : N; @@ -38552,7 +38564,7 @@ fun titivate_V : V; fun titivate_V2 : V2; fun titlark_N : N; fun title_N : N; -fun title_VS : VS; +fun title_V3 : V3; fun title_deed_N : N; fun title_page_N : N; fun title_role_N : N; @@ -42304,7 +42316,7 @@ fun whore_N : N; fun whoremonger_N : N; fun whorl_N : N; fun whorled_A : A; -fun why_Adv : Adv; +fun why_IAdv : IAdv; fun why_N : N; fun wi_N : N; fun wick_N : N; diff --git a/lib/src/english/ParseEng.gf b/lib/src/english/ParseEng.gf index c081ec57c..0d02e9e46 100644 --- a/lib/src/english/ParseEng.gf +++ b/lib/src/english/ParseEng.gf @@ -15,7 +15,7 @@ concrete ParseEng of ParseEngAbs = RelativeEng, IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP], ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, - Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, + Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, UncNeg, VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV], DictEng ** diff --git a/lib/src/english/ParseEngAbs.gf b/lib/src/english/ParseEngAbs.gf index 22dfb004e..595bb2613 100644 --- a/lib/src/english/ParseEngAbs.gf +++ b/lib/src/english/ParseEngAbs.gf @@ -14,7 +14,7 @@ abstract ParseEngAbs = Relative, Idiom [NP, VP, Cl, ProgrVP, ExistNP], Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash, - Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, + Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, UncNeg, VPI, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV], DictEngAbs ** {