insert spaces in the hyphenated words in DictEng. Various small fixes in DictEng and ParseEng

lib/src/english/DictEng.gf

@@ -128,7 +128,7 @@ lin abound_V = mkV "abound" "abounds" "abounded" "abounded" "abounding";
 lin about_AdN = mkAdN "about";
 lin about_Adv = mkAdv "about";
 lin about_Prep = mkPrep "about";
-lin about_face_N = mkN "about-face" "IRREG";
+lin about_face_N = mkN "about - face" "about - faces";
 lin about_face_V = mkV "about - face" "about - faces" "about - faced" "about - faced" "about - facing";
 lin above_Adv = mkAdv "above";
 lin above_Prep = mkPrep "above";
@@ -388,7 +388,7 @@ lin ad_lib_A = compoundA (mkA "ad-lib");
 lin ad_lib_Adv = mkAdv "ad lib";
 lin ad_lib_V = mkV "ad - lib" "ad - libs" "ad - libbed" "ad - libbed" "ad - libbing";
 lin ad_libitum_Adv = mkAdv "ad libitum";
-lin ad_man_N = mkN "ad-man" "ad-men" {- FIXME: guessed plural form -};
+lin ad_man_N = mkN "ad - man" "ad - men";
 lin ad_nauseam_Adv = mkAdv "ad nauseam";
 lin ad_valorem_Adv = mkAdv "ad valorem";
 lin ada_PN = mkPN "Ada";
@@ -2232,7 +2232,7 @@ lin autism_N = mkN "autism" ;
 lin autistic_A = compoundA (mkA "autistic");
 lin auto_N = mkN "auto" "autos";
 lin auto_changer_N = mkN "auto - changer" "auto - changers";
-lin auto_da_fe_N = mkN "auto-da-fé" "IRREG";
+lin auto_da_fe_N = mkN "auto - da - fé" (variants {"autos - de - fé"; "auto - de - fés"});
 lin autobahn_N = mkN "autobahn" "autobahns";
 lin autobiographic_A = compoundA (mkA "autobiographic");
 lin autobiographical_A = compoundA (mkA "autobiographical");
@@ -2267,7 +2267,7 @@ lin avail_V2 = mkV2 (mkV "avail" "avails" "availed" "availed" "availing");
 lin availability_N = mkN "availability" ;
 lin available_A = compoundA (mkA "available");
 lin avalanche_N = mkN "avalanche" "avalanches";
-lin avant_garde_N = mkN "avant-garde" "IRREG";
+lin avant_garde_N = mkN "avant - garde" "avant - gardes";
 lin avarice_N = mkN "avarice" ;
 lin avaricious_A = compoundA (mkA "avaricious");
 lin avatar_N = mkN "avatar" "avatars";
@@ -2766,7 +2766,7 @@ lin barrister_N = mkN "barrister" "barristers";
 lin barrow_N = mkN "barrow" "barrows";
 lin barrow_boy_N = mkN "barrow - boy" "barrow - boys";
 lin barrow_in_furness_PN = mkPN "Barrow - in - furness";
-lin barrow_man_N = mkN "barrow-man" "barrow-men" {- FIXME: guessed plural form -};
+lin barrow_man_N = mkN "barrow - man" "barrow - men";
 lin barry_PN = mkPN "Barry";
 lin bart_PN = mkPN "Bart";
 lin bartender_N = mkN "bartender" "bartenders";
@@ -4123,7 +4123,7 @@ lin bowburn_PN = mkPN "Bowburn";
 lin bowdlerize_V2 = mkV2 (mkV "bowdlerize" "bowdlerizes" "bowdlerized" "bowdlerized" "bowdlerizing");
 lin bowel_N = mkN "bowel" "bowels";
 lin bower_N = mkN "bower" "bowers";
-lin bowie_knife_N = mkN "bowie knife" "bowie knives" {- FIXME: guessed plural form -};
+lin bowie_knife_N = mkN "bowie knife" "bowie knives";
 lin bowing_N = mkN "bowing" ;
 lin bowl_N = mkN "bowl" "bowls";
 lin bowl_V = mkV "bowl" "bowls" "bowled" "bowled" "bowling";
@@ -4478,7 +4478,7 @@ lin bros_PN = mkPN "Bros";
 lin broth_N = mkN "broth" ;
 lin brothel_N = mkN "brothel" "brothels";
 lin brother_N = mkN "brother" "brothers";
-lin brother_in_law_N = mkN "brother-in-law" "brothers-in-law" {- FIXME: guessed plural form -};
+lin brother_in_law_N = mkN "brother - in - law" "brothers - in - law";
 lin brotherhood_N = mkN "brotherhood" "brotherhoods";
 lin brotherly_A = compoundA (mkA "brotherly");
 lin brougham_N = mkN "brougham" "broughams";
@@ -5395,7 +5395,7 @@ lin carve_V2 = mkV2 (mkV "carve" "carves" "carved" "carved" "carving");
 lin carver_N = mkN "carver" "carvers";
 lin carving_N = mkN "carving" "carvings";
 lin carving_fork_N = mkN "carving - fork" "carving - forks";
-lin carving_knife_N = mkN "carving-knife" "carving-knives" {- FIXME: guessed plural form -};
+lin carving_knife_N = mkN "carving - knife" "carving - knives";
 lin caryatid_N = mkN "caryatid" "caryatids";
 lin casablanca_PN = mkPN "Casablanca";
 lin cascade_N = mkN "cascade" "cascades";
@@ -5944,7 +5944,7 @@ lin cheesecloth_N = mkN "cheesecloth" "cheesecloths";
 lin cheeseparing_A = compoundA (mkA "cheeseparing");
 lin cheetah_N = mkN "cheetah" "cheetahs";
 lin chef_N = mkN "chef" "chefs";
-lin chef_d'oeuvre_N = mkN "chef-d'oeuvre" "IRREG";
+lin chef_d'oeuvre_N = mkN "chef - d'oeuvre" "chefs - d'oeuvre";
 lin chelmsford_PN = mkPN "Chelmsford";
 lin chelsea_PN = mkPN "Chelsea";
 lin cheltenham_PN = mkPN "Cheltenham";
@@ -6380,7 +6380,7 @@ lin clash_V2 = mkV2 (mkV "clash" "clashes" "clashed" "clashed" "clashing");
 lin clasp_N = mkN "clasp" "clasps";
 lin clasp_V = mkV "clasp" "clasps" "clasped" "clasped" "clasping";
 lin clasp_V2 = mkV2 (mkV "clasp" "clasps" "clasped" "clasped" "clasping");
-lin clasp_knife_N = mkN "clasp-knife" "clasp-knives" {- FIXME: guessed plural form -};
+lin clasp_knife_N = mkN "clasp - knife" "clasp - knives";
 lin class_N = mkN "class" "classes";
 lin class_V2 = mkV2 (mkV "class" "classes" "classed" "classed" "classing");
 lin class_conscious_A = compoundA (mkA "class - conscious");
@@ -6595,7 +6595,7 @@ lin cloud_V = mkV "cloud" "clouds" "clouded" "clouded" "clouding";
 lin cloud_V2 = mkV2 (mkV "cloud" "clouds" "clouded" "clouded" "clouding");
 lin cloud_bank_N = mkN "cloud - bank" "cloud - banks";
 lin cloud_capped_A = compoundA (mkA "cloud - capped");
-lin cloud_cuckoo_land_N = mkN "cloud-cuckoo-land" "IRREG";
+lin cloud_cuckoo_land_N = mkN "cloud - cuckoo - land" "cloud - cuckoo - lands";
 lin cloudburst_N = mkN "cloudburst" "cloudbursts";
 lin cloudless_A = compoundA (mkA "cloudless");
 lin cloudy_A = mkA "cloudy" "cloudier";
@@ -7213,7 +7213,7 @@ lin comradeship_N = mkN "comradeship" "comradeships";
 lin con_Adv = mkAdv "con";
 lin con_N = mkN "con" "cons";
 lin con_V2 = mkV2 (mkV "con" "cons" "conned" "conned" "conning");
-lin con_man_N = mkN "con-man" "con-men" {- FIXME: guessed plural form -};
+lin con_man_N = mkN "con - man" "con - men";
 lin concatenation_N = mkN "concatenation" "concatenations";
 lin concave_A = compoundA (mkA "concave");
 lin concavity_N = mkN "concavity" "concavities";
@@ -8178,7 +8178,7 @@ lin court_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";
-lin court_martial_N = mkN "court-martial" "IRREG";
+lin court_martial_N = mkN "court - martial" "courts - martial";
 lin court_martial_V2 = mkV2 (mkV "court - martial" "court - martials" "court - martialed" "court - martialed" "court - martialing");
 lin courteous_A = compoundA (mkA "courteous");
 lin courtesan_N = mkN "courtesan" "courtesans";
@@ -13148,7 +13148,7 @@ lin fateful_A = compoundA (mkA "fateful");
 lin fathead_N = mkN "fathead" "fatheads";
 lin father_N = mkN "father" "fathers";
 lin father_V2 = mkV2 (mkV "father" "fathers" "fathered" "fathered" "fathering");
-lin father_in_law_N = mkN "father-in-law" "fathers-in-law" {- FIXME: guessed plural form -};
+lin father_in_law_N = mkN "father - in - law" "fathers - in - law";
 lin fatherhood_N = mkN "fatherhood" ;
 lin fatherland_N = mkN "fatherland" "fatherlands";
 lin fatherless_A = compoundA (mkA "fatherless");
@@ -13417,7 +13417,7 @@ lin fiesta_N = mkN "fiesta" "fiestas";
 lin fife_N = mkN "fife" "fifes";
 lin fife_PN = mkPN "Fife";
 lin fig_N = mkN "fig" "figs";
-lin fig_leaf_N = mkN "fig-leaf" "fig-leaves" {- FIXME: guessed plural form -};
+lin fig_leaf_N = mkN "fig - leaf" "fig - leaves";
 lin fight_N = mkN "fight" "fights";
 lin fight_V = IrregEng.fight_V;
 lin fight_V2 = mkV2 (IrregEng.fight_V);
@@ -13608,13 +13608,13 @@ lin fish_N = mkN "fish" "fish";
 lin fish_V = mkV "fish" "fishes" "fished" "fished" "fishing";
 lin fish_V2 = mkV2 (mkV "fish" "fishes" "fished" "fished" "fishing");
 lin fish_hook_N = mkN "fish - hook" "fish - hooks";
-lin fish_knife_N = mkN "fish-knife" "fish-knives" {- FIXME: guessed plural form -};
+lin fish_knife_N = mkN "fish - knife" "fish - knives";
 lin fish_slice_N = mkN "fish - slice" "fish - slices";
 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" {- FIXME: guessed plural form -};
+lin fisherman_N = mkN "fisherman" "fishermen";
 lin fishery_N = mkN "fishery" "fisheries";
 lin fishing_N = mkN "fishing" ;
 lin fishing_line_N = mkN "fishing - line" "fishing - lines";
@@ -13784,8 +13784,7 @@ lin flesh_N = mkN "flesh" ;
 lin flesh_wound_N = mkN "flesh - wound" "flesh - wounds";
 lin fleshly_A = compoundA (mkA "fleshly");
 lin fleshy_A = mkA "fleshy" "fleshier";
-lin fleur_de_lis_N = mkN "fleur-de-lis" "fleur-de-les" {- FIXME: guessed plural form -};
+lin fleur_de_lis_N = mkN (variants {"fleur - de - lis"; "fleur - de - lys"}) "fleur - de - les";
-lin fleur_de_lys_N = mkN "fleur-de-lys" "IRREG";
 lin flex_N = mkN "flex" "flexes";
 lin flex_V2 = mkV2 (mkV "flex" "flexes" "flexed" "flexed" "flexing");
 lin flexibility_N = mkN "flexibility" ;
@@ -13793,7 +13792,7 @@ lin flexible_A = compoundA (mkA "flexible");
 lin flibbertigibbet_N = mkN "flibbertigibbet" "flibbertigibbets";
 lin flick_N = mkN "flick" "flicks";
 lin flick_V2 = mkV2 (mkV "flick" "flicks" "flicked" "flicked" "flicking");
-lin flick_knife_N = mkN "flick-knife" "flick-knives" {- FIXME: guessed plural form -};
+lin flick_knife_N = mkN "flick - knife" "flick - knives";
 lin flicker_N = mkN "flicker" "flickers";
 lin flicker_V = mkV "flicker" "flickers" "flickered" "flickered" "flickering";
 lin flier_N = mkN "flier" "fliers";
@@ -14758,7 +14757,7 @@ lin fuze_N = mkN "fuze" "fuzes";
 lin fuzz_N = mkN "fuzz" ;
 lin fuzzy_A = mkA "fuzzy" "fuzzier";
 lin fwd_PN = mkPN "Fwd";
-lin g_man_N = mkN "g-man" "g-men" {- FIXME: guessed plural form -};
+lin g_man_N = mkN "g - man" "g - men";
 lin gab_N = mkN "gab" ;
 lin gabardine_N = mkN "gabardine" ;
 lin gabble_N = mkN "gabble" ;
@@ -16372,9 +16371,9 @@ lin hangar_N = mkN "hangar" "hangars";
 lin hangchon_PN = mkPN "Hangchon";
 lin hangdog_A = compoundA (mkA "hangdog");
 lin hanger_N = mkN "hanger" "hangers";
-lin hanger_on_N = mkN "hanger-on" "hanger-a" {- FIXME: guessed plural form -};
+lin hanger_on_N = mkN "hanger - on" "hangers - on";
 lin hanging_N = mkN "hanging" "hangings";
-lin hangman_N = mkN "hangman" "hangmen" {- FIXME: guessed plural form -};
+lin hangman_N = mkN "hangman" "hangmen";
 lin hangnail_N = mkN "hangnail" "hangnails";
 lin hangover_N = mkN "hangover" "hangovers";
 lin hank_N = mkN "hank" "hanks";
@@ -16602,7 +16601,7 @@ lin haziness_N = mkN "haziness" ;
 lin hazy_A = mkA "hazy" "hazier";
 lin he_Pron = mkPron "he" "him" "his" "his" singular P3 masculine ;
 lin he_goat_N = mkN "he - goat" "he - goats";
-lin he_man_N = mkN "he-man" "he-men" {- FIXME: guessed plural form -};
+lin he_man_N = mkN "he - man" "he - men";
 lin head_N = mkN "head" "heads";
 lin head_V = mkV "head" "heads" "headed" "headed" "heading";
 lin head_V2 = mkV2 (mkV "head" "heads" "headed" "headed" "heading");
@@ -19344,7 +19343,7 @@ lin jack_N = mkN "jack" "jacks";
 lin jack_PN = mkPN "Jack";
 lin jack_V2 = mkV2 (mkV "jack" "jacks" "jacked" "jacked" "jacking");
 lin jack_in_the_box_N = mkN "jack - in - the - box" "jack - in - the - boxes";
-lin jack_knife_N = mkN "jack-knife" "jack-knives" {- FIXME: guessed plural form -};
+lin jack_knife_N = mkN "jack - knife" "jack - knives";
 lin jack_knife_V = mkV "jack - knife" "jack - knifes" "jack - knifed" "jack - knifed" "jack - knifing";
 lin jack_o'_lantern_N = mkN "jack - o'-lantern" "jack - o'-lanterns";
 lin jack_plane_N = mkN "jack - plane" "jack - planes";
@@ -20039,12 +20038,12 @@ lin kneel_V = mkV "kneel" "kneels" "kneeled" "kneeled" "kneeling";
 lin knell_N = mkN "knell" "IRREG";
 lin knesset_N = mkN "knesset" "knessets";
 lin knick_knack_N = mkN "knick - knack" "knick - knacks";
-lin knife_N = mkN "knife" "knives" {- FIXME: guessed plural form -};
+lin knife_N = mkN "knife" "knives";
 lin knife_V2 = mkV2 (mkV "knife" "knifes" "knifed" "knifed" "knifing");
 lin knife_edge_N = mkN "knife - edge" "knife - edges";
 lin knight_N = mkN "knight" "knights";
 lin knight_V2 = mkV2 (mkV "knight" "knights" "knighted" "knighted" "knighting");
-lin knight_errant_N = mkN "knight-errant" "IRREG";
+lin knight_errant_N = mkN "knight - errant" "knights - errant";
 lin knighthood_N = mkN "knighthood" "knighthoods";
 lin knightly_A = compoundA (mkA "knightly");
 lin knit_V = mkV "knit" "knits" "knitted" "knitted" "knitting";
@@ -20205,7 +20204,7 @@ lin ladle_V2 = mkV2 (mkV "ladle" "ladles" "ladled" "ladled" "ladling");
 lin lady's_maid_N = mkN "lady's - maid" "lady's - maids";
 lin lady_N = mkN "lady" "ladies";
 lin lady_chapel_N = mkN "lady - chapel" "lady - chapels";
-lin lady_in_waiting_N = mkN "lady-in-waiting" "IRREG";
+lin lady_in_waiting_N = mkN "lady - in - waiting" "ladies - in - waiting";
 lin lady_killer_N = mkN "lady - killer" "lady - killers";
 lin ladybird_N = mkN "ladybird" "ladybirds";
 lin ladylike_A = compoundA (mkA "ladylike");
@@ -20527,7 +20526,7 @@ lin leadership_N = mkN "leadership" ;
 lin leading_A = compoundA (mkA "leading");
 lin leading_N = mkN "leading" ;
 lin leading_rein_N = mkN "leading - rein" "leading - reins";
-lin leaf_N = mkN "leaf" "leaves" {- FIXME: guessed plural form -};
+lin leaf_N = mkN "leaf" "leaves";
 lin leaf_V = mkV "leaf" "leafs" "leafed" "leafed" "leafing";
 lin leaf_bud_N = mkN "leaf - bud" "leaf - buds";
 lin leaf_mould_N = mkN "leaf - mould" ;
@@ -21923,7 +21922,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 "man" "men" {- FIXME: guessed plural form -};
+lin man_N = 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";
@@ -22057,7 +22056,7 @@ lin map_N = mkN "map" "maps";
 lin map_V2 = mkV2 (mkV "map" "maps" "mapped" "mapped" "mapping");
 lin map_reader_N = mkN "map - reader" "map - readers";
 lin maple_N = mkN "maple" "maples";
-lin maple_leaf_N = mkN "maple-leaf" "maple-leaves" {- FIXME: guessed plural form -};
+lin maple_leaf_N = mkN "maple - leaf" "maple - leaves";
 lin maquis_N = mkN "maquis" "maques" {- FIXME: guessed plural form -};
 lin mar_PN = mkPN "Mar";
 lin mar_V2 = mkV2 (mkV "mar" "mars" "marred" "marred" "marring");
@@ -22241,7 +22240,7 @@ lin massy_A = mkA "massy" "massier";
 lin mast_N = mkN "mast" "masts";
 lin master_N = mkN "master" "masters";
 lin master_V2 = mkV2 (mkV "master" "masters" "mastered" "mastered" "mastering");
-lin master_at_arms_N = mkN "master-at-arms" "IRREG";
+lin master_at_arms_N = mkN "master - at - arms" "masters - at - arms";
 lin master_key_N = mkN "master - key" "master - keys";
 lin masterful_A = compoundA (mkA "masterful");
 lin masterless_A = compoundA (mkA "masterless");
@@ -22483,7 +22482,7 @@ lin medicinal_A = compoundA (mkA "medicinal");
 lin medicine_N = mkN "medicine" "medicines";
 lin medicine_ball_N = mkN "medicine - ball" "medicine - balls";
 lin medicine_chest_N = mkN "medicine - chest" "medicine - chests";
-lin medicine_man_N = mkN "medicine-man" "medicine-men" {- FIXME: guessed plural form -};
+lin medicine_man_N = mkN "medicine - man" "medicine - men";
 lin medico_N = mkN "medico" "medicos";
 lin medieval_A = compoundA (mkA "medieval");
 lin mediocre_A = compoundA (mkA "mediocre");
@@ -22788,8 +22787,8 @@ lin microscopical_A = compoundA (mkA "microscopical");
 lin microscopy_N = mkN "microscopy" ;
 lin microwave_N = mkN "microwave" "microwaves";
 lin mid_A = compoundA (mkA "mid");
-lin mid_off_N = mkN "mid-off" "mid-ofves" {- FIXME: guessed plural form -};
+lin mid_off_N = mkN "mid - off" "mid - offs";
-lin mid_on_N = mkN "mid-on" "mid-a" {- FIXME: guessed plural form -};
+lin mid_on_N = mkN "mid - on" "mid - ons";
 lin midday_N = mkN "midday" ;
 lin midden_N = mkN "midden" "middens";
 lin middle_N = mkN "middle" "middles";
@@ -22797,7 +22796,7 @@ lin middle_aged_A = compoundA (mkA "middle-aged");
 lin middle_class_A = compoundA (mkA "middle - class");
 lin middle_distance_A = compoundA (mkA "middle - distance");
 lin middle_of_the_road_A = compoundA (mkA "middle - of - the - road");
-lin middleman_N = mkN "middleman" "middlemen" {- FIXME: guessed plural form -};
+lin middleman_N = mkN "middleman" "middlemen";
 lin middlesex_PN = mkPN "Middlesex";
 lin middleton_PN = mkPN "Middleton";
 lin middleweight_A = compoundA (mkA "middleweight");
@@ -22884,7 +22883,7 @@ lin milk_V2 = mkV2 (mkV "milk" "milks" "milked" "milked" "milking");
 lin milk_churn_N = mkN "milk - churn" "milk - churns";
 lin milk_powder_N = mkN "milk - powder" "milk - powders";
 lin milk_shake_N = mkN "milk - shake" "milk - shakes";
-lin milk_tooth_N = mkN "milk-tooth" "milk-teeth" {- FIXME: guessed plural form -};
+lin milk_tooth_N = mkN "milk - tooth" "milk - teeth";
 lin milk_white_A = compoundA (mkA "milk - white");
 lin milkbar_N = mkN "milkbar" "milkbars";
 lin milking_machine_N = mkN "milking - machine" "milking - machines";
@@ -23577,7 +23576,7 @@ lin moth_eaten_A = compoundA (mkA "moth-eaten");
 lin mothball_N = mkN "mothball" "mothballs";
 lin mother_N = mkN "mother" "mothers";
 lin mother_V2 = mkV2 (mkV "mother" "mothers" "mothered" "mothered" "mothering");
-lin mother_in_law_N = mkN "mother-in-law" "mothers-in-law" {- FIXME: guessed plural form -};
+lin mother_in_law_N = mkN "mother - in - law" "mothers - in - law";
 lin mother_of_pearl_N = mkN "mother - of - pearl" ;
 lin motherhood_N = mkN "motherhood" ;
 lin motherland_N = mkN "motherland" "motherlands";
@@ -23714,7 +23713,7 @@ lin muezzin_N = mkN "muezzin" "muezzins";
 lin muff_N = mkN "muff" "muffs";
 lin muff_V2 = mkV2 (mkV "muff" "muffs" "muffed" "muffed" "muffing");
 lin muffin_N = mkN "muffin" "muffins";
-lin muffin_man_N = mkN "muffin-man" "muffin-men" {- FIXME: guessed plural form -};
+lin muffin_man_N = mkN "muffin - man" "muffin - men";
 lin muffle_V2 = mkV2 (mkV "muffle" "muffles" "muffled" "muffled" "muffling");
 lin muffler_N = mkN "muffler" "mufflers";
 lin mufti_N = mkN "mufti" ;
@@ -24397,7 +24396,7 @@ lin night_soil_N = mkN "night-soil" ;
 lin night_stop_N = mkN "night - stop" "night - stops";
 lin night_time_N = mkN "night - time" ;
 lin night_watch_N = mkN "night - watch" "night - watches";
-lin night_watchman_N = mkN "night-watchman" "night-watchmen" {- FIXME: guessed plural form -};
+lin night_watchman_N = mkN "night - watchman" "night - watchmen";
 lin nightcap_N = mkN "nightcap" "nightcaps";
 lin nightclub_N = mkN "nightclub" "nightclubs";
 lin nightdress_N = mkN "nightdress" "nightdresses";
@@ -24464,7 +24463,7 @@ lin nix_V2 = mkV2 (mkV "nix");
 lin no_Quant = mkQuant "no" "no" "none" "none" ;
 lin no_ball_N = mkN "no - ball" "no - balls";
 lin no_go_A = compoundA (mkA "no - go");
-lin no_man's_land_N = mkN "no-man's-land" "IRREG";
+lin no_man's_land_N = mkN "no - man's - land" "no - man's - lands";
 lin noah_PN = mkPN "Noah";
 lin nob_N = mkN "nob" "nobs";
 lin nobble_V2 = mkV2 (mkV "nobble" "nobbles" "nobbled" "nobbled" "nobbling");
@@ -25991,7 +25990,7 @@ lin palestine_PN = mkPN "Palestine";
 lin palestinian_A = compoundA (mkA "palestinian");
 lin palestinian_N = mkN "palestinian" "palestinians";
 lin palette_N = mkN "palette" "palettes";
-lin palette_knife_N = mkN "palette-knife" "palette-knives" {- FIXME: guessed plural form -};
+lin palette_knife_N = mkN "palette - knife" "palette - knives";
 lin palfrey_N = mkN "palfrey" "palfreys";
 lin palimpsest_N = mkN "palimpsest" "palimpsests";
 lin palindrome_N = mkN "palindrome" "palindromes";
@@ -26110,7 +26109,7 @@ lin paperback_N = mkN "paperback" "paperbacks";
 lin paperbacked_A = compoundA (mkA "paperbacked");
 lin paperclip_N = mkN "paperclip" "paperclips";
 lin paperhanger_N = mkN "paperhanger" "paperhangers";
-lin paperknife_N = mkN "paperknife" "paperknives" {- FIXME: guessed plural form -};
+lin paperknife_N = mkN "paperknife" "paperknives";
 lin paperless_A = compoundA (mkA "paperless");
 lin papermill_N = mkN "papermill" "papermills";
 lin paperweight_N = mkN "paperweight" "paperweights";
@@ -26701,7 +26700,7 @@ lin penitential_A = compoundA (mkA "penitential");
 lin penitentiary_A = compoundA (mkA "penitentiary");
 lin penitentiary_N = mkN "penitentiary" "penitentiaries";
 lin penki_PN = mkPN "Penki";
-lin penknife_N = mkN "penknife" "penknives" {- FIXME: guessed plural form -};
+lin penknife_N = mkN "penknife" "penknives";
 lin penmanship_N = mkN "penmanship" ;
 lin penn'orth_N = mkN "penn'orth" "penn'orths";
 lin pennant_N = mkN "pennant" "pennants";
@@ -26742,7 +26741,7 @@ lin penzance_PN = mkPN "Penzance";
 lin peon_N = mkN "peon" "peons";
 lin peonage_N = mkN "peonage" ;
 lin peony_N = mkN "peony" "peonies";
-lin people_N = mkN "people" "peoples";
+lin people_N = mkN "people" (variants {"people"; "peoples"});
 lin people_V2 = mkV2 (mkV "people" "peoples" "peopled" "peopled" "peopling");
 lin pep_N = mkN "pep" ;
 lin pep_V2 = mkV2 (mkV "pep" "peps" "pepped" "pepped" "pepping");
@@ -27520,7 +27519,7 @@ lin planless_A = compoundA (mkA "planless");
 lin planner_N = mkN "planner" "planners";
 lin plant_N = mkN "plant" "plants";
 lin plant_V2 = mkV2 (mkV "plant" "plants" "planted" "planted" "planting");
-lin plant_louse_N = mkN "plant-louse" "plant-lice" {- FIXME: guessed plural form -};
+lin plant_louse_N = mkN "plant - louse" "plant - lice";
 lin plantain_N = mkN "plantain" "plantains";
 lin plantation_N = mkN "plantation" "plantations";
 lin planter_N = mkN "planter" "planters";
@@ -27746,7 +27745,7 @@ lin pocket_N = mkN "pocket" "pockets";
 lin pocket_V2 = mkV2 (mkV "pocket" "pockets" "pocketed" "pocketed" "pocketing");
 lin pocket_book_N = mkN "pocket - book" "pocket - books";
 lin pocket_handkerchief_N = mkN "pocket - handkerchief" "pocket - handkerchiefs";
-lin pocket_knife_N = mkN "pocket-knife" "pocket-knives" {- FIXME: guessed plural form -};
+lin pocket_knife_N = mkN "pocket - knife" "pocket - knives";
 lin pocket_money_N = mkN "pocket - money" ;
 lin pocketful_N = mkN "pocketful" "pocketfuls";
 lin pockmarked_A = compoundA (mkA "pockmarked");
@@ -28909,7 +28908,7 @@ lin propensity_N = mkN "propensity" "propensities";
 lin proper_A = compoundA (mkA "proper");
 lin propertied_A = compoundA (mkA "propertied");
 lin property_N = mkN "property" "properties";
-lin property_man_N = mkN "property-man" "property-men" {- FIXME: guessed plural form -};
+lin property_man_N = mkN "property - man" "property - men";
 lin property_master_N = mkN "property - master" "property - masters";
 lin prophecy_N = mkN "prophecy" "prophecies";
 lin prophesy_V = mkV "prophesy" "prophesies" "prophesied" "prophesied" "prophesying";
@@ -29074,7 +29073,7 @@ lin prune_N = mkN "prune" "prunes";
 lin prune_V2 = mkV2 (mkV "prune" "prunes" "pruned" "pruned" "pruning");
 lin pruning_N = mkN "pruning" ;
 lin pruning_hook_N = mkN "pruning - hook" "pruning - hooks";
-lin pruning_knife_N = mkN "pruning-knife" "pruning-knives" {- FIXME: guessed plural form -};
+lin pruning_knife_N = mkN "pruning - knife" "pruning - knives";
 lin pruning_saw_N = mkN "pruning - saw" "pruning - saws";
 lin prurience_N = mkN "prurience" ;
 lin pruriency_N = mkN "pruriency" ;
@@ -31687,7 +31686,7 @@ lin rose_PN = mkPN "Rose";
 lin rose_V = mkV "rose";
 lin rose_V2 = mkV2 (mkV "rose");
 lin rose_bed_N = mkN "rose - bed" "rose - beds";
-lin rose_leaf_N = mkN "rose-leaf" "rose-leaves" {- FIXME: guessed plural form -};
+lin rose_leaf_N = mkN "rose - leaf" "rose - leaves";
 lin rose_red_A = compoundA (mkA "rose - red");
 lin rose_water_N = mkN "rose - water" ;
 lin roseate_A = compoundA (mkA "roseate");
@@ -33304,7 +33303,7 @@ lin seriocomic_A = compoundA (mkA "seriocomic");
 lin serious_A = compoundA (mkA "serious");
 lin seriousness_N = mkN "seriousness" ;
 lin serjeant_N = mkN "serjeant" "serjeants";
-lin serjeant_at_arms_N = mkN "serjeant-at-arms" "IRREG";
+lin serjeant_at_arms_N = mkN "serjeant - at - arms" "serjeants - at - arms";
 lin sermon_N = mkN "sermon" "sermons";
 lin sermonize_V = mkV "sermonize" "sermonizes" "sermonized" "sermonized" "sermonizing";
 lin sermonize_V2 = mkV2 (mkV "sermonize" "sermonizes" "sermonized" "sermonized" "sermonizing");
@@ -33520,10 +33519,10 @@ lin shaving_brush_N = mkN "shaving-brush" "shaving-brushes";
 lin shawl_N = mkN "shawl" "shawls";
 lin she_Pron = mkPron "she" "her" "her" "hers" singular P3 feminine ;
 lin she_goat_N = mkN "she - goat" "she - goats";
-lin sheaf_N = mkN "sheaf" "sheaves" {- FIXME: guessed plural form -};
+lin sheaf_N = mkN "sheaf" "sheaves";
 lin shear_V2 = mkV2 (mkV "shear" "shears" "sheared" "sheared" "shearing");
 lin sheath_N = mkN "sheath" "sheaths";
-lin sheath_knife_N = mkN "sheath-knife" "sheath-knives" {- FIXME: guessed plural form -};
+lin sheath_knife_N = mkN "sheath - knife" "sheath - knives";
 lin sheathe_V2 = mkV2 (mkV "sheathe" "sheathes" "sheathed" "sheathed" "sheathing");
 lin sheathing_N = mkN "sheathing" "sheathings";
 lin shebang_N = mkN "shebang" "IRREG";
@@ -33819,7 +33818,7 @@ lin shrapnel_N = mkN "shrapnel" ;
 lin shred_N = mkN "shred" "shreds";
 lin shred_V2 = mkV2 (mkV "shred" "shreds" "shredded" "shredded" "shredding");
 lin shrew_N = mkN "shrew" "shrews";
-lin shrew_mouse_N = mkN "shrew-mouse" "shrew-mice" {- FIXME: guessed plural form -};
+lin shrew_mouse_N = mkN "shrew - mouse" "shrew - mice";
 lin shrewd_A = mkA "shrewd" "shrewder";
 lin shrewdness_N = mkN "shrewdness" ;
 lin shrewish_A = compoundA (mkA "shrewish");
@@ -34175,7 +34174,7 @@ lin sisal_N = mkN "sisal" ;
 lin sissified_A = compoundA (mkA "sissified");
 lin sissy_N = mkN "sissy" "sissies";
 lin sister_N = mkN "sister" "sisters";
-lin sister_in_law_N = mkN "sister-in-law" "sisters-in-law" {- FIXME: guessed plural form -};
+lin sister_in_law_N = mkN "sister - in - law" "sisters - in - law";
 lin sisterhood_N = mkN "sisterhood" ;
 lin sisterly_A = compoundA (mkA "sisterly");
 lin siswati_N = mkN "siswati" ;
@@ -34735,7 +34734,7 @@ lin snazzy_A = compoundA (mkA "snazzy");
 lin sneak_N = mkN "sneak" "sneaks";
 lin sneak_V = mkV "sneak" "sneaks" "sneaked" "sneaked" "sneaking";
 lin sneak_V2 = mkV2 (mkV "sneak" "sneaks" "sneaked" "sneaked" "sneaking");
-lin sneak_thief_N = mkN "sneak-thief" "sneak-thieves" {- FIXME: guessed plural form -};
+lin sneak_thief_N = mkN "sneak - thief" "sneak - thieves";
 lin sneaking_A = compoundA (mkA "sneaking");
 lin sneaky_A = mkA "sneaky" "sneakier";
 lin sneer_N = mkN "sneer" "sneers";
@@ -35036,7 +35035,7 @@ lin somnambulist_N = mkN "somnambulist" "somnambulists";
 lin somnolence_N = mkN "somnolence" ;
 lin somnolent_A = compoundA (mkA "somnolent");
 lin son_N = mkN "son" "sons";
-lin son_in_law_N = mkN "son-in-law" "sons-in-law" {- FIXME: guessed plural form -};
+lin son_in_law_N = mkN "son - in - law" "sons - in - law";
 lin sonar_N = mkN "sonar" "sonars";
 lin sonata_N = mkN "sonata" "sonatas";
 lin song_N = mkN "song" "songs";
@@ -37425,14 +37424,14 @@ lin table_N = mkN "table" "tables";
 lin table_V2 = mkV2 (mkV "table" "tables" "tabled" "tabled" "tabling");
 lin table_d'hote_A = compoundA (mkA "table d'hôte");
 lin table_d'hote_Adv = mkAdv "table d'hôte";
-lin table_knife_N = mkN "table-knife" "table-knives" {- FIXME: guessed plural form -};
+lin table_knife_N = mkN "table - knife" "table - knives";
 lin table_lifting_N = mkN "table - lifting" ;
 lin table_linen_N = mkN "table - linen" ;
 lin table_rapping_N = mkN "table - rapping" ;
 lin table_talk_N = mkN "table - talk" ;
 lin table_turning_N = mkN "table - turning" ;
-lin tableau_N = mkN "tableau" "tableaux" {- FIXME: guessed plural form -};
+lin tableau_N = mkN "tableau" "tableaux";
-lin tableau_vivant_N = mkN "tableau vivant" "IRREG";
+lin tableau_vivant_N = mkN "tableau vivant" "tableaux vivants";
 lin tablecloth_N = mkN "tablecloth" "tablecloths";
 lin tablemat_N = mkN "tablemat" "tablemats";
 lin tablespoon_N = mkN "tablespoon" "tablespoons";
@@ -37744,7 +37743,7 @@ lin tea_cloth_N = mkN "tea-cloth" "tea-cloths";
 lin tea_cosy_N = mkN "tea - cosy" "tea - cosies";
 lin tea_garden_N = mkN "tea - garden" "tea - gardens";
 lin tea_kettle_N = mkN "tea - kettle" "tea - kettles";
-lin tea_leaf_N = mkN "tea-leaf" "tea-leaves" {- FIXME: guessed plural form -};
+lin tea_leaf_N = mkN "tea - leaf" "tea - leaves";
 lin tea_party_N = mkN "tea - party" "tea - parties";
 lin tea_service_N = mkN "tea - service" "tea - services";
 lin tea_set_N = mkN "tea - set" "tea - sets";
@@ -38745,7 +38744,7 @@ lin tool_V2 = mkV2 (mkV "tool" "tools" "tooled" "tooled" "tooling");
 lin toot_N = mkN "toot" "toots";
 lin toot_V = mkV "toot" "toots" "tooted" "tooted" "tooting";
 lin toot_V2 = mkV2 (mkV "toot" "toots" "tooted" "tooted" "tooting");
-lin tooth_N = mkN "tooth" "teeth" {- FIXME: guessed plural form -};
+lin tooth_N = mkN "tooth" "teeth";
 lin toothache_N = mkN "toothache" ;
 lin toothbrush_N = mkN "toothbrush" "toothbrushes";
 lin toothed_A = compoundA (mkA "toothed");
@@ -42524,7 +42523,7 @@ lin wiry_A = mkA "wiry" "wirier";
 lin wisbech_PN = mkPN "Wisbech";
 lin wisconsin_PN = mkPN "Wisconsin";
 lin wisdom_N = mkN "wisdom" ;
-lin wisdom_tooth_N = mkN "wisdom-tooth" "wisdom-teeth" {- FIXME: guessed plural form -};
+lin wisdom_tooth_N = mkN "wisdom - tooth" "wisdom - teeth";
 lin wise_A = mkA "wise" "wiser";
 lin wise_N = mkN "wise" "IRREG";
 lin wiseacre_N = mkN "wiseacre" "wiseacres";

lib/src/english/DictEngAbs.gf

@@ -13766,7 +13766,6 @@ fun flesh_wound_N : N;
 fun fleshly_A : A;
 fun fleshy_A : A;
 fun fleur_de_lis_N : N;
-fun fleur_de_lys_N : N;
 fun flex_N : N;
 fun flex_V2 : V2;
 fun flexibility_N : N;

lib/src/english/ParseEng.gf

@@ -12,7 +12,7 @@ concrete ParseEng of ParseEngAbs =
   PhraseEng,
   SentenceEng,
   RelativeEng,
-  IdiomEng [VP, Tense, ProgrVP],
+  IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
   ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash],
   DictEng ** 
 open MorphoEng, ResEng, ParadigmsEng, Prelude in {

lib/src/english/ParseEngAbs.gf

@@ -11,7 +11,7 @@ abstract ParseEngAbs =
   Phrase,
   Sentence,
   Relative,
-  Idiom [VP, ProgrVP],
+  Idiom [NP, VP, Cl, ProgrVP, ExistNP],
   Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash],
   DictEngAbs ** {