diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 1157e6dd3..ba1bc53bb 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -33,17 +33,16 @@ lin a_posteriori_A = compoundA (mkA "a posteriori"); lin a_posteriori_Adv = mkAdv "a posteriori"; lin a_priori_A = compoundA (mkA "a priori"); lin a_priori_Adv = mkAdv "a priori"; -lin aa_N = mkN "aa" "-" {- FIXME: no plural form -}; lin aachen_PN = mkPN "Aachen"; lin aarhus_PN = mkPN "Aarhus"; lin ab_initio_Adv = mkAdv "ab initio"; lin aback_Adv = mkAdv "aback"; lin abacus_N = mkN "abacus" "abacuses"; lin abaft_Adv = mkAdv "abaft"; -lin abandon_N = mkN "abandon" "-" {- FIXME: no plural form -}; +lin abandon_N = mkN "abandon" ; lin abandon_V2 = mkV2 (mkV "abandon" "abandons" "abandoned" "abandoned" "abandoning"); lin abandoned_A = compoundA (mkA "abandoned"); -lin abandonment_N = mkN "abandonment" "-" {- FIXME: no plural form -}; +lin abandonment_N = mkN "abandonment" ; lin abase_V2 = mkV2 (mkV "abase" "abases" "abased" "abased" "abasing"); lin abasement_N = mkN "abasement" "-" {- FIXME: no plural form -}; lin abash_V2 = mkV2 (mkV "abash" "abashes" "abashed" "abashed" "abashing"); @@ -57,8 +56,7 @@ lin abbot_N = mkN "abbot" "abbots"; lin abbreviate_V2 = mkV2 (mkV "abbreviate" "abbreviates" "abbreviated" "abbreviated" "abbreviating"); lin abbreviation_N = mkN "abbreviation" "abbreviations"; lin abbe_N = mkN "abbé" "abbés"; -lin abc_N = mkN "abc" "-" {- FIXME: no plural form -}; -lin abcs_N = mkN "-" "abcs" {- FIXME: no singular form -}; +lin abc_N = mkN "abc" "abcs" ; lin abdicate_V = mkV "abdicate" "abdicates" "abdicated" "abdicated" "abdicating"; lin abdicate_V2 = mkV2 (mkV "abdicate" "abdicates" "abdicated" "abdicated" "abdicating"); lin abdication_N = mkN "abdication" "abdications"; @@ -1404,8 +1402,6 @@ lin anus_N = mkN "anus" "anuses"; lin anvil_N = mkN "anvil" "anvils"; lin anxiety_N = mkN "anxiety" "anxieties"; lin anxious_A = compoundA (mkA "anxious"); -lin any_A = compoundA (mkA "any"); -lin any_Adv = mkAdv "any"; lin anybody_N = mkN "anybody" "IRREG"; lin anyhow_Adv = mkAdv "anyhow"; lin anyone_N = mkN "anyone" "IRREG"; @@ -10352,10 +10348,10 @@ lin djibouti_PN = mkPN "Djibouti"; lin djiboutian_A = compoundA (mkA "djiboutian"); lin djiboutian_N = mkN "djiboutian" "djiboutians"; lin djinn_N = mkN "djinn" "djinns"; -lin djs_N = mkN "-" "djs" {- FIXME: no singular form -}; +lin djs_N = mkN "DJ" "DJs" ; lin dlitt_N = mkN "dlitt" "-" {- FIXME: no plural form -}; lin dm_N = mkN "dm" "dm"; -lin dna_N = mkN "dna" "-" {- FIXME: no plural form -}; +lin dna_N = mkN "DNA" "DNAs" ; lin dnepropetrovsk_PN = mkPN "Dnepropetrovsk"; lin do_N = mkN "do" "di" {- FIXME: guessed plural form -}; lin do_V = IrregEng.do_V; @@ -10873,7 +10869,6 @@ lin dryness_N = mkN "dryness" "-" {- FIXME: no plural form -}; lin dsc_N = mkN "dsc" "-" {- FIXME: no plural form -}; lin dss_N = mkN "dss" "-" {- FIXME: no plural form -}; lin dti_N = mkN "dti" "-" {- FIXME: no plural form -}; -lin dts_N = mkN "-" "dts" {- FIXME: no singular form -}; lin dual_A = compoundA (mkA "dual"); lin dub_V2 = mkV2 (mkV "dub" "dubs" "dubbed" "dubbed" "dubbing"); lin dubbin_N = mkN "dubbin" "-" {- FIXME: no plural form -}; @@ -14560,7 +14555,7 @@ lin gazump_V = mkV "gazump" "gazumps" "gazumped" "gazumped" "gazumping"; lin gazump_V2 = mkV2 (mkV "gazump" "gazumps" "gazumped" "gazumped" "gazumping"); lin gb_PN = mkPN "Gb"; lin gcse_N = mkN "gcse" "-" {- FIXME: no plural form -}; -lin gcses_N = mkN "-" "gcses" {- FIXME: no singular form -}; +lin gcses_N = mkN "GCSE" "GCSEs" ; lin gdansk_PN = mkPN "Gdansk"; lin gdn_PN = mkPN "Gdn"; lin gdns_PN = mkPN "Gdns"; @@ -14800,7 +14795,6 @@ lin girlishness_N = mkN "girlishness" "-" {- FIXME: no plural form -}; lin giro_N = mkN "giro" "-" {- FIXME: no plural form -}; lin girth_N = mkN "girth" "girths"; lin girvan_PN = mkPN "Girvan"; -lin gis_N = mkN "-" "gis" {- FIXME: no singular form -}; lin gist_N = mkN "gist" "gists"; lin give_N = mkN "give" "-" {- FIXME: no plural form -}; lin give_V = IrregEng.give_V; @@ -15141,8 +15135,7 @@ lin governor_general_N = mkN "governor-general" "governor-generals"; lin govt_N = mkN "govt" "-" {- FIXME: no plural form -}; lin gown_N = mkN "gown" "gowns"; lin gown_V2 = mkV2 (mkV "gown" "gowns" "gowned" "gowned" "gowning"); -lin gp's_N = mkN "-" "gp's" {- FIXME: no singular form -}; -lin gp_N = mkN "gp" "-" {- FIXME: no plural form -}; +lin gp_N = mkN "gp" "gp's" {- FIXME: no plural form -}; lin grab_N = mkN "grab" "grabs"; lin grab_V = mkV "grab" "grabs" "grabbed" "grabbed" "grabbing"; lin grab_V2 = mkV2 (mkV "grab" "grabs" "grabbed" "grabbed" "grabbing"); @@ -18178,7 +18171,7 @@ lin inquisitor_N = mkN "inquisitor" "inquisitors"; lin inquisitorial_A = compoundA (mkA "inquisitorial"); lin inroad_N = mkN "inroad" "inroads"; lin inrush_N = mkN "inrush" "inrushes"; -lin ins_N = mkN "-" "ins" {- FIXME: no singular form -}; +lin ins_N = mkN "in" "ins" ; lin insane_A = compoundA (mkA "insane"); lin insanitary_A = compoundA (mkA "insanitary"); lin insanity_N = mkN "insanity" "-" {- FIXME: no plural form -}; @@ -18623,8 +18616,7 @@ lin ionize_V = mkV "ionize" "ionizes" "ionized" "ionized" "ionizing"; lin ionize_V2 = mkV2 (mkV "ionize" "ionizes" "ionized" "ionized" "ionizing"); lin ionosphere_N = mkN "ionosphere" "ionospheres"; lin iota_N = mkN "iota" "iotas"; -lin iou_N = mkN "iou" "-" {- FIXME: no plural form -}; -lin ious_N = mkN "-" "ious" {- FIXME: no singular form -}; +lin iou_N = mkN "IOU" "IOUs" ; lin iowa_PN = mkPN "Iowa"; lin ipse_dixit_N = mkN "ipse dixit" "ipse dixits"; lin ipso_facto_Adv = mkAdv "ipso facto"; @@ -19927,12 +19919,11 @@ lin lazily_Adv = mkAdv "lazily"; lin laziness_N = mkN "laziness" "-" {- FIXME: no plural form -}; lin lazy_A = mkA "lazy" "lazier"; lin lazybones_N = mkN "lazybones" "IRREG"; -lin lb_N = mkN "lb" "lb"; -lin lbs_N = mkN "-" "lbs" {- FIXME: no singular form -}; +lin lb_N = mkN "lb" "lbs" ; lin lbw_PN = mkPN "Lbw"; lin le_havre_PN = mkPN "Le havre"; lin le_mans_PN = mkPN "Le mans"; -lin lea_N = mkN "lea" "-" {- FIXME: no plural form -}; +lin lea_N = mkN "lea" "leas" ; lin leach_V2 = mkV2 (mkV "leach" "leaches" "leached" "leached" "leaching"); lin lead_N = mkN "lead" "leads"; lin lead_V = IrregEng.lead_V; @@ -20588,7 +20579,6 @@ lin liza_PN = mkPN "Liza"; lin lizard_N = mkN "lizard" "lizards"; lin lizzy_PN = mkPN "Lizzy"; lin ljubljana_PN = mkPN "Ljubljana"; -lin ll_N = mkN "-" "ll" {- FIXME: no singular form -}; lin llama_N = mkN "llama" "llamas"; lin llandudno_PN = mkPN "Llandudno"; lin llanelli_PN = mkPN "Llanelli"; @@ -20912,8 +20902,7 @@ lin loyalist_N = mkN "loyalist" "loyalists"; lin loyalty_N = mkN "loyalty" "loyalties"; lin loyang_PN = mkPN "Loyang"; lin lozenge_N = mkN "lozenge" "lozenges"; -lin lp_N = mkN "lp" "-" {- FIXME: no plural form -}; -lin lps_N = mkN "-" "lps" {- FIXME: no singular form -}; +lin lp_N = mkN "lp" "lps" {- FIXME: no plural form -}; lin lsd_N = mkN "lsd" "-" {- FIXME: no plural form -}; lin lt_PN = mkPN "Lt"; lin ltd_PN = mkPN "Ltd"; @@ -22601,7 +22590,7 @@ lin mockery_N = mkN "mockery" "mockeries"; lin mockingly_Adv = mkAdv "mockingly"; lin mod_A = compoundA (mkA "mod"); lin mod_N = mkN "mod" "mods"; -lin mod_cons_N = mkN "-" "mod cons" {- FIXME: no singular form -}; +lin mod_cons_N = mkN "mod con" "mod cons" ; lin modal_A = compoundA (mkA "modal"); lin modality_N = mkN "modality" "modalities"; lin mode_N = mkN "mode" "modes"; @@ -23013,8 +23002,7 @@ lin mower_N = mkN "mower" "mowers"; lin mozambican_A = compoundA (mkA "mozambican"); lin mozambican_N = mkN "mozambican" "mozambicans"; lin mozambique_PN = mkPN "Mozambique"; -lin mp's_N = mkN "-" "mp's" {- FIXME: no singular form -}; -lin mp_N = mkN "mp" "-" {- FIXME: no plural form -}; +lin mp_N = mkN "mp" "mp's" ; lin mpg_N = mkN "mpg" "mpg"; lin mph_N = mkN "mph" "mph"; lin mr_PN = mkPN "Mr"; @@ -23939,7 +23927,6 @@ lin norway_PN = mkPN "Norway"; lin norwegian_A = compoundA (mkA "norwegian"); lin norwegian_N = mkN "norwegian" "norwegians"; lin norwich_PN = mkPN "Norwich"; -lin nos_N = mkN "-" "nos" {- FIXME: no singular form -}; lin nose_N = mkN "nose" "noses"; lin nose_V = mkV "nose" "noses" "nosed" "nosed" "nosing"; lin nose_V2 = mkV2 (mkV "nose" "noses" "nosed" "nosed" "nosing"); @@ -24122,8 +24109,7 @@ lin oak_apple_N = mkN "oak-apple" "oak-apples"; lin oaken_A = compoundA (mkA "oaken"); lin oakengates_PN = mkPN "Oakengates"; lin oakum_N = mkN "oakum" "-" {- FIXME: no plural form -}; -lin oap's_N = mkN "-" "oap's" {- FIXME: no singular form -}; -lin oap_N = mkN "oap" "-" {- FIXME: no plural form -}; +lin oap_N = mkN "OAP" "OAP's" ; lin oar_N = mkN "oar" "oars"; lin oarsman_N = mkN "oarsman" "oarsmen" {- FIXME: guessed plural form -}; lin oarsmanship_N = mkN "oarsmanship" "-" {- FIXME: no plural form -}; @@ -27428,7 +27414,7 @@ lin powys_PN = mkPN "Powys"; lin pox_N = mkN "pox" "IRREG"; lin poynton_PN = mkPN "Poynton"; lin poznan_PN = mkPN "Poznan"; -lin pp_N = mkN "-" "pp" {- FIXME: no singular form -}; +lin pp_N = mkN "p" "pp" ; lin pr_N = mkN "pr" "-" {- FIXME: no plural form -}; lin practicability_N = mkN "practicability" "-" {- FIXME: no plural form -}; lin practicable_A = compoundA (mkA "practicable"); @@ -34019,8 +34005,7 @@ lin sort_V = mkV "sort" "sorts" "sorted" "sorted" "sorting"; lin sort_V2 = mkV2 (mkV "sort" "sorts" "sorted" "sorted" "sorting"); lin sorter_N = mkN "sorter" "sorters"; lin sortie_N = mkN "sortie" "sorties"; -lin sos_N = mkN "sos" "-" {- FIXME: no plural form -}; -lin soss_N = mkN "-" "soss" {- FIXME: no singular form -}; +lin sos_N = mkN "sos" "soss" ; lin sot_N = mkN "sot" "sots"; lin sotho_A = compoundA (mkA "sotho"); lin sotho_N = mkN "sotho" "sothos"; @@ -38407,8 +38392,7 @@ lin tutorship_N = mkN "tutorship" "tutorships"; lin tutti_frutti_N = mkN "tutti-frutti" "tutti-fruttis"; lin tutu_N = mkN "tutu" "tutus"; lin tuxedo_N = mkN "tuxedo" "tuxedos"; -lin tv_N = mkN "tv" "-" {- FIXME: no plural form -}; -lin tvs_N = mkN "-" "tvs" {- FIXME: no singular form -}; +lin tv_N = mkN "TV" "TVs" ; lin twaddle_N = mkN "twaddle" "-" {- FIXME: no plural form -}; lin twaddle_V = mkV "twaddle" "twaddles" "twaddled" "twaddled" "twaddling"; lin twain_N = mkN "twain" "twains"; @@ -38529,8 +38513,7 @@ lin uddingston_PN = mkPN "Uddingston"; lin udi_PN = mkPN "Udi"; lin udine_PN = mkPN "Udine"; lin ufa_PN = mkPN "Ufa"; -lin ufo's_N = mkN "-" "ufo's" {- FIXME: no singular form -}; -lin ufo_N = mkN "ufo" "-" {- FIXME: no plural form -}; +lin ufo_N = mkN "UFO" "UFO's" ; lin uganda_PN = mkPN "Uganda"; lin ugandan_A = compoundA (mkA "ugandan"); lin ugandan_N = mkN "ugandan" "ugandans"; @@ -39981,8 +39964,6 @@ lin vertical_N = mkN "vertical" "verticals"; lin vertiginous_A = compoundA (mkA "vertiginous"); lin vertigo_N = mkN "vertigo" "-" {- FIXME: no plural form -}; lin verve_N = mkN "verve" "-" {- FIXME: no plural form -}; -lin very_A = compoundA (mkA "very"); -lin very_Adv = mkAdv "very"; lin vesicle_N = mkN "vesicle" "vesicles"; lin vesicular_A = compoundA (mkA "vesicular"); lin vessel_N = mkN "vessel" "vessels"; @@ -40121,9 +40102,8 @@ lin violet_N = mkN "violet" "violets"; lin violet_PN = mkPN "Violet"; lin violin_N = mkN "violin" "violins"; lin violinist_N = mkN "violinist" "violinists"; -lin vip_N = mkN "vip" "-" {- FIXME: no plural form -}; +lin vip_N = mkN "vip" "vips" ; lin viper_N = mkN "viper" "vipers"; -lin vips_N = mkN "-" "vips" {- FIXME: no singular form -}; lin virago_N = mkN "virago" "viragos"; lin virgin_A = compoundA (mkA "virgin"); lin virgin_N = mkN "virgin" "virgins"; @@ -40235,7 +40215,6 @@ lin void_A = compoundA (mkA "void"); lin void_N = mkN "void" "voids"; lin void_V2 = mkV2 (mkV "void" "voids" "voided" "voided" "voiding"); lin voile_N = mkN "voile" "-" {- FIXME: no plural form -}; -lin vol_N = mkN "vol" "-" {- FIXME: no plural form -}; lin volatile_A = compoundA (mkA "volatile"); lin volatility_N = mkN "volatility" "volatilities"; lin volcanic_A = compoundA (mkA "volcanic"); @@ -40248,7 +40227,7 @@ lin volley_N = mkN "volley" "volleys"; lin volley_V = mkV "volley" "volleys" "volleyed" "volleyed" "volleying"; lin volley_V2 = mkV2 (mkV "volley" "volleys" "volleyed" "volleyed" "volleying"); lin volleyball_N = mkN "volleyball" "volleyballs"; -lin vols_N = mkN "-" "vols" {- FIXME: no singular form -}; +lin vol_N = mkN "vol" "vols" ; lin volt_N = mkN "volt" "volts"; lin voltage_N = mkN "voltage" "voltages"; lin volte_face_N = mkN "volte-face" "IRREG"; @@ -40674,8 +40653,7 @@ lin waylay_V2 = mkV2 (mkV "way" IrregEng.lay_V); lin wayne_PN = mkPN "Wayne"; lin wayside_N = mkN "wayside" "waysides"; lin wayward_A = compoundA (mkA "wayward"); -lin wc_N = mkN "wc" "-" {- FIXME: no plural form -}; -lin wcs_N = mkN "-" "wcs" {- FIXME: no singular form -}; +lin wc_N = mkN "WC" "WCs" ; lin weak_A = mkA "weak" "weaker"; lin weak_kneed_A = compoundA (mkA "weak-kneed"); lin weaken_V = mkV "weaken" "weakens" "weakened" "weakened" "weakening"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 362506ead..4c0cfb636 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -27,7 +27,6 @@ fun a_posteriori_A : A; fun a_posteriori_Adv : Adv; fun a_priori_A : A; fun a_priori_Adv : Adv; -fun aa_N : N; fun aachen_PN : PN; fun aarhus_PN : PN; fun ab_initio_Adv : Adv; @@ -52,7 +51,6 @@ fun abbreviate_V2 : V2; fun abbreviation_N : N; fun abbe_N : N; fun abc_N : N; -fun abcs_N : N; fun abdicate_V : V; fun abdicate_V2 : V2; fun abdication_N : N; @@ -1398,8 +1396,6 @@ fun anus_N : N; fun anvil_N : N; fun anxiety_N : N; fun anxious_A : A; -fun any_A : A; -fun any_Adv : Adv; fun anybody_N : N; fun anyhow_Adv : Adv; fun anyone_N : N; @@ -10867,7 +10863,6 @@ fun dryness_N : N; fun dsc_N : N; fun dss_N : N; fun dti_N : N; -fun dts_N : N; fun dual_A : A; fun dub_V2 : V2; fun dubbin_N : N; @@ -14794,7 +14789,6 @@ fun girlishness_N : N; fun giro_N : N; fun girth_N : N; fun girvan_PN : PN; -fun gis_N : N; fun gist_N : N; fun give_N : N; fun give_V : V; @@ -15135,7 +15129,6 @@ fun governor_general_N : N; fun govt_N : N; fun gown_N : N; fun gown_V2 : V2; -fun gp's_N : N; fun gp_N : N; fun grab_N : N; fun grab_V : V; @@ -18618,7 +18611,6 @@ fun ionize_V2 : V2; fun ionosphere_N : N; fun iota_N : N; fun iou_N : N; -fun ious_N : N; fun iowa_PN : PN; fun ipse_dixit_N : N; fun ipso_facto_Adv : Adv; @@ -19922,7 +19914,6 @@ fun laziness_N : N; fun lazy_A : A; fun lazybones_N : N; fun lb_N : N; -fun lbs_N : N; fun lbw_PN : PN; fun le_havre_PN : PN; fun le_mans_PN : PN; @@ -20582,7 +20573,6 @@ fun liza_PN : PN; fun lizard_N : N; fun lizzy_PN : PN; fun ljubljana_PN : PN; -fun ll_N : N; fun llama_N : N; fun llandudno_PN : PN; fun llanelli_PN : PN; @@ -20907,7 +20897,6 @@ fun loyalty_N : N; fun loyang_PN : PN; fun lozenge_N : N; fun lp_N : N; -fun lps_N : N; fun lsd_N : N; fun lt_PN : PN; fun ltd_PN : PN; @@ -23007,7 +22996,6 @@ fun mower_N : N; fun mozambican_A : A; fun mozambican_N : N; fun mozambique_PN : PN; -fun mp's_N : N; fun mp_N : N; fun mpg_N : N; fun mph_N : N; @@ -23933,7 +23921,6 @@ fun norway_PN : PN; fun norwegian_A : A; fun norwegian_N : N; fun norwich_PN : PN; -fun nos_N : N; fun nose_N : N; fun nose_V : V; fun nose_V2 : V2; @@ -24116,7 +24103,6 @@ fun oak_apple_N : N; fun oaken_A : A; fun oakengates_PN : PN; fun oakum_N : N; -fun oap's_N : N; fun oap_N : N; fun oar_N : N; fun oarsman_N : N; @@ -34014,7 +34000,6 @@ fun sort_V2 : V2; fun sorter_N : N; fun sortie_N : N; fun sos_N : N; -fun soss_N : N; fun sot_N : N; fun sotho_A : A; fun sotho_N : N; @@ -38402,7 +38387,6 @@ fun tutti_frutti_N : N; fun tutu_N : N; fun tuxedo_N : N; fun tv_N : N; -fun tvs_N : N; fun twaddle_N : N; fun twaddle_V : V; fun twain_N : N; @@ -38523,7 +38507,6 @@ fun uddingston_PN : PN; fun udi_PN : PN; fun udine_PN : PN; fun ufa_PN : PN; -fun ufo's_N : N; fun ufo_N : N; fun uganda_PN : PN; fun ugandan_A : A; @@ -39975,8 +39958,6 @@ fun vertical_N : N; fun vertiginous_A : A; fun vertigo_N : N; fun verve_N : N; -fun very_A : A; -fun very_Adv : Adv; fun vesicle_N : N; fun vesicular_A : A; fun vessel_N : N; @@ -40117,7 +40098,6 @@ fun violin_N : N; fun violinist_N : N; fun vip_N : N; fun viper_N : N; -fun vips_N : N; fun virago_N : N; fun virgin_A : A; fun virgin_N : N; @@ -40242,7 +40222,6 @@ fun volley_N : N; fun volley_V : V; fun volley_V2 : V2; fun volleyball_N : N; -fun vols_N : N; fun volt_N : N; fun voltage_N : N; fun volte_face_N : N; @@ -40669,7 +40648,6 @@ fun wayne_PN : PN; fun wayside_N : N; fun wayward_A : A; fun wc_N : N; -fun wcs_N : N; fun weak_A : A; fun weak_kneed_A : A; fun weaken_V : V;