DictEng to utf8

2 files changed, 281 insertions, 277 deletions

diff --git a/next-lib/src/english/DictEng.gf b/next-lib/src/english/DictEng.gf
index f44daec35..8770b87f6 100644
--- a/next-lib/src/english/DictEng.gf
+++ b/next-lib/src/english/DictEng.gf
@@ -22,6 +22,10 @@
 --# -path=.:src/prelude:src/abstract:src/common:src/english
 
 concrete DictEng of DictEngAbs = CatEng ** open ParadigmsEng, IrregEng in {
+
+flags
+  coding=utf8 ;
+
 lin a_N = mkN "a" "ae" {- FIXME: guessed plural form -};
 lin a_bomb_N = mkN "a-bomb" "a-bombs";
 lin a_fortiori_Adv = mkAdv "a fortiori";
@@ -53,7 +57,7 @@ lin abbey_N = mkN "abbey" "abbeys";
 lin abbot_N = mkN "abbot" "abbots";
 lin abbreviate_V2 = mkV2 (mkV "abbreviate" "abbreviates" "abbreviated" "abbreviated" "abbreviating");
 lin abbreviation_N = mkN "abbreviation" "abbreviations";
-lin abbé_N = mkN "abbé" "abbés";
+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 abdicate_V = mkV "abdicate" "abdicates" "abdicated" "abdicated" "abdicating";
@@ -769,7 +773,7 @@ lin ahmedabad_PN = mkPN "ahmedabad";
 lin aid_N = mkN "aid" "aids";
 lin aid_V2 = mkV2 (mkV "aid" "aids" "aided" "aided" "aiding");
 lin aide_de_camp_N = mkN "aide-de-camp" "IRREG";
-lin aide_mémoire_N = mkN "aide-mémoire" "aide-mémoires";
+lin aide_memoire_N = mkN "aide-mémoire" "aide-mémoires";
 lin aids_N = mkN "aids" "-" {- FIXME: no plural form -};
 lin aigret_N = mkN "aigret" "aigrets";
 lin aigrette_N = mkN "aigrette" "aigrettes";
@@ -1576,8 +1580,8 @@ lin applicable_A = compoundA (mkA "applicable");
 lin applicant_N = mkN "applicant" "applicants";
 lin application_N = mkN "application" "applications";
 lin applied_A = compoundA (mkA "applied");
-lin appliqué_N = mkN "appliqué" "-" {- FIXME: no plural form -};
-lin appliqué_V2 = mkV2 (mkV "appliqué" "appliqués" "appliquéed" "appliquéed" "appliquéing");
+lin applique_N = mkN "appliqué" "-" {- FIXME: no plural form -};
+lin applique_V2 = mkV2 (mkV "appliqué" "appliqués" "appliquéed" "appliquéed" "appliquéing");
 lin apply_V = mkV "apply" "applies" "applied" "applied" "applying";
 lin apply_V2 = mkV2 (mkV "apply" "applies" "applied" "applied" "applying");
 lin appoint_V2 = mkV2 (mkV "appoint" "appoints" "appointed" "appointed" "appointing");
@@ -1633,7 +1637,7 @@ lin april_PN = mkPN "april";
 lin apron_N = mkN "apron" "aprons";
 lin apropos_A = compoundA (mkA "apropos");
 lin apropos_Adv = mkAdv "apropos";
-lin après_ski_A = compoundA (mkA "après-ski");
+lin apres_ski_A = compoundA (mkA "après-ski");
 lin apse_N = mkN "apse" "apses";
 lin apt_A = mkA "apt" "apter";
 lin aptitude_N = mkN "aptitude" "aptitudes";
@@ -1809,7 +1813,7 @@ lin arrester_N = mkN "arrester" "arresters";
 lin arresting_A = compoundA (mkA "arresting");
 lin arrival_N = mkN "arrival" "arrivals";
 lin arrive_V = mkV "arrive" "arrives" "arrived" "arrived" "arriving";
-lin arrière_pensée_N = mkN "arrière pensée" "arrière pensées";
+lin arriere_pensee_N = mkN "arrière pensée" "arrière pensées";
 lin arrogance_N = mkN "arrogance" "-" {- FIXME: no plural form -};
 lin arrogant_A = compoundA (mkA "arrogant");
 lin arrogantly_Adv = mkAdv "arrogantly";
@@ -1864,7 +1868,7 @@ lin arty_crafty_A = compoundA (mkA "arty-crafty");
 lin arum_N = mkN "arum" "arums";
 lin aryan_A = compoundA (mkA "aryan");
 lin aryan_N = mkN "aryan" "aryans";
-lin arête_N = mkN "arête" "arêtes";
+lin arete_N = mkN "arête" "arêtes";
 lin asap_PN = mkPN "asap";
 lin asbestos_N = mkN "asbestos" "-" {- FIXME: no plural form -};
 lin ascend_V = mkV "ascend" "ascends" "ascended" "ascended" "ascending";
@@ -2106,7 +2110,7 @@ lin atrophy_V2 = mkV2 (mkV "atrophy" "atrophies" "atrophied" "atrophied" "atroph
 lin attach_V = mkV "attach" "attaches" "attached" "attached" "attaching";
 lin attach_V2 = mkV2 (mkV "attach" "attaches" "attached" "attached" "attaching");
 lin attachment_N = mkN "attachment" "attachments";
-lin attaché_N = mkN "attaché" "attachés";
+lin attache_N = mkN "attaché" "attachés";
 lin attack_N = mkN "attack" "attacks";
 lin attack_V2 = mkV2 (mkV "attack" "attacks" "attacked" "attacked" "attacking");
 lin attacker_N = mkN "attacker" "attackers";
@@ -2240,7 +2244,7 @@ lin autism_N = mkN "autism" "-" {- FIXME: no plural form -};
 lin autistic_A = compoundA (mkA "autistic");
 lin auto_N = mkN "auto" "autos";
 lin auto_changer_N = mkN "auto-changer" "auto-changers";
-lin auto_da_fé_N = mkN "auto-da-fé" "IRREG";
+lin auto_da_fe_N = mkN "auto-da-fé" "IRREG";
 lin autobahn_N = mkN "autobahn" "autobahns";
 lin autobiographic_A = compoundA (mkA "autobiographic");
 lin autobiographical_A = compoundA (mkA "autobiographical");
@@ -3619,7 +3623,7 @@ lin blast_V2 = mkV2 (mkV "blast" "blasts" "blasted" "blasted" "blasting");
 lin blast_furnace_N = mkN "blast-furnace" "blast-furnaces";
 lin blast_off_N = mkN "blast-off" "blast-offs";
 lin blasted_A = compoundA (mkA "blasted");
-lin blasé_A = compoundA (mkA "blasé");
+lin blase_A = compoundA (mkA "blasé");
 lin blatant_A = compoundA (mkA "blatant");
 lin blatantly_Adv = mkAdv "blatantly";
 lin blather_N = mkN "blather" "blathers";
@@ -4245,8 +4249,8 @@ lin brasilia_PN = mkPN "brasilia";
 lin brass_N = mkN "brass" "brasses";
 lin brassard_N = mkN "brassard" "brassards";
 lin brasserie_N = mkN "brasserie" "brasseries";
-lin brassiere_N = mkN "brassiere" "brassieres";
-lin brassière_N = mkN "brassière" "brassières";
+lin brassiere_1_N = mkN "brassiere" "brassieres";
+lin brassiere_2_N = mkN "brassière" "brassières";
 lin brassy_A = mkA "brassy" "brassier";
 lin brat_N = mkN "brat" "brats";
 lin bratislava_PN = mkPN "bratislava";
@@ -4895,7 +4899,7 @@ lin byroad_N = mkN "byroad" "byroads";
 lin bystander_N = mkN "bystander" "bystanders";
 lin byway_N = mkN "byway" "byways";
 lin byword_N = mkN "byword" "bywords";
-lin bête_noire_N = mkN "bête noire" "IRREG";
+lin bete_noire_N = mkN "bête noire" "IRREG";
 lin c_N = mkN "c" "IRREG";
 lin c_in_c_PN = mkPN "c-in-c";
 lin c_of_e_N = mkN "c of e" "-" {- FIXME: no plural form -};
@@ -4962,7 +4966,7 @@ lin cafeteria_N = mkN "cafeteria" "cafeterias";
 lin caff_N = mkN "caff" "caffs";
 lin caffeine_N = mkN "caffeine" "-" {- FIXME: no plural form -};
 lin caftan_N = mkN "caftan" "caftans";
-lin café_N = mkN "café" "cafés";
+lin cafe_N = mkN "café" "cafés";
 lin cage_N = mkN "cage" "cages";
 lin cage_V2 = mkV2 (mkV "cage" "cages" "caged" "caged" "caging");
 lin cagey_A = compoundA (mkA "cagey");
@@ -5113,7 +5117,7 @@ lin canadian_N = mkN "canadian" "canadians";
 lin canal_N = mkN "canal" "canals";
 lin canalization_N = mkN "canalization" "canalizations";
 lin canalize_V2 = mkV2 (mkV "canalize" "canalizes" "canalized" "canalized" "canalizing");
-lin canapé_N = mkN "canapé" "canapés";
+lin canape_N = mkN "canapé" "canapés";
 lin canard_N = mkN "canard" "canards";
 lin canary_N = mkN "canary" "canaries";
 lin canary_bird_N = mkN "canary-bird" "canary-birds";
@@ -5169,7 +5173,7 @@ lin canny_A = mkA "canny" "cannier";
 lin canoe_N = mkN "canoe" "canoes";
 lin canoe_V2 = mkV2 (mkV "canoe" "IRREG" "IRREG" "IRREG" "IRREG");
 lin canoeist_N = mkN "canoeist" "canoeists";
-lin canon_N = mkN "canon" "canons";
+lin canon_1_N = mkN "canon" "canons";
 lin canonical_A = compoundA (mkA "canonical");
 lin canonization_N = mkN "canonization" "canonizations";
 lin canonize_V2 = mkV2 (mkV "canonize" "canonizes" "canonized" "canonized" "canonizing");
@@ -5206,7 +5210,7 @@ lin canvey_island_PN = mkPN "canvey island";
 lin canyon_N = mkN "canyon" "canyons";
 lin cap_N = mkN "cap" "caps";
 lin cap_V2 = mkV2 (mkV "cap" "caps" "capped" "capped" "capping");
-lin cap_à_pie_Adv = mkAdv "cap-à-pie";
+lin cap_a_pie_Adv = mkAdv "cap-à-pie";
 lin capability_N = mkN "capability" "capabilities";
 lin capable_A = compoundA (mkA "capable");
 lin capably_Adv = mkAdv "capably";
@@ -5598,7 +5602,7 @@ lin caw_V2 = mkV2 (mkV "caw" "caws" "cawed" "cawed" "cawing");
 lin cayenne_N = mkN "cayenne" "-" {- FIXME: no plural form -};
 lin cayenne_pepper_N = mkN "cayenne pepper" "-" {- FIXME: no plural form -};
 lin cayman_N = mkN "cayman" "caymans";
-lin cañon_N = mkN "cañon" "cañons";
+lin canon_2_N = mkN "cañon" "cañons";
 lin cbi_N = mkN "cbi" "-" {- FIXME: no plural form -};
 lin cc_N = mkN "cc" "cc";
 lin cd_N = mkN "cd" "-" {- FIXME: no plural form -};
@@ -5824,7 +5828,7 @@ lin chapterhouse_N = mkN "chapterhouse" "chapterhouses";
 lin char_N = mkN "char" "chars";
 lin char_V = mkV "char" "chars" "charred" "charred" "charring";
 lin char_V2 = mkV2 (mkV "char" "chars" "charred" "charred" "charring");
-lin charabanc_N = mkN "charabanc" "charabancs";
+lin charabanc_1_N = mkN "charabanc" "charabancs";
 lin character_N = mkN "character" "characters";
 lin characteristic_A = compoundA (mkA "characteristic");
 lin characteristic_N = mkN "characteristic" "characteristics";
@@ -5844,7 +5848,7 @@ lin charge_account_N = mkN "charge-account" "charge-accounts";
 lin charge_sheet_N = mkN "charge-sheet" "charge-sheets";
 lin chargeable_A = compoundA (mkA "chargeable");
 lin charger_N = mkN "charger" "chargers";
-lin chargé_d'affaires_N = mkN "chargé d'affaires" "IRREG";
+lin charge_d'affaires_N = mkN "chargé d'affaires" "IRREG";
 lin charily_Adv = mkAdv "charily";
 lin chariot_N = mkN "chariot" "chariots";
 lin charioteer_N = mkN "charioteer" "charioteers";
@@ -5879,7 +5883,7 @@ lin chartreuse_N = mkN "chartreuse" "-" {- FIXME: no plural form -};
 lin charwoman_N = mkN "charwoman" "charwomen" {- FIXME: guessed plural form -};
 lin chary_A = compoundA (mkA "chary");
 lin charybdis_PN = mkPN "charybdis";
-lin charàbanc_N = mkN "charàbanc" "charàbancs";
+lin charabanc_2_N = mkN "charàbanc" "charàbancs";
 lin chas_PN = mkPN "chas";
 lin chase_N = mkN "chase" "chases";
 lin chase_V = mkV "chase" "chases" "chased" "chased" "chasing";
@@ -6245,7 +6249,7 @@ lin churn_V = mkV "churn" "churns" "churned" "churned" "churning";
 lin churn_V2 = mkV2 (mkV "churn" "churns" "churned" "churned" "churning");
 lin chute_N = mkN "chute" "chutes";
 lin chutney_N = mkN "chutney" "chutneys";
-lin château_N = mkN "château" "châteaux" {- FIXME: guessed plural form -};
+lin chateau_N = mkN "château" "châteaux" {- FIXME: guessed plural form -};
 lin cia_N = mkN "cia" "-" {- FIXME: no plural form -};
 lin cicada_N = mkN "cicada" "cicadas";
 lin cicala_N = mkN "cicala" "cicalas";
@@ -6507,7 +6511,7 @@ lin cleverly_Adv = mkAdv "cleverly";
 lin cleverness_N = mkN "cleverness" "-" {- FIXME: no plural form -};
 lin clew_N = mkN "clew" "clews";
 lin clew_V2 = mkV2 (mkV "clew" "clews" "clewed" "clewed" "clewing");
-lin cliché_N = mkN "cliché" "clichés";
+lin cliche_N = mkN "cliché" "clichés";
 lin click_N = mkN "click" "clicks";
 lin click_V = mkV "click" "clicks" "clicked" "clicked" "clicking";
 lin client_N = mkN "client" "clients";
@@ -6578,7 +6582,7 @@ lin clog_V = mkV "clog" "clogs" "clogged" "clogged" "clogging";
 lin clog_V2 = mkV2 (mkV "clog" "clogs" "clogged" "clogged" "clogging");
 lin clog_dance_N = mkN "clog-dance" "clog-dances";
 lin cloggy_A = mkA "cloggy" "cloggier";
-lin cloisonné_N = mkN "cloisonné" "-" {- FIXME: no plural form -};
+lin cloisonne_N = mkN "cloisonné" "-" {- FIXME: no plural form -};
 lin cloister_N = mkN "cloister" "cloisters";
 lin cloister_V2 = mkV2 (mkV "cloister" "cloisters" "cloistered" "cloistered" "cloistering");
 lin clone_N = mkN "clone" "clones";
@@ -7084,7 +7088,7 @@ lin communicate_V2 = mkV2 (mkV "communicate" "communicates" "communicated" "comm
 lin communication_N = mkN "communication" "communications";
 lin communicative_A = compoundA (mkA "communicative");
 lin communion_N = mkN "communion" "communions";
-lin communiqué_N = mkN "communiqué" "communiqués";
+lin communique_N = mkN "communiqué" "communiqués";
 lin communism_N = mkN "communism" "-" {- FIXME: no plural form -};
 lin communist_A = compoundA (mkA "communist");
 lin communist_N = mkN "communist" "communists";
@@ -7229,8 +7233,8 @@ lin compute_V = mkV "compute" "computes" "computed" "computed" "computing";
 lin compute_V2 = mkV2 (mkV "compute" "computes" "computed" "computed" "computing");
 lin computer_N = mkN "computer" "computers";
 lin computerize_V2 = mkV2 (mkV "computerize" "computerizes" "computerized" "computerized" "computerizing");
-lin compère_N = mkN "compère" "compères";
-lin compère_V2 = mkV2 (mkV "compère" "compères" "compèred" "compèred" "compèring");
+lin compere_N = mkN "compère" "compères";
+lin compere_V2 = mkV2 (mkV "compère" "compères" "compèred" "compèred" "compèring");
 lin comrade_N = mkN "comrade" "comrades";
 lin comradely_Adv = mkAdv "comradely";
 lin comradeship_N = mkN "comradeship" "comradeships";
@@ -7413,7 +7417,7 @@ lin confounded_A = compoundA (mkA "confounded");
 lin confoundedly_Adv = mkAdv "confoundedly";
 lin confront_V2 = mkV2 (mkV "confront" "confronts" "confronted" "confronted" "confronting");
 lin confrontation_N = mkN "confrontation" "confrontations";
-lin confrère_N = mkN "confrère" "confrères";
+lin confrere_N = mkN "confrère" "confrères";
 lin confucian_A = compoundA (mkA "confucian");
 lin confucian_N = mkN "confucian" "confucians";
 lin confuse_V2 = mkV2 (mkV "confuse" "confuses" "confused" "confused" "confusing");
@@ -7452,7 +7456,7 @@ lin congressman_N = mkN "congressman" "congressmen" {- FIXME: guessed plural for
 lin congresswoman_N = mkN "congresswoman" "congresswomen" {- FIXME: guessed plural form -};
 lin congruent_A = compoundA (mkA "congruent");
 lin congruous_A = compoundA (mkA "congruous");
-lin congé_N = mkN "congé" "congés";
+lin conge_N = mkN "congé" "congés";
 lin conic_A = compoundA (mkA "conic");
 lin conical_A = compoundA (mkA "conical");
 lin conifer_N = mkN "conifer" "conifers";
@@ -7565,7 +7569,7 @@ lin console_V2 = mkV2 (mkV "console" "consoles" "consoled" "consoled" "consoling
 lin consolidate_V = mkV "consolidate" "consolidates" "consolidated" "consolidated" "consolidating";
 lin consolidate_V2 = mkV2 (mkV "consolidate" "consolidates" "consolidated" "consolidated" "consolidating");
 lin consolidation_N = mkN "consolidation" "consolidations";
-lin consommé_N = mkN "consommé" "consommés";
+lin consomme_N = mkN "consommé" "consommés";
 lin consonance_N = mkN "consonance" "-" {- FIXME: no plural form -};
 lin consonant_A = compoundA (mkA "consonant");
 lin consonant_N = mkN "consonant" "consonants";
@@ -8062,17 +8066,17 @@ lin corselet_N = mkN "corselet" "corselets";
 lin corset_N = mkN "corset" "corsets";
 lin corsham_PN = mkPN "corsham";
 lin corslet_N = mkN "corslet" "corslets";
-lin cortege_N = mkN "cortege" "corteges";
+lin cortege_1_N = mkN "cortege" "corteges";
 lin cortex_N = mkN "cortex" "cortices" {- FIXME: guessed plural form -};
 lin cortical_A = compoundA (mkA "cortical");
 lin cortisone_N = mkN "cortisone" "-" {- FIXME: no plural form -};
-lin cortège_N = mkN "cortège" "cortèges";
+lin cortege_2_N = mkN "cortège" "cortèges";
 lin corundum_N = mkN "corundum" "-" {- FIXME: no plural form -};
 lin corunna_PN = mkPN "corunna";
 lin coruscate_V = mkV "coruscate" "coruscates" "coruscated" "coruscated" "coruscating";
 lin coruscation_N = mkN "coruscation" "coruscations";
 lin corvette_N = mkN "corvette" "corvettes";
-lin corvée_N = mkN "corvée" "corvées";
+lin corvee_N = mkN "corvée" "corvées";
 lin cos_N = mkN "cos" "cos";
 lin cosenza_PN = mkPN "cosenza";
 lin cosh_N = mkN "cosh" "coshes";
@@ -8216,7 +8220,7 @@ lin couple_V2 = mkV2 (mkV "couple" "couples" "coupled" "coupled" "coupling");
 lin couplet_N = mkN "couplet" "couplets";
 lin coupling_N = mkN "coupling" "couplings";
 lin coupon_N = mkN "coupon" "coupons";
-lin coupé_N = mkN "coupé" "coupés";
+lin coupe_N = mkN "coupé" "coupés";
 lin courage_N = mkN "courage" "-" {- FIXME: no plural form -};
 lin courageous_A = compoundA (mkA "courageous");
 lin courageously_Adv = mkAdv "courageously";
@@ -8446,7 +8450,7 @@ lin crenellated_A = compoundA (mkA "crenellated");
 lin creole_A = compoundA (mkA "creole");
 lin creole_N = mkN "creole" "creoles";
 lin creosote_N = mkN "creosote" "-" {- FIXME: no plural form -};
-lin crepe_N = mkN "crepe" "-" {- FIXME: no plural form -};
+lin crepe_1_N = mkN "crepe" "-" {- FIXME: no plural form -};
 lin crepitate_V = mkV "crepitate" "crepitates" "crepitated" "crepitated" "crepitating";
 lin crepitation_N = mkN "crepitation" "crepitations";
 lin crepuscular_A = compoundA (mkA "crepuscular");
@@ -8698,9 +8702,9 @@ lin crystallization_N = mkN "crystallization" "crystallizations";
 lin crystallize_V = mkV "crystallize" "crystallizes" "crystallized" "crystallized" "crystallizing";
 lin crystallize_V2 = mkV2 (mkV "crystallize" "crystallizes" "crystallized" "crystallized" "crystallizing");
 lin crystallography_N = mkN "crystallography" "-" {- FIXME: no plural form -};
-lin crèche_N = mkN "crèche" "crèches";
-lin crème_de_menthe_N = mkN "crème de menthe" "-" {- FIXME: no plural form -};
-lin crêpe_N = mkN "crêpe" "-" {- FIXME: no plural form -};
+lin creche_N = mkN "crèche" "crèches";
+lin creme_de_menthe_N = mkN "crème de menthe" "-" {- FIXME: no plural form -};
+lin crepe_2_N = mkN "crêpe" "-" {- FIXME: no plural form -};
 lin cub_N = mkN "cub" "cubs";
 lin cuba_PN = mkPN "cuba";
 lin cuban_A = compoundA (mkA "cuban");
@@ -8796,14 +8800,14 @@ lin curacy_N = mkN "curacy" "curacies";
 lin curate_N = mkN "curate" "curates";
 lin curative_A = compoundA (mkA "curative");
 lin curator_N = mkN "curator" "curators";
-lin curaçao_N = mkN "curaçao" "-" {- FIXME: no plural form -};
-lin curaçoa_N = mkN "curaçoa" "-" {- FIXME: no plural form -};
+lin curacao_N = mkN "curaçao" "-" {- FIXME: no plural form -};
+lin curacoa_N = mkN "curaçoa" "-" {- FIXME: no plural form -};
 lin curb_N = mkN "curb" "curbs";
 lin curb_V2 = mkV2 (mkV "curb" "curbs" "curbed" "curbed" "curbing");
 lin curd_N = mkN "curd" "curds";
 lin curdle_V = mkV "curdle" "curdles" "curdled" "curdled" "curdling";
 lin curdle_V2 = mkV2 (mkV "curdle" "curdles" "curdled" "curdled" "curdling");
-lin cure_N = mkN "cure" "cures";
+lin cure_1_N = mkN "cure" "cures";
 lin cure_V = mkV "cure" "cures" "cured" "cured" "curing";
 lin cure_V2 = mkV2 (mkV "cure" "cures" "cured" "cured" "curing");
 lin cure_all_N = mkN "cure-all" "cure-alls";
@@ -8861,7 +8865,7 @@ lin curvature_N = mkN "curvature" "-" {- FIXME: no plural form -};
 lin curve_N = mkN "curve" "curves";
 lin curve_V = mkV "curve" "curves" "curved" "curved" "curving";
 lin curve_V2 = mkV2 (mkV "curve" "curves" "curved" "curved" "curving");
-lin curé_N = mkN "curé" "curés";
+lin cure_2_N = mkN "curé" "curés";
 lin cushion_N = mkN "cushion" "cushions";
 lin cushion_V2 = mkV2 (mkV "cushion" "cushions" "cushioned" "cushioned" "cushioning");
 lin cushy_A = mkA "cushy" "cushier";
@@ -9268,13 +9272,13 @@ lin deborah_PN = mkPN "deborah";
 lin debouch_V = mkV "debouch" "debouches" "debouched" "debouched" "debouching";
 lin debouch_V2 = mkV2 (mkV "debouch" "debouches" "debouched" "debouched" "debouching");
 lin debrief_V2 = mkV2 (mkV "debrief" "debriefs" "debriefed" "debriefed" "debriefing");
-lin debris_N = mkN "debris" "-" {- FIXME: no plural form -};
+lin debris_1_N = mkN "debris" "-" {- FIXME: no plural form -};
 lin debt_N = mkN "debt" "debts";
 lin debtor_N = mkN "debtor" "debtors";
 lin debug_V2 = mkV2 (mkV "debug" "debugs" "debugged" "debugged" "debugging");
 lin debunk_V2 = mkV2 (mkV "debunk" "debunks" "debunked" "debunked" "debunking");
-lin debut_N = mkN "debut" "debuts";
-lin debutante_N = mkN "debutante" "debutantes";
+lin debut_1_N = mkN "debut" "debuts";
+lin debutante_1_N = mkN "debutante" "debutantes";
 lin dec_PN = mkPN "dec";
 lin decade_N = mkN "decade" "decades";
 lin decadence_N = mkN "decadence" "-" {- FIXME: no plural form -};
@@ -11507,17 +11511,17 @@ lin dyslexic_A = compoundA (mkA "dyslexic");
 lin dyspepsia_N = mkN "dyspepsia" "-" {- FIXME: no plural form -};
 lin dyspeptic_A = compoundA (mkA "dyspeptic");
 lin dyspeptic_N = mkN "dyspeptic" "dyspeptics";
-lin débris_N = mkN "débris" "-" {- FIXME: no plural form -};
-lin début_N = mkN "début" "débuts";
-lin débutante_N = mkN "débutante" "débutantes";
-lin débâcle_N = mkN "débâcle" "débâcles";
-lin décolleté_A = compoundA (mkA "décolleté");
-lin décor_N = mkN "décor" "IRREG";
-lin démarche_N = mkN "démarche" "démarches";
-lin démodé_A = compoundA (mkA "démodé");
-lin dénouement_N = mkN "dénouement" "dénouements";
-lin déshabillé_N = mkN "déshabillé" "-" {- FIXME: no plural form -};
-lin détente_N = mkN "détente" "-" {- FIXME: no plural form -};
+lin debris_2_N = mkN "débris" "-" {- FIXME: no plural form -};
+lin debut_2_N = mkN "début" "débuts";
+lin debutante_2_N = mkN "débutante" "débutantes";
+lin debacle_N = mkN "débâcle" "débâcles";
+lin decollete_A = compoundA (mkA "décolleté");
+lin decor_N = mkN "décor" "IRREG";
+lin demarche_N = mkN "démarche" "démarches";
+lin demode_A = compoundA (mkA "démodé");
+lin denouement_N = mkN "dénouement" "dénouements";
+lin deshabille_N = mkN "déshabillé" "-" {- FIXME: no plural form -};
+lin detente_N = mkN "détente" "-" {- FIXME: no plural form -};
 lin e'en_Adv = mkAdv "e'en";
 lin e'er_Adv = mkAdv "e'er";
 lin e_N = mkN "e" "IRREG";
@@ -12306,7 +12310,7 @@ lin entrepreneur_N = mkN "entrepreneur" "entrepreneurs";
 lin entrepreneurial_A = compoundA (mkA "entrepreneurial");
 lin entrust_V2 = mkV2 (mkV "entrust" "entrusts" "entrusted" "entrusted" "entrusting");
 lin entry_N = mkN "entry" "entries";
-lin entrée_N = mkN "entrée" "entrées";
+lin entree_N = mkN "entrée" "entrées";
 lin entwine_V2 = mkV2 (mkV "entwine" "entwines" "entwined" "entwined" "entwining");
 lin enumerate_V2 = mkV2 (mkV "enumerate" "enumerates" "enumerated" "enumerated" "enumerating");
 lin enumeration_N = mkN "enumeration" "enumerations";
@@ -12922,7 +12926,7 @@ lin exposition_N = mkN "exposition" "expositions";
 lin expostulate_V = mkV "expostulate" "expostulates" "expostulated" "expostulated" "expostulating";
 lin expostulation_N = mkN "expostulation" "expostulations";
 lin exposure_N = mkN "exposure" "exposures";
-lin exposé_N = mkN "exposé" "exposés";
+lin expose_N = mkN "exposé" "exposés";
 lin expound_V2 = mkV2 (mkV "expound" "expounds" "expounded" "expounded" "expounding");
 lin express_A = compoundA (mkA "express");
 lin express_Adv = mkAdv "express";
@@ -13348,7 +13352,7 @@ lin favouritism_N = mkN "favouritism" "-" {- FIXME: no plural form -};
 lin fawley_PN = mkPN "fawley";
 lin fawn_N = mkN "fawn" "fawns";
 lin fawn_V = mkV "fawn" "fawns" "fawned" "fawned" "fawning";
-lin façade_N = mkN "façade" "façades";
+lin facade_N = mkN "façade" "façades";
 lin fbi_N = mkN "fbi" "-" {- FIXME: no plural form -};
 lin fealty_N = mkN "fealty" "fealties";
 lin fear_N = mkN "fear" "fears";
@@ -13527,8 +13531,8 @@ lin few_A = mkA "few" "fewer";
 lin fewness_N = mkN "fewness" "-" {- FIXME: no plural form -};
 lin fey_A = compoundA (mkA "fey");
 lin fez_N = mkN "fez" "fezes";
-lin fiancé_N = mkN "fiancé" "fiancés";
-lin fiancée_N = mkN "fiancée" "fiancées";
+lin fiance_N = mkN "fiancé" "fiancés";
+lin fiancee_N = mkN "fiancée" "fiancées";
 lin fiasco_N = mkN "fiasco" "fiascos";
 lin fiat_N = mkN "fiat" "fiats";
 lin fib_N = mkN "fib" "fibs";
@@ -14818,7 +14822,7 @@ lin fry_V2 = mkV2 (mkV "fry" "fries" "fried" "fried" "frying");
 lin fry_pan_N = mkN "fry-pan" "fry-pans";
 lin fryer_N = mkN "fryer" "fryers";
 lin frying_pan_N = mkN "frying-pan" "frying-pans";
-lin fräulein_N = mkN "fräulein" "fräuleins";
+lin fraulein_N = mkN "fräulein" "fräuleins";
 lin ft_N = mkN "ft" "ft";
 lin fuchsia_N = mkN "fuchsia" "fuchsias";
 lin fuck_V = mkV "fuck" "fucks" "fucked" "fucked" "fucking";
@@ -14966,9 +14970,9 @@ lin fuze_N = mkN "fuze" "fuzes";
 lin fuzz_N = mkN "fuzz" "-" {- FIXME: no plural form -};
 lin fuzzy_A = mkA "fuzzy" "fuzzier";
 lin fwd_PN = mkPN "fwd";
-lin fête_N = mkN "fête" "fêtes";
-lin fête_V2 = mkV2 (mkV "fête" "fêtes" "fêted" "fêted" "fêting");
-lin führer_N = mkN "führer" "führers";
+lin fete_N = mkN "fête" "fêtes";
+lin fete_V2 = mkV2 (mkV "fête" "fêtes" "fêted" "fêted" "fêting");
+lin fuhrer_N = mkN "führer" "führers";
 lin g_N = mkN "g" "IRREG";
 lin g_man_N = mkN "g-man" "g-men" {- FIXME: guessed plural form -};
 lin gab_N = mkN "gab" "-" {- FIXME: no plural form -};
@@ -15494,7 +15498,7 @@ lin giver_N = mkN "giver" "givers";
 lin gizzard_N = mkN "gizzard" "gizzards";
 lin glacial_A = compoundA (mkA "glacial");
 lin glacier_N = mkN "glacier" "glaciers";
-lin glacé_A = compoundA (mkA "glacé");
+lin glace_A = compoundA (mkA "glacé");
 lin glad_A = mkA "glad" "gladder*";
 lin gladden_V2 = mkV2 (mkV "gladden" "gladdens" "gladdened" "gladdened" "gladdening");
 lin glade_N = mkN "glade" "glades";
@@ -16375,7 +16379,7 @@ lin gyration_N = mkN "gyration" "gyrations";
 lin gyro_N = mkN "gyro" "gyros";
 lin gyroscope_N = mkN "gyroscope" "gyroscopes";
 lin gyroscopic_A = compoundA (mkA "gyroscopic");
-lin gâteau_N = mkN "gâteau" "gâteaus";
+lin gateau_N = mkN "gâteau" "gâteaus";
 lin h'm_V = mkV "h'm" "h'ms" "h'mmed" "h'mmed" "h'mming";
 lin h_N = mkN "h" "IRREG";
 lin h_bomb_N = mkN "h-bomb" "h-bombs";
@@ -16394,7 +16398,7 @@ lin habitually_Adv = mkAdv "habitually";
 lin habituate_V2 = mkV2 (mkV "habituate" "habituates" "habituated" "habituated" "habituating");
 lin habituation_N = mkN "habituation" "-" {- FIXME: no plural form -};
 lin habitude_N = mkN "habitude" "-" {- FIXME: no plural form -};
-lin habitué_N = mkN "habitué" "habitués";
+lin habitue_N = mkN "habitué" "habitués";
 lin hacienda_N = mkN "hacienda" "haciendas";
 lin hack_N = mkN "hack" "hacks";
 lin hack_V = mkV "hack" "hacks" "hacked" "hacked" "hacking";
@@ -18970,7 +18974,7 @@ lin ingredient_N = mkN "ingredient" "ingredients";
 lin ingress_N = mkN "ingress" "-" {- FIXME: no plural form -};
 lin ingrid_PN = mkPN "ingrid";
 lin ingrowing_A = compoundA (mkA "ingrowing");
-lin ingénue_N = mkN "ingénue" "ingénues";
+lin ingenue_N = mkN "ingénue" "ingénues";
 lin inhabit_V2 = mkV2 (mkV "inhabit" "inhabits" "inhabited" "inhabited" "inhabiting");
 lin inhabitable_A = compoundA (mkA "inhabitable");
 lin inhabitant_N = mkN "inhabitant" "inhabitants";
@@ -20559,7 +20563,7 @@ lin kwacha_N = mkN "kwacha" "kwacha";
 lin kweiyang_PN = mkPN "kweiyang";
 lin kwela_N = mkN "kwela" "-" {- FIXME: no plural form -};
 lin kyoto_PN = mkPN "kyoto";
-lin kümmel_N = mkN "kümmel" "-" {- FIXME: no plural form -};
+lin kummel_N = mkN "kümmel" "-" {- FIXME: no plural form -};
 lin l_N = mkN "l" "IRREG";
 lin l_plate_N = mkN "l-plate" "l-plates";
 lin la_N = mkN "la" "lae" {- FIXME: guessed plural form -};
@@ -20685,7 +20689,7 @@ lin lampoon_V2 = mkV2 (mkV "lampoon" "lampoons" "lampooned" "lampooned" "lampoon
 lin lamppost_N = mkN "lamppost" "lampposts";
 lin lamprey_N = mkN "lamprey" "lampreys";
 lin lampshade_N = mkN "lampshade" "lampshades";
-lin lamé_N = mkN "lamé" "-" {- FIXME: no plural form -};
+lin lame_N = mkN "lamé" "-" {- FIXME: no plural form -};
 lin lanark_PN = mkPN "lanark";
 lin lancashire_PN = mkPN "lancashire";
 lin lancaster_PN = mkPN "lancaster";
@@ -22090,7 +22094,7 @@ lin lyallpur_PN = mkPN "lyallpur";
 lin lyceum_N = mkN "lyceum" "lyceums";
 lin lychee_N = mkN "lychee" "lychees";
 lin lychgate_N = mkN "lychgate" "lychgates";
-lin lycée_N = mkN "lycée" "lycées";
+lin lycee_N = mkN "lycée" "lycées";
 lin lydia_PN = mkPN "lydia";
 lin lydney_PN = mkPN "lydney";
 lin lye_N = mkN "lye" "lyes";
@@ -22743,7 +22747,7 @@ lin matchless_A = compoundA (mkA "matchless");
 lin matchlock_N = mkN "matchlock" "matchlocks";
 lin matchmaker_N = mkN "matchmaker" "matchmakers";
 lin matchwood_N = mkN "matchwood" "-" {- FIXME: no plural form -};
-lin mate_N = mkN "mate" "mates";
+lin mate_1_N = mkN "mate" "mates";
 lin mate_V = mkV "mate" "mates" "mated" "mated" "mating";
 lin mate_V2 = mkV2 (mkV "mate" "mates" "mated" "mated" "mating");
 lin material_A = compoundA (mkA "material");
@@ -22764,7 +22768,7 @@ lin mathematically_Adv = mkAdv "mathematically";
 lin mathematician_N = mkN "mathematician" "mathematicians";
 lin mathematics_N = mkN "mathematics" "mathematics";
 lin maths_N = mkN "maths" "maths";
-lin matinée_N = mkN "matinée" "matinées";
+lin matinee_N = mkN "matinée" "matinées";
 lin matlock_PN = mkPN "matlock";
 lin matriarch_N = mkN "matriarch" "matriarchs";
 lin matriarchal_A = compoundA (mkA "matriarchal");
@@ -22798,7 +22802,7 @@ lin mature_V2 = mkV2 (mkV "mature" "matures" "matured" "matured" "maturing");
 lin maturely_Adv = mkAdv "maturely";
 lin maturity_N = mkN "maturity" "-" {- FIXME: no plural form -};
 lin matutinal_A = compoundA (mkA "matutinal");
-lin maté_N = mkN "maté" "-" {- FIXME: no plural form -};
+lin mate_2_N = mkN "maté" "matés" ;
 lin maud_PN = mkPN "maud";
 lin maudie_PN = mkPN "maudie";
 lin maudlin_A = compoundA (mkA "maudlin");
@@ -23589,7 +23593,7 @@ lin misdemeanour_N = mkN "misdemeanour" "misdemeanours";
 lin misdirect_V2 = mkV2 (mkV "misdirect" "misdirects" "misdirected" "misdirected" "misdirecting");
 lin misdirection_N = mkN "misdirection" "misdirections";
 lin misdoing_N = mkN "misdoing" "misdoings";
-lin mise_en_scène_N = mkN "mise en scène" "-" {- FIXME: no plural form -};
+lin mise_en_scene_N = mkN "mise en scène" "-" {- FIXME: no plural form -};
 lin miser_N = mkN "miser" "misers";
 lin miserable_A = compoundA (mkA "miserable");
 lin miserably_Adv = mkAdv "miserably";
@@ -24408,11 +24412,11 @@ lin mythological_A = compoundA (mkA "mythological");
 lin mythologist_N = mkN "mythologist" "mythologists";
 lin mythology_N = mkN "mythology" "mythologies";
 lin myxomatosis_N = mkN "myxomatosis" "-" {- FIXME: no plural form -};
-lin mélange_N = mkN "mélange" "mélanges";
-lin ménage_N = mkN "ménage" "ménages";
-lin mésalliance_N = mkN "mésalliance" "mésalliances";
-lin métier_N = mkN "métier" "métiers";
-lin mêlée_N = mkN "mêlée" "mêlées";
+lin melange_N = mkN "mélange" "mélanges";
+lin menage_N = mkN "ménage" "ménages";
+lin mesalliance_N = mkN "mésalliance" "mésalliances";
+lin metier_N = mkN "métier" "métiers";
+lin melee_N = mkN "mêlée" "mêlées";
 lin n_N = mkN "n" "IRREG";
 lin naafi_N = mkN "naafi" "-" {- FIXME: no plural form -};
 lin nab_V2 = mkV2 (mkV "nab" "nabs" "nabbed" "nabbed" "nabbing");
@@ -24438,10 +24442,10 @@ lin nainsook_N = mkN "nainsook" "-" {- FIXME: no plural form -};
 lin naira_N = mkN "naira" "nairas";
 lin nairn_PN = mkPN "nairn";
 lin nairobi_PN = mkPN "nairobi";
-lin naive_A = compoundA (mkA "naive");
+lin naive_1_A = compoundA (mkA "naive");
 lin naively_Adv = mkAdv "naively";
 lin naivety_N = mkN "naivety" "naiveties";
-lin naiveté_N = mkN "naiveté" "naivetés";
+lin naivete_N = mkN "naiveté" "naivetés";
 lin naked_A = compoundA (mkA "naked");
 lin nakedly_Adv = mkAdv "nakedly";
 lin nakedness_N = mkN "nakedness" "-" {- FIXME: no plural form -};
@@ -24578,7 +24582,7 @@ lin nay_Adv = mkAdv "nay";
 lin nazi_A = compoundA (mkA "nazi");
 lin nazi_N = mkN "nazi" "nazis";
 lin nazism_N = mkN "nazism" "-" {- FIXME: no plural form -};
-lin naïve_A = compoundA (mkA "naïve");
+lin naive_2_A = compoundA (mkA "naïve");
 lin nb_PN = mkPN "nb";
 lin nco_N = mkN "nco" "-" {- FIXME: no plural form -};
 lin ne'er_Adv = mkAdv "ne'er";
@@ -25317,8 +25321,8 @@ lin nympho_N = mkN "nympho" "nymphos";
 lin nymphomania_N = mkN "nymphomania" "-" {- FIXME: no plural form -};
 lin nymphomaniac_A = compoundA (mkA "nymphomaniac");
 lin nymphomaniac_N = mkN "nymphomaniac" "nymphomaniacs";
-lin née_A = compoundA (mkA "née");
-lin négligé_N = mkN "négligé" "négligés";
+lin nee_A = compoundA (mkA "née");
+lin neglige_N = mkN "négligé" "négligés";
 lin o'er_Adv = mkAdv "o'er";
 lin o_N = mkN "o" "i" {- FIXME: guessed plural form -};
 lin o_level_N = mkN "o-level" "o-levels";
@@ -26092,7 +26096,7 @@ lin outright_A = compoundA (mkA "outright");
 lin outright_Adv = mkAdv "outright";
 lin outrival_V2 = mkV2 (mkV "outrival" "outrivals" "outrivalled" "outrivalled" "outrivalling");
 lin outrun_V2 = mkV2 (mkV "out" IrregEng.run_V);
-lin outré_A = compoundA (mkA "outré");
+lin outre_A = compoundA (mkA "outré");
 lin outsail_V2 = mkV2 (mkV "outsail" "outsails" "outsailed" "outsailed" "outsailing");
 lin outset_N = mkN "outset" "outsets";
 lin outshine_V2 = mkV2 (mkV "out" IrregEng.shine_V);
@@ -26651,7 +26655,7 @@ lin paperless_A = compoundA (mkA "paperless");
 lin papermill_N = mkN "papermill" "papermills";
 lin paperweight_N = mkN "paperweight" "paperweights";
 lin paperwork_N = mkN "paperwork" "-" {- FIXME: no plural form -};
-lin papier_mâché_N = mkN "papier-mâché" "-" {- FIXME: no plural form -};
+lin papier_mache_N = mkN "papier-mâché" "-" {- FIXME: no plural form -};
 lin papist_A = compoundA (mkA "papist");
 lin papist_N = mkN "papist" "papists";
 lin papoose_N = mkN "papoose" "papooses";
@@ -26876,8 +26880,8 @@ lin passkey_N = mkN "passkey" "passkeys";
 lin passover_N = mkN "passover" "passovers";
 lin passport_N = mkN "passport" "passports";
 lin password_N = mkN "password" "passwords";
-lin passé_A = compoundA (mkA "passé");
-lin passée_A = compoundA (mkA "passée");
+lin passe_A = compoundA (mkA "passé");
+lin passee_A = compoundA (mkA "passée");
 lin past_A = compoundA (mkA "past");
 lin past_Adv = mkAdv "past";
 lin past_N = mkN "past" "pasts";
@@ -26919,7 +26923,7 @@ lin patchiness_N = mkN "patchiness" "-" {- FIXME: no plural form -};
 lin patchouli_N = mkN "patchouli" "-" {- FIXME: no plural form -};
 lin patchwork_N = mkN "patchwork" "-" {- FIXME: no plural form -};
 lin patchy_A = mkA "patchy" "patchier";
-lin pate_N = mkN "pate" "pates";
+lin pate_1_N = mkN "pate" "pates";
 lin pate_de_foie_gras_N = mkN "pate de foie gras" "-" {- FIXME: no plural form -};
 lin patella_N = mkN "patella" "patellas";
 lin patent_A = compoundA (mkA "patent");
@@ -27811,7 +27815,7 @@ lin piecemeal_A = compoundA (mkA "piecemeal");
 lin piecemeal_Adv = mkAdv "piecemeal";
 lin piecework_N = mkN "piecework" "-" {- FIXME: no plural form -};
 lin pied_A = compoundA (mkA "pied");
-lin pied_à_terre_N = mkN "pied-à-terre" "pied-à-terres";
+lin pied_a_terre_N = mkN "pied-à-terre" "pied-à-terres";
 lin pier_N = mkN "pier" "piers";
 lin pier_glass_N = mkN "pier-glass" "pier-glasses";
 lin pierce_V = mkV "pierce" "pierces" "pierced" "pierced" "piercing";
@@ -27820,7 +27824,7 @@ lin piercing_A = compoundA (mkA "piercing");
 lin piercingly_Adv = mkAdv "piercingly";
 lin pierrot_N = mkN "pierrot" "pierrots";
 lin piety_N = mkN "piety" "pieties";
-lin pietà_N = mkN "pietà" "pietàs";
+lin pieta_N = mkN "pietà" "pietàs";
 lin piffle_N = mkN "piffle" "-" {- FIXME: no plural form -};
 lin piffle_V = mkV "piffle" "piffles" "piffled" "piffled" "piffling";
 lin piffling_A = compoundA (mkA "piffling");
@@ -28602,7 +28606,7 @@ lin portable_A = compoundA (mkA "portable");
 lin portage_N = mkN "portage" "portages";
 lin portal_N = mkN "portal" "portals";
 lin portcullis_N = mkN "portcullis" "portcullises";
-lin porte_cochère_N = mkN "porte-cochère" "porte-cochères";
+lin porte_cochere_N = mkN "porte-cochère" "porte-cochères";
 lin portend_V2 = mkV2 (mkV "portend" "portends" "portended" "portended" "portending");
 lin portent_N = mkN "portent" "portents";
 lin portentous_A = compoundA (mkA "portentous");
@@ -28618,7 +28622,7 @@ lin portico_N = mkN "portico" "porticos";
 lin portion_N = mkN "portion" "portions";
 lin portion_V2 = mkV2 (mkV "portion" "portions" "portioned" "portioned" "portioning");
 lin portishead_PN = mkPN "portishead";
-lin portière_N = mkN "portière" "portières";
+lin portiere_N = mkN "portière" "portières";
 lin portland_PN = mkPN "portland";
 lin portly_A = compoundA (mkA "portly");
 lin portmanteau_N = mkN "portmanteau" "portmanteaus";
@@ -29006,7 +29010,7 @@ lin premise_V2 = mkV2 (mkV "premise" "premises" "premised" "premised" "premising
 lin premiss_N = mkN "premiss" "premisses";
 lin premiss_V2 = mkV2 (mkV "premiss" "premisses" "premissed" "premissed" "premissing");
 lin premium_N = mkN "premium" "premiums";
-lin première_N = mkN "première" "premières";
+lin premiere_N = mkN "première" "premières";
 lin premonition_N = mkN "premonition" "premonitions";
 lin premonitory_A = compoundA (mkA "premonitory");
 lin prenatal_A = compoundA (mkA "prenatal");
@@ -29635,8 +29639,8 @@ lin protrusion_N = mkN "protrusion" "protrusions";
 lin protrusive_A = compoundA (mkA "protrusive");
 lin protuberance_N = mkN "protuberance" "protuberances";
 lin protuberant_A = compoundA (mkA "protuberant");
-lin protégé_N = mkN "protégé" "protégés";
-lin protégée_N = mkN "protégée" "protégées";
+lin protege_N = mkN "protégé" "protégés";
+lin protegee_N = mkN "protégée" "protégées";
 lin proud_A = mkA "proud" "prouder";
 lin proudly_Adv = mkAdv "proudly";
 lin provable_A = compoundA (mkA "provable");
@@ -29712,8 +29716,8 @@ lin prussic_A = compoundA (mkA "prussic");
 lin pry_V = mkV "pry" "pries" "pried" "pried" "prying";
 lin pry_V2 = mkV2 (mkV "pry" "pries" "pried" "pried" "prying");
 lin pryingly_Adv = mkAdv "pryingly";
-lin précis_N = mkN "précis" "précis";
-lin précis_V2 = mkV2 (mkV "précis" "IRREG" "IRREG" "IRREG" "IRREG");
+lin precis_N = mkN "précis" "précis";
+lin precis_V2 = mkV2 (mkV "précis" "IRREG" "IRREG" "IRREG" "IRREG");
 lin psalm_N = mkN "psalm" "psalms";
 lin psalmist_N = mkN "psalmist" "psalmists";
 lin psalmody_N = mkN "psalmody" "psalmodies";
@@ -29972,7 +29976,7 @@ lin purvey_V2 = mkV2 (mkV "purvey" "purveys" "purveyed" "purveyed" "purveying");
 lin purveyance_N = mkN "purveyance" "purveyances";
 lin purveyor_N = mkN "purveyor" "purveyors";
 lin purview_N = mkN "purview" "purviews";
-lin purée_N = mkN "purée" "purées";
+lin puree_N = mkN "purée" "purées";
 lin pus_N = mkN "pus" "-" {- FIXME: no plural form -};
 lin pusan_PN = mkPN "pusan";
 lin push_N = mkN "push" "pushes";
@@ -30035,7 +30039,7 @@ lin pyrotechnic_A = compoundA (mkA "pyrotechnic");
 lin pyrrhic_A = compoundA (mkA "pyrrhic");
 lin python_N = mkN "python" "pythons";
 lin pyx_N = mkN "pyx" "pyxes";
-lin pâté_N = mkN "pâté" "pâtés";
+lin pate_2_N = mkN "pâté" "pâtés";
 lin q_N = mkN "q" "IRREG";
 lin qatar_PN = mkPN "qatar";
 lin qatari_A = compoundA (mkA "qatari");
@@ -30418,7 +30422,7 @@ lin raise_N = mkN "raise" "raises";
 lin raise_V2 = mkV2 (mkV "raise" "raises" "raised" "raised" "raising");
 lin raiser_N = mkN "raiser" "raisers";
 lin raisin_N = mkN "raisin" "raisins";
-lin raison_d'être_N = mkN "raison d'être" "IRREG";
+lin raison_d'etre_N = mkN "raison d'être" "IRREG";
 lin raj_N = mkN "raj" "IRREG";
 lin rajah_N = mkN "rajah" "rajahs";
 lin rake_N = mkN "rake" "rakes";
@@ -30796,7 +30800,7 @@ lin recession_N = mkN "recession" "recessions";
 lin recessional_A = compoundA (mkA "recessional");
 lin recessional_N = mkN "recessional" "recessionals";
 lin recessive_A = compoundA (mkA "recessive");
-lin recherché_A = compoundA (mkA "recherché");
+lin recherche_A = compoundA (mkA "recherché");
 lin recidivism_N = mkN "recidivism" "-" {- FIXME: no plural form -};
 lin recidivist_N = mkN "recidivist" "recidivists";
 lin recife_PN = mkPN "recife";
@@ -31082,7 +31086,7 @@ lin regent_A = compoundA (mkA "regent");
 lin regent_N = mkN "regent" "regents";
 lin reggae_N = mkN "reggae" "-" {- FIXME: no plural form -};
 lin regicide_N = mkN "regicide" "regicides";
-lin regime_N = mkN "regime" "regimes";
+lin regime_1_N = mkN "regime" "regimes";
 lin regimen_N = mkN "regimen" "regimens";
 lin regiment_N = mkN "regiment" "regiments";
 lin regiment_V2 = mkV2 (mkV "regiment" "regiments" "regimented" "regimented" "regimenting");
@@ -31734,7 +31738,7 @@ lin retrospect_N = mkN "retrospect" "-" {- FIXME: no plural form -};
 lin retrospection_N = mkN "retrospection" "retrospections";
 lin retrospective_A = compoundA (mkA "retrospective");
 lin retrospectively_Adv = mkAdv "retrospectively";
-lin retroussé_A = compoundA (mkA "retroussé");
+lin retrousse_A = compoundA (mkA "retroussé");
 lin retroversion_N = mkN "retroversion" "retroversions";
 lin retsina_N = mkN "retsina" "-" {- FIXME: no plural form -};
 lin return_N = mkN "return" "returns";
@@ -32055,7 +32059,7 @@ lin riskily_Adv = mkAdv "riskily";
 lin riskiness_N = mkN "riskiness" "-" {- FIXME: no plural form -};
 lin risky_A = mkA "risky" "riskier";
 lin risotto_N = mkN "risotto" "risottos";
-lin risqué_A = compoundA (mkA "risqué");
+lin risque_A = compoundA (mkA "risqué");
 lin rissole_N = mkN "rissole" "rissoles";
 lin rita_PN = mkPN "rita";
 lin rite_N = mkN "rite" "rites";
@@ -32172,7 +32176,7 @@ lin roguish_A = compoundA (mkA "roguish");
 lin roguishly_Adv = mkAdv "roguishly";
 lin roguishness_N = mkN "roguishness" "-" {- FIXME: no plural form -};
 lin roisterer_N = mkN "roisterer" "roisterers";
-lin role_N = mkN "role" "roles";
+lin role_1_N = mkN "role" "roles";
 lin roll_N = mkN "roll" "rolls";
 lin roll_V = mkV "roll" "rolls" "rolled" "rolled" "rolling";
 lin roll_V2 = mkV2 (mkV "roll" "rolls" "rolled" "rolled" "rolling");
@@ -32382,7 +32386,7 @@ lin route_V2 = mkV2 (mkV "route" "routes" "routed" "routed" "routing");
 lin routemarch_N = mkN "routemarch" "routemarches";
 lin routine_A = compoundA (mkA "routine");
 lin routine_N = mkN "routine" "routines";
-lin roué_N = mkN "roué" "roués";
+lin roue_N = mkN "roué" "roués";
 lin rove_V = mkV "rove" "roves" "roved" "roved" "roving";
 lin rove_V2 = mkV2 (mkV "rove" "roves" "roved" "roved" "roving");
 lin rover_N = mkN "rover" "rovers";
@@ -32590,11 +32594,11 @@ lin ryde_PN = mkPN "ryde";
 lin rye_N = mkN "rye" "-" {- FIXME: no plural form -};
 lin rye_bread_N = mkN "rye-bread" "-" {- FIXME: no plural form -};
 lin ryehill_PN = mkPN "ryehill";
-lin réchauffé_N = mkN "réchauffé" "réchauffés";
-lin régime_N = mkN "régime" "régimes";
-lin résumé_N = mkN "résumé" "résumés";
-lin rôle_N = mkN "rôle" "rôles";
-lin röntgen_N = mkN "röntgen" "röntgens";
+lin rechauffe_N = mkN "réchauffé" "réchauffés";
+lin regime_2_N = mkN "régime" "régimes";
+lin resume_N = mkN "résumé" "résumés";
+lin role_2_N = mkN "rôle" "rôles";
+lin rontgen_N = mkN "röntgen" "röntgens";
 lin s_N = mkN "s" "IRREG";
 lin saarbrucken_PN = mkPN "saarbrucken";
 lin sabadeli_PN = mkPN "sabadeli";
@@ -32720,9 +32724,9 @@ lin sainthood_N = mkN "sainthood" "-" {- FIXME: no plural form -};
 lin saintlike_A = compoundA (mkA "saintlike");
 lin saintliness_N = mkN "saintliness" "-" {- FIXME: no plural form -};
 lin saintly_A = mkA "saintly" "saintlier";
-lin sake_N = mkN "sake" "sakes";
-lin saké_N = mkN "saké" "-" {- FIXME: no plural form -};
-lin sal_volatile_N = mkN "sal volatile" "-" {- FIXME: no plural form -};
+lin sake_1_N = mkN "sake" "sakes";
+lin sake_2_N = mkN "saké" "sakés" ;
+lin sal_volatile_N = mkN "sal volatile" "sal volatiles" ;
 lin salaam_N = mkN "salaam" "salaams";
 lin salaam_V = mkV "salaam" "salaams" "salaamed" "salaamed" "salaaming";
 lin salable_A = compoundA (mkA "salable");
@@ -32986,8 +32990,8 @@ lin sausage_N = mkN "sausage" "sausages";
 lin sausage_dog_N = mkN "sausage-dog" "sausage-dogs";
 lin sausage_meat_N = mkN "sausage-meat" "-" {- FIXME: no plural form -};
 lin sausage_roll_N = mkN "sausage-roll" "sausage-rolls";
-lin sauté_A = compoundA (mkA "sauté");
-lin sauté_V2 = mkV2 (mkV "sauté" "sautés" "sautéed" "sautéed" "sautéing");
+lin saute_A = compoundA (mkA "sauté");
+lin saute_V2 = mkV2 (mkV "sauté" "sautés" "sautéed" "sautéed" "sautéing");
 lin savage_A = compoundA (mkA "savage");
 lin savage_N = mkN "savage" "savages";
 lin savage_V2 = mkV2 (mkV "savage" "savages" "savaged" "savaged" "savaging");
@@ -34008,7 +34012,7 @@ lin sexy_A = mkA "sexy" "sexier";
 lin seychelles_PN = mkPN "seychelles";
 lin seychellois_A = compoundA (mkA "seychellois");
 lin seychellois_N = mkN "seychellois" "seychellois";
-lin señor_N = mkN "señor" "IRREG";
+lin senor_N = mkN "señor" "IRREG";
 lin sgd_PN = mkPN "sgd";
 lin sgt_PN = mkPN "sgt";
 lin shabbily_Adv = mkAdv "shabbily";
@@ -35557,12 +35561,12 @@ lin soggy_A = mkA "soggy" "soggier";
 lin soh_N = mkN "soh" "IRREG";
 lin soho_PN = mkPN "soho";
 lin soignee_A = compoundA (mkA "soignee");
-lin soigné_A = compoundA (mkA "soigné");
+lin soigne_A = compoundA (mkA "soigné");
 lin soil_N = mkN "soil" "soils";
 lin soil_V = mkV "soil" "soils" "soiled" "soiled" "soiling";
 lin soil_V2 = mkV2 (mkV "soil" "soils" "soiled" "soiled" "soiling");
 lin soil_pipe_N = mkN "soil-pipe" "soil-pipes";
-lin soirée_N = mkN "soirée" "soirées";
+lin soiree_N = mkN "soirée" "soirées";
 lin sojourn_N = mkN "sojourn" "sojourns";
 lin sojourn_V = mkV "sojourn" "sojourns" "sojourned" "sojourned" "sojourning";
 lin sojourner_N = mkN "sojourner" "sojourners";
@@ -35752,7 +35756,7 @@ lin sou'_wester_N = mkN "sou'-wester" "sou'-westers";
 lin sou_N = mkN "sou" "sous";
 lin soubrette_N = mkN "soubrette" "soubrettes";
 lin soubriquet_N = mkN "soubriquet" "soubriquets";
-lin soufflé_N = mkN "soufflé" "soufflés";
+lin souffle_N = mkN "soufflé" "soufflés";
 lin sough_V = mkV "sough" "soughs" "soughed" "soughed" "soughing";
 lin soul_N = mkN "soul" "souls";
 lin soul_destroying_A = compoundA (mkA "soul-destroying");
@@ -35781,7 +35785,7 @@ lin soundtrack_N = mkN "soundtrack" "soundtracks";
 lin soup_N = mkN "soup" "soups";
 lin soup_V2 = mkV2 (mkV "soup" "soups" "souped" "souped" "souping");
 lin soup_kitchen_N = mkN "soup-kitchen" "soup-kitchens";
-lin soupçon_N = mkN "soupçon" "soupçons";
+lin soupcon_N = mkN "soupçon" "soupçons";
 lin sour_A = compoundA (mkA "sour");
 lin sour_V = mkV "sour" "sours" "soured" "soured" "souring";
 lin sour_V2 = mkV2 (mkV "sour" "sours" "soured" "soured" "souring");
@@ -38086,7 +38090,7 @@ lin systematically_Adv = mkAdv "systematically";
 lin systematization_N = mkN "systematization" "-" {- FIXME: no plural form -};
 lin systematize_V2 = mkV2 (mkV "systematize" "systematizes" "systematized" "systematized" "systematizing");
 lin syston_PN = mkPN "syston";
-lin séance_N = mkN "séance" "séances";
+lin seance_N = mkN "séance" "séances";
 lin t_N = mkN "t" "IRREG";
 lin t_junction_N = mkN "t-junction" "t-junctions";
 lin t_shirt_N = mkN "t-shirt" "t-shirts";
@@ -38099,8 +38103,8 @@ lin tabby_cat_N = mkN "tabby-cat" "tabby-cats";
 lin tabernacle_N = mkN "tabernacle" "tabernacles";
 lin table_N = mkN "table" "tables";
 lin table_V2 = mkV2 (mkV "table" "tables" "tabled" "tabled" "tabling");
-lin table_d'hôte_A = compoundA (mkA "table d'hôte");
-lin table_d'hôte_Adv = mkAdv "table d'hôte";
+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_lifting_N = mkN "table-lifting" "-" {- FIXME: no plural form -};
 lin table_linen_N = mkN "table-linen" "-" {- FIXME: no plural form -};
@@ -40455,8 +40459,8 @@ lin tyrone_PN = mkPN "tyrone";
 lin tzar_N = mkN "tzar" "tzars";
 lin tzarina_N = mkN "tzarina" "tzarinas";
 lin tzupo_PN = mkPN "tzupo";
-lin tête_à_tête_Adv = mkAdv "tête-à-tête";
-lin tête_à_tête_N = mkN "tête-à-tête" "tête-à-têtes";
+lin tete_a_tete_Adv = mkAdv "tête-à-tête";
+lin tete_a_tete_N = mkN "tête-à-tête" "tête-à-têtes";
 lin u_N = mkN "u" "IRREG";
 lin u_boat_N = mkN "u-boat" "u-boats";
 lin u_turn_N = mkN "u-turn" "u-turns";
@@ -42158,7 +42162,7 @@ lin victual_N = mkN "victual" "victuals";
 lin victual_V = mkV "victual" "victuals" "victualled" "victualled" "victualling";
 lin victual_V2 = mkV2 (mkV "victual" "victuals" "victualled" "victualled" "victualling");
 lin victualler_N = mkN "victualler" "victuallers";
-lin vicuña_N = mkN "vicuña" "vicuñas";
+lin vicuna_N = mkN "vicuña" "vicuñas";
 lin videlicet_Adv = mkAdv "videlicet";
 lin video_N = mkN "video" "videos";
 lin videotape_N = mkN "videotape" "-" {- FIXME: no plural form -};
@@ -42260,7 +42264,7 @@ lin virulence_N = mkN "virulence" "-" {- FIXME: no plural form -};
 lin virulent_A = compoundA (mkA "virulent");
 lin virulently_Adv = mkAdv "virulently";
 lin virus_N = mkN "virus" "viruses";
-lin vis_à_vis_Adv = mkAdv "vis-à-vis";
+lin vis_a_vis_Adv = mkAdv "vis-à-vis";
 lin visa_N = mkN "visa" "visas";
 lin visa_V2 = mkV2 (mkV "visa" "visas" "visaed" "visaed" "visaing");
 lin visage_N = mkN "visage" "visages";
@@ -43957,12 +43961,12 @@ lin zoophyte_N = mkN "zoophyte" "zoophytes";
 lin zoot_suit_N = mkN "zoot suit" "zoot suits";
 lin zucchini_N = mkN "zucchini" "zucchini";
 lin zurich_PN = mkPN "zurich";
-lin à_la_carte_Adv = mkAdv "à la carte";
-lin à_la_mode_Adv = mkAdv "à la mode";
-lin éclair_N = mkN "éclair" "éclairs";
-lin éclat_N = mkN "éclat" "-" {- FIXME: no plural form -};
-lin élan_N = mkN "élan" "-" {- FIXME: no plural form -};
-lin élite_N = mkN "élite" "élites";
-lin émigré_N = mkN "émigré" "émigrés";
-lin épée_N = mkN "épée" "épées";
+lin a_la_carte_Adv = mkAdv "à la carte";
+lin a_la_mode_Adv = mkAdv "à la mode";
+lin eclair_N = mkN "éclair" "éclairs";
+lin eclat_N = mkN "éclat" "-" {- FIXME: no plural form -};
+lin elan_N = mkN "élan" "-" {- FIXME: no plural form -};
+lin elite_N = mkN "élite" "élites";
+lin emigre_N = mkN "émigré" "émigrés";
+lin epee_N = mkN "épée" "épées";
 }
\ No newline at end of file
diff --git a/next-lib/src/english/DictEngAbs.gf b/next-lib/src/english/DictEngAbs.gf
index 7420ba398..37e576e45 100644
--- a/next-lib/src/english/DictEngAbs.gf
+++ b/next-lib/src/english/DictEngAbs.gf
@@ -51,7 +51,7 @@ fun abbey_N : N;
 fun abbot_N : N;
 fun abbreviate_V2 : V2;
 fun abbreviation_N : N;
-fun abbé_N : N;
+fun abbe_N : N;
 fun abc_N : N;
 fun abcs_N : N;
 fun abdicate_V : V;
@@ -767,7 +767,7 @@ fun ahmedabad_PN : PN;
 fun aid_N : N;
 fun aid_V2 : V2;
 fun aide_de_camp_N : N;
-fun aide_mémoire_N : N;
+fun aide_memoire_N : N;
 fun aids_N : N;
 fun aigret_N : N;
 fun aigrette_N : N;
@@ -1574,8 +1574,8 @@ fun applicable_A : A;
 fun applicant_N : N;
 fun application_N : N;
 fun applied_A : A;
-fun appliqué_N : N;
-fun appliqué_V2 : V2;
+fun applique_N : N;
+fun applique_V2 : V2;
 fun apply_V : V;
 fun apply_V2 : V2;
 fun appoint_V2 : V2;
@@ -1631,7 +1631,7 @@ fun april_PN : PN;
 fun apron_N : N;
 fun apropos_A : A;
 fun apropos_Adv : Adv;
-fun après_ski_A : A;
+fun apres_ski_A : A;
 fun apse_N : N;
 fun apt_A : A;
 fun aptitude_N : N;
@@ -1807,7 +1807,7 @@ fun arrester_N : N;
 fun arresting_A : A;
 fun arrival_N : N;
 fun arrive_V : V;
-fun arrière_pensée_N : N;
+fun arriere_pensee_N : N;
 fun arrogance_N : N;
 fun arrogant_A : A;
 fun arrogantly_Adv : Adv;
@@ -1862,7 +1862,7 @@ fun arty_crafty_A : A;
 fun arum_N : N;
 fun aryan_A : A;
 fun aryan_N : N;
-fun arête_N : N;
+fun arete_N : N;
 fun asap_PN : PN;
 fun asbestos_N : N;
 fun ascend_V : V;
@@ -2104,7 +2104,7 @@ fun atrophy_V2 : V2;
 fun attach_V : V;
 fun attach_V2 : V2;
 fun attachment_N : N;
-fun attaché_N : N;
+fun attache_N : N;
 fun attack_N : N;
 fun attack_V2 : V2;
 fun attacker_N : N;
@@ -2238,7 +2238,7 @@ fun autism_N : N;
 fun autistic_A : A;
 fun auto_N : N;
 fun auto_changer_N : N;
-fun auto_da_fé_N : N;
+fun auto_da_fe_N : N;
 fun autobahn_N : N;
 fun autobiographic_A : A;
 fun autobiographical_A : A;
@@ -3617,7 +3617,7 @@ fun blast_V2 : V2;
 fun blast_furnace_N : N;
 fun blast_off_N : N;
 fun blasted_A : A;
-fun blasé_A : A;
+fun blase_A : A;
 fun blatant_A : A;
 fun blatantly_Adv : Adv;
 fun blather_N : N;
@@ -4243,8 +4243,8 @@ fun brasilia_PN : PN;
 fun brass_N : N;
 fun brassard_N : N;
 fun brasserie_N : N;
-fun brassiere_N : N;
-fun brassière_N : N;
+fun brassiere_1_N : N;
+fun brassiere_2_N : N;
 fun brassy_A : A;
 fun brat_N : N;
 fun bratislava_PN : PN;
@@ -4893,7 +4893,7 @@ fun byroad_N : N;
 fun bystander_N : N;
 fun byway_N : N;
 fun byword_N : N;
-fun bête_noire_N : N;
+fun bete_noire_N : N;
 fun c_N : N;
 fun c_in_c_PN : PN;
 fun c_of_e_N : N;
@@ -4960,7 +4960,7 @@ fun cafeteria_N : N;
 fun caff_N : N;
 fun caffeine_N : N;
 fun caftan_N : N;
-fun café_N : N;
+fun cafe_N : N;
 fun cage_N : N;
 fun cage_V2 : V2;
 fun cagey_A : A;
@@ -5111,7 +5111,7 @@ fun canadian_N : N;
 fun canal_N : N;
 fun canalization_N : N;
 fun canalize_V2 : V2;
-fun canapé_N : N;
+fun canape_N : N;
 fun canard_N : N;
 fun canary_N : N;
 fun canary_bird_N : N;
@@ -5167,7 +5167,7 @@ fun canny_A : A;
 fun canoe_N : N;
 fun canoe_V2 : V2;
 fun canoeist_N : N;
-fun canon_N : N;
+fun canon_1_N : N;
 fun canonical_A : A;
 fun canonization_N : N;
 fun canonize_V2 : V2;
@@ -5204,7 +5204,7 @@ fun canvey_island_PN : PN;
 fun canyon_N : N;
 fun cap_N : N;
 fun cap_V2 : V2;
-fun cap_à_pie_Adv : Adv;
+fun cap_a_pie_Adv : Adv;
 fun capability_N : N;
 fun capable_A : A;
 fun capably_Adv : Adv;
@@ -5596,7 +5596,7 @@ fun caw_V2 : V2;
 fun cayenne_N : N;
 fun cayenne_pepper_N : N;
 fun cayman_N : N;
-fun cañon_N : N;
+fun canon_2_N : N;
 fun cbi_N : N;
 fun cc_N : N;
 fun cd_N : N;
@@ -5822,7 +5822,7 @@ fun chapterhouse_N : N;
 fun char_N : N;
 fun char_V : V;
 fun char_V2 : V2;
-fun charabanc_N : N;
+fun charabanc_1_N : N;
 fun character_N : N;
 fun characteristic_A : A;
 fun characteristic_N : N;
@@ -5842,7 +5842,7 @@ fun charge_account_N : N;
 fun charge_sheet_N : N;
 fun chargeable_A : A;
 fun charger_N : N;
-fun chargé_d'affaires_N : N;
+fun charge_d'affaires_N : N;
 fun charily_Adv : Adv;
 fun chariot_N : N;
 fun charioteer_N : N;
@@ -5877,7 +5877,7 @@ fun chartreuse_N : N;
 fun charwoman_N : N;
 fun chary_A : A;
 fun charybdis_PN : PN;
-fun charàbanc_N : N;
+fun charabanc_2_N : N;
 fun chas_PN : PN;
 fun chase_N : N;
 fun chase_V : V;
@@ -6243,7 +6243,7 @@ fun churn_V : V;
 fun churn_V2 : V2;
 fun chute_N : N;
 fun chutney_N : N;
-fun château_N : N;
+fun chateau_N : N;
 fun cia_N : N;
 fun cicada_N : N;
 fun cicala_N : N;
@@ -6505,7 +6505,7 @@ fun cleverly_Adv : Adv;
 fun cleverness_N : N;
 fun clew_N : N;
 fun clew_V2 : V2;
-fun cliché_N : N;
+fun cliche_N : N;
 fun click_N : N;
 fun click_V : V;
 fun client_N : N;
@@ -6576,7 +6576,7 @@ fun clog_V : V;
 fun clog_V2 : V2;
 fun clog_dance_N : N;
 fun cloggy_A : A;
-fun cloisonné_N : N;
+fun cloisonne_N : N;
 fun cloister_N : N;
 fun cloister_V2 : V2;
 fun clone_N : N;
@@ -7082,7 +7082,7 @@ fun communicate_V2 : V2;
 fun communication_N : N;
 fun communicative_A : A;
 fun communion_N : N;
-fun communiqué_N : N;
+fun communique_N : N;
 fun communism_N : N;
 fun communist_A : A;
 fun communist_N : N;
@@ -7227,8 +7227,8 @@ fun compute_V : V;
 fun compute_V2 : V2;
 fun computer_N : N;
 fun computerize_V2 : V2;
-fun compère_N : N;
-fun compère_V2 : V2;
+fun compere_N : N;
+fun compere_V2 : V2;
 fun comrade_N : N;
 fun comradely_Adv : Adv;
 fun comradeship_N : N;
@@ -7411,7 +7411,7 @@ fun confounded_A : A;
 fun confoundedly_Adv : Adv;
 fun confront_V2 : V2;
 fun confrontation_N : N;
-fun confrère_N : N;
+fun confrere_N : N;
 fun confucian_A : A;
 fun confucian_N : N;
 fun confuse_V2 : V2;
@@ -7450,7 +7450,7 @@ fun congressman_N : N;
 fun congresswoman_N : N;
 fun congruent_A : A;
 fun congruous_A : A;
-fun congé_N : N;
+fun conge_N : N;
 fun conic_A : A;
 fun conical_A : A;
 fun conifer_N : N;
@@ -7563,7 +7563,7 @@ fun console_V2 : V2;
 fun consolidate_V : V;
 fun consolidate_V2 : V2;
 fun consolidation_N : N;
-fun consommé_N : N;
+fun consomme_N : N;
 fun consonance_N : N;
 fun consonant_A : A;
 fun consonant_N : N;
@@ -8060,17 +8060,17 @@ fun corselet_N : N;
 fun corset_N : N;
 fun corsham_PN : PN;
 fun corslet_N : N;
-fun cortege_N : N;
+fun cortege_1_N : N;
 fun cortex_N : N;
 fun cortical_A : A;
 fun cortisone_N : N;
-fun cortège_N : N;
+fun cortege_2_N : N;
 fun corundum_N : N;
 fun corunna_PN : PN;
 fun coruscate_V : V;
 fun coruscation_N : N;
 fun corvette_N : N;
-fun corvée_N : N;
+fun corvee_N : N;
 fun cos_N : N;
 fun cosenza_PN : PN;
 fun cosh_N : N;
@@ -8214,7 +8214,7 @@ fun couple_V2 : V2;
 fun couplet_N : N;
 fun coupling_N : N;
 fun coupon_N : N;
-fun coupé_N : N;
+fun coupe_N : N;
 fun courage_N : N;
 fun courageous_A : A;
 fun courageously_Adv : Adv;
@@ -8444,7 +8444,7 @@ fun crenellated_A : A;
 fun creole_A : A;
 fun creole_N : N;
 fun creosote_N : N;
-fun crepe_N : N;
+fun crepe_1_N : N;
 fun crepitate_V : V;
 fun crepitation_N : N;
 fun crepuscular_A : A;
@@ -8696,9 +8696,9 @@ fun crystallization_N : N;
 fun crystallize_V : V;
 fun crystallize_V2 : V2;
 fun crystallography_N : N;
-fun crèche_N : N;
-fun crème_de_menthe_N : N;
-fun crêpe_N : N;
+fun creche_N : N;
+fun creme_de_menthe_N : N;
+fun crepe_2_N : N;
 fun cub_N : N;
 fun cuba_PN : PN;
 fun cuban_A : A;
@@ -8794,14 +8794,14 @@ fun curacy_N : N;
 fun curate_N : N;
 fun curative_A : A;
 fun curator_N : N;
-fun curaçao_N : N;
-fun curaçoa_N : N;
+fun curacao_N : N;
+fun curacoa_N : N;
 fun curb_N : N;
 fun curb_V2 : V2;
 fun curd_N : N;
 fun curdle_V : V;
 fun curdle_V2 : V2;
-fun cure_N : N;
+fun cure_1_N : N;
 fun cure_V : V;
 fun cure_V2 : V2;
 fun cure_all_N : N;
@@ -8859,7 +8859,7 @@ fun curvature_N : N;
 fun curve_N : N;
 fun curve_V : V;
 fun curve_V2 : V2;
-fun curé_N : N;
+fun cure_2_N : N;
 fun cushion_N : N;
 fun cushion_V2 : V2;
 fun cushy_A : A;
@@ -9266,13 +9266,13 @@ fun deborah_PN : PN;
 fun debouch_V : V;
 fun debouch_V2 : V2;
 fun debrief_V2 : V2;
-fun debris_N : N;
+fun debris_1_N : N;
 fun debt_N : N;
 fun debtor_N : N;
 fun debug_V2 : V2;
 fun debunk_V2 : V2;
-fun debut_N : N;
-fun debutante_N : N;
+fun debut_1_N : N;
+fun debutante_1_N : N;
 fun dec_PN : PN;
 fun decade_N : N;
 fun decadence_N : N;
@@ -11505,17 +11505,17 @@ fun dyslexic_A : A;
 fun dyspepsia_N : N;
 fun dyspeptic_A : A;
 fun dyspeptic_N : N;
-fun débris_N : N;
-fun début_N : N;
-fun débutante_N : N;
-fun débâcle_N : N;
-fun décolleté_A : A;
-fun décor_N : N;
-fun démarche_N : N;
-fun démodé_A : A;
-fun dénouement_N : N;
-fun déshabillé_N : N;
-fun détente_N : N;
+fun debris_2_N : N;
+fun debut_2_N : N;
+fun debutante_2_N : N;
+fun debacle_N : N;
+fun decollete_A : A;
+fun decor_N : N;
+fun demarche_N : N;
+fun demode_A : A;
+fun denouement_N : N;
+fun deshabille_N : N;
+fun detente_N : N;
 fun e'en_Adv : Adv;
 fun e'er_Adv : Adv;
 fun e_N : N;
@@ -12304,7 +12304,7 @@ fun entrepreneur_N : N;
 fun entrepreneurial_A : A;
 fun entrust_V2 : V2;
 fun entry_N : N;
-fun entrée_N : N;
+fun entree_N : N;
 fun entwine_V2 : V2;
 fun enumerate_V2 : V2;
 fun enumeration_N : N;
@@ -12920,7 +12920,7 @@ fun exposition_N : N;
 fun expostulate_V : V;
 fun expostulation_N : N;
 fun exposure_N : N;
-fun exposé_N : N;
+fun expose_N : N;
 fun expound_V2 : V2;
 fun express_A : A;
 fun express_Adv : Adv;
@@ -13346,7 +13346,7 @@ fun favouritism_N : N;
 fun fawley_PN : PN;
 fun fawn_N : N;
 fun fawn_V : V;
-fun façade_N : N;
+fun facade_N : N;
 fun fbi_N : N;
 fun fealty_N : N;
 fun fear_N : N;
@@ -13525,8 +13525,8 @@ fun few_A : A;
 fun fewness_N : N;
 fun fey_A : A;
 fun fez_N : N;
-fun fiancé_N : N;
-fun fiancée_N : N;
+fun fiance_N : N;
+fun fiancee_N : N;
 fun fiasco_N : N;
 fun fiat_N : N;
 fun fib_N : N;
@@ -14816,7 +14816,7 @@ fun fry_V2 : V2;
 fun fry_pan_N : N;
 fun fryer_N : N;
 fun frying_pan_N : N;
-fun fräulein_N : N;
+fun fraulein_N : N;
 fun ft_N : N;
 fun fuchsia_N : N;
 fun fuck_V : V;
@@ -14964,9 +14964,9 @@ fun fuze_N : N;
 fun fuzz_N : N;
 fun fuzzy_A : A;
 fun fwd_PN : PN;
-fun fête_N : N;
-fun fête_V2 : V2;
-fun führer_N : N;
+fun fete_N : N;
+fun fete_V2 : V2;
+fun fuhrer_N : N;
 fun g_N : N;
 fun g_man_N : N;
 fun gab_N : N;
@@ -15492,7 +15492,7 @@ fun giver_N : N;
 fun gizzard_N : N;
 fun glacial_A : A;
 fun glacier_N : N;
-fun glacé_A : A;
+fun glace_A : A;
 fun glad_A : A;
 fun gladden_V2 : V2;
 fun glade_N : N;
@@ -16373,7 +16373,7 @@ fun gyration_N : N;
 fun gyro_N : N;
 fun gyroscope_N : N;
 fun gyroscopic_A : A;
-fun gâteau_N : N;
+fun gateau_N : N;
 fun h'm_V : V;
 fun h_N : N;
 fun h_bomb_N : N;
@@ -16392,7 +16392,7 @@ fun habitually_Adv : Adv;
 fun habituate_V2 : V2;
 fun habituation_N : N;
 fun habitude_N : N;
-fun habitué_N : N;
+fun habitue_N : N;
 fun hacienda_N : N;
 fun hack_N : N;
 fun hack_V : V;
@@ -18968,7 +18968,7 @@ fun ingredient_N : N;
 fun ingress_N : N;
 fun ingrid_PN : PN;
 fun ingrowing_A : A;
-fun ingénue_N : N;
+fun ingenue_N : N;
 fun inhabit_V2 : V2;
 fun inhabitable_A : A;
 fun inhabitant_N : N;
@@ -20557,7 +20557,7 @@ fun kwacha_N : N;
 fun kweiyang_PN : PN;
 fun kwela_N : N;
 fun kyoto_PN : PN;
-fun kümmel_N : N;
+fun kummel_N : N;
 fun l_N : N;
 fun l_plate_N : N;
 fun la_N : N;
@@ -20683,7 +20683,7 @@ fun lampoon_V2 : V2;
 fun lamppost_N : N;
 fun lamprey_N : N;
 fun lampshade_N : N;
-fun lamé_N : N;
+fun lame_N : N;
 fun lanark_PN : PN;
 fun lancashire_PN : PN;
 fun lancaster_PN : PN;
@@ -22088,7 +22088,7 @@ fun lyallpur_PN : PN;
 fun lyceum_N : N;
 fun lychee_N : N;
 fun lychgate_N : N;
-fun lycée_N : N;
+fun lycee_N : N;
 fun lydia_PN : PN;
 fun lydney_PN : PN;
 fun lye_N : N;
@@ -22741,7 +22741,7 @@ fun matchless_A : A;
 fun matchlock_N : N;
 fun matchmaker_N : N;
 fun matchwood_N : N;
-fun mate_N : N;
+fun mate_1_N : N;
 fun mate_V : V;
 fun mate_V2 : V2;
 fun material_A : A;
@@ -22762,7 +22762,7 @@ fun mathematically_Adv : Adv;
 fun mathematician_N : N;
 fun mathematics_N : N;
 fun maths_N : N;
-fun matinée_N : N;
+fun matinee_N : N;
 fun matlock_PN : PN;
 fun matriarch_N : N;
 fun matriarchal_A : A;
@@ -22796,7 +22796,7 @@ fun mature_V2 : V2;
 fun maturely_Adv : Adv;
 fun maturity_N : N;
 fun matutinal_A : A;
-fun maté_N : N;
+fun mate_2_N : N;
 fun maud_PN : PN;
 fun maudie_PN : PN;
 fun maudlin_A : A;
@@ -23587,7 +23587,7 @@ fun misdemeanour_N : N;
 fun misdirect_V2 : V2;
 fun misdirection_N : N;
 fun misdoing_N : N;
-fun mise_en_scène_N : N;
+fun mise_en_scene_N : N;
 fun miser_N : N;
 fun miserable_A : A;
 fun miserably_Adv : Adv;
@@ -24406,11 +24406,11 @@ fun mythological_A : A;
 fun mythologist_N : N;
 fun mythology_N : N;
 fun myxomatosis_N : N;
-fun mélange_N : N;
-fun ménage_N : N;
-fun mésalliance_N : N;
-fun métier_N : N;
-fun mêlée_N : N;
+fun melange_N : N;
+fun menage_N : N;
+fun mesalliance_N : N;
+fun metier_N : N;
+fun melee_N : N;
 fun n_N : N;
 fun naafi_N : N;
 fun nab_V2 : V2;
@@ -24436,10 +24436,10 @@ fun nainsook_N : N;
 fun naira_N : N;
 fun nairn_PN : PN;
 fun nairobi_PN : PN;
-fun naive_A : A;
+fun naive_1_A : A;
 fun naively_Adv : Adv;
 fun naivety_N : N;
-fun naiveté_N : N;
+fun naivete_N : N;
 fun naked_A : A;
 fun nakedly_Adv : Adv;
 fun nakedness_N : N;
@@ -24576,7 +24576,7 @@ fun nay_Adv : Adv;
 fun nazi_A : A;
 fun nazi_N : N;
 fun nazism_N : N;
-fun naïve_A : A;
+fun naive_2_A : A;
 fun nb_PN : PN;
 fun nco_N : N;
 fun ne'er_Adv : Adv;
@@ -25315,8 +25315,8 @@ fun nympho_N : N;
 fun nymphomania_N : N;
 fun nymphomaniac_A : A;
 fun nymphomaniac_N : N;
-fun née_A : A;
-fun négligé_N : N;
+fun nee_A : A;
+fun neglige_N : N;
 fun o'er_Adv : Adv;
 fun o_N : N;
 fun o_level_N : N;
@@ -26090,7 +26090,7 @@ fun outright_A : A;
 fun outright_Adv : Adv;
 fun outrival_V2 : V2;
 fun outrun_V2 : V2;
-fun outré_A : A;
+fun outre_A : A;
 fun outsail_V2 : V2;
 fun outset_N : N;
 fun outshine_V2 : V2;
@@ -26649,7 +26649,7 @@ fun paperless_A : A;
 fun papermill_N : N;
 fun paperweight_N : N;
 fun paperwork_N : N;
-fun papier_mâché_N : N;
+fun papier_mache_N : N;
 fun papist_A : A;
 fun papist_N : N;
 fun papoose_N : N;
@@ -26874,8 +26874,8 @@ fun passkey_N : N;
 fun passover_N : N;
 fun passport_N : N;
 fun password_N : N;
-fun passé_A : A;
-fun passée_A : A;
+fun passe_A : A;
+fun passee_A : A;
 fun past_A : A;
 fun past_Adv : Adv;
 fun past_N : N;
@@ -26917,7 +26917,7 @@ fun patchiness_N : N;
 fun patchouli_N : N;
 fun patchwork_N : N;
 fun patchy_A : A;
-fun pate_N : N;
+fun pate_1_N : N;
 fun pate_de_foie_gras_N : N;
 fun patella_N : N;
 fun patent_A : A;
@@ -27809,7 +27809,7 @@ fun piecemeal_A : A;
 fun piecemeal_Adv : Adv;
 fun piecework_N : N;
 fun pied_A : A;
-fun pied_à_terre_N : N;
+fun pied_a_terre_N : N;
 fun pier_N : N;
 fun pier_glass_N : N;
 fun pierce_V : V;
@@ -27818,7 +27818,7 @@ fun piercing_A : A;
 fun piercingly_Adv : Adv;
 fun pierrot_N : N;
 fun piety_N : N;
-fun pietà_N : N;
+fun pieta_N : N;
 fun piffle_N : N;
 fun piffle_V : V;
 fun piffling_A : A;
@@ -28600,7 +28600,7 @@ fun portable_A : A;
 fun portage_N : N;
 fun portal_N : N;
 fun portcullis_N : N;
-fun porte_cochère_N : N;
+fun porte_cochere_N : N;
 fun portend_V2 : V2;
 fun portent_N : N;
 fun portentous_A : A;
@@ -28616,7 +28616,7 @@ fun portico_N : N;
 fun portion_N : N;
 fun portion_V2 : V2;
 fun portishead_PN : PN;
-fun portière_N : N;
+fun portiere_N : N;
 fun portland_PN : PN;
 fun portly_A : A;
 fun portmanteau_N : N;
@@ -29004,7 +29004,7 @@ fun premise_V2 : V2;
 fun premiss_N : N;
 fun premiss_V2 : V2;
 fun premium_N : N;
-fun première_N : N;
+fun premiere_N : N;
 fun premonition_N : N;
 fun premonitory_A : A;
 fun prenatal_A : A;
@@ -29633,8 +29633,8 @@ fun protrusion_N : N;
 fun protrusive_A : A;
 fun protuberance_N : N;
 fun protuberant_A : A;
-fun protégé_N : N;
-fun protégée_N : N;
+fun protege_N : N;
+fun protegee_N : N;
 fun proud_A : A;
 fun proudly_Adv : Adv;
 fun provable_A : A;
@@ -29710,8 +29710,8 @@ fun prussic_A : A;
 fun pry_V : V;
 fun pry_V2 : V2;
 fun pryingly_Adv : Adv;
-fun précis_N : N;
-fun précis_V2 : V2;
+fun precis_N : N;
+fun precis_V2 : V2;
 fun psalm_N : N;
 fun psalmist_N : N;
 fun psalmody_N : N;
@@ -29970,7 +29970,7 @@ fun purvey_V2 : V2;
 fun purveyance_N : N;
 fun purveyor_N : N;
 fun purview_N : N;
-fun purée_N : N;
+fun puree_N : N;
 fun pus_N : N;
 fun pusan_PN : PN;
 fun push_N : N;
@@ -30033,7 +30033,7 @@ fun pyrotechnic_A : A;
 fun pyrrhic_A : A;
 fun python_N : N;
 fun pyx_N : N;
-fun pâté_N : N;
+fun pate_2_N : N;
 fun q_N : N;
 fun qatar_PN : PN;
 fun qatari_A : A;
@@ -30416,7 +30416,7 @@ fun raise_N : N;
 fun raise_V2 : V2;
 fun raiser_N : N;
 fun raisin_N : N;
-fun raison_d'être_N : N;
+fun raison_d'etre_N : N;
 fun raj_N : N;
 fun rajah_N : N;
 fun rake_N : N;
@@ -30794,7 +30794,7 @@ fun recession_N : N;
 fun recessional_A : A;
 fun recessional_N : N;
 fun recessive_A : A;
-fun recherché_A : A;
+fun recherche_A : A;
 fun recidivism_N : N;
 fun recidivist_N : N;
 fun recife_PN : PN;
@@ -31080,7 +31080,7 @@ fun regent_A : A;
 fun regent_N : N;
 fun reggae_N : N;
 fun regicide_N : N;
-fun regime_N : N;
+fun regime_1_N : N;
 fun regimen_N : N;
 fun regiment_N : N;
 fun regiment_V2 : V2;
@@ -31732,7 +31732,7 @@ fun retrospect_N : N;
 fun retrospection_N : N;
 fun retrospective_A : A;
 fun retrospectively_Adv : Adv;
-fun retroussé_A : A;
+fun retrousse_A : A;
 fun retroversion_N : N;
 fun retsina_N : N;
 fun return_N : N;
@@ -32053,7 +32053,7 @@ fun riskily_Adv : Adv;
 fun riskiness_N : N;
 fun risky_A : A;
 fun risotto_N : N;
-fun risqué_A : A;
+fun risque_A : A;
 fun rissole_N : N;
 fun rita_PN : PN;
 fun rite_N : N;
@@ -32170,7 +32170,7 @@ fun roguish_A : A;
 fun roguishly_Adv : Adv;
 fun roguishness_N : N;
 fun roisterer_N : N;
-fun role_N : N;
+fun role_1_N : N;
 fun roll_N : N;
 fun roll_V : V;
 fun roll_V2 : V2;
@@ -32380,7 +32380,7 @@ fun route_V2 : V2;
 fun routemarch_N : N;
 fun routine_A : A;
 fun routine_N : N;
-fun roué_N : N;
+fun roue_N : N;
 fun rove_V : V;
 fun rove_V2 : V2;
 fun rover_N : N;
@@ -32588,11 +32588,11 @@ fun ryde_PN : PN;
 fun rye_N : N;
 fun rye_bread_N : N;
 fun ryehill_PN : PN;
-fun réchauffé_N : N;
-fun régime_N : N;
-fun résumé_N : N;
-fun rôle_N : N;
-fun röntgen_N : N;
+fun rechauffe_N : N;
+fun regime_2_N : N;
+fun resume_N : N;
+fun role_2_N : N;
+fun rontgen_N : N;
 fun s_N : N;
 fun saarbrucken_PN : PN;
 fun sabadeli_PN : PN;
@@ -32718,8 +32718,8 @@ fun sainthood_N : N;
 fun saintlike_A : A;
 fun saintliness_N : N;
 fun saintly_A : A;
-fun sake_N : N;
-fun saké_N : N;
+fun sake_1_N : N;
+fun sake_2_N : N;
 fun sal_volatile_N : N;
 fun salaam_N : N;
 fun salaam_V : V;
@@ -32984,8 +32984,8 @@ fun sausage_N : N;
 fun sausage_dog_N : N;
 fun sausage_meat_N : N;
 fun sausage_roll_N : N;
-fun sauté_A : A;
-fun sauté_V2 : V2;
+fun saute_A : A;
+fun saute_V2 : V2;
 fun savage_A : A;
 fun savage_N : N;
 fun savage_V2 : V2;
@@ -34006,7 +34006,7 @@ fun sexy_A : A;
 fun seychelles_PN : PN;
 fun seychellois_A : A;
 fun seychellois_N : N;
-fun señor_N : N;
+fun senor_N : N;
 fun sgd_PN : PN;
 fun sgt_PN : PN;
 fun shabbily_Adv : Adv;
@@ -35555,12 +35555,12 @@ fun soggy_A : A;
 fun soh_N : N;
 fun soho_PN : PN;
 fun soignee_A : A;
-fun soigné_A : A;
+fun soigne_A : A;
 fun soil_N : N;
 fun soil_V : V;
 fun soil_V2 : V2;
 fun soil_pipe_N : N;
-fun soirée_N : N;
+fun soiree_N : N;
 fun sojourn_N : N;
 fun sojourn_V : V;
 fun sojourner_N : N;
@@ -35750,7 +35750,7 @@ fun sou'_wester_N : N;
 fun sou_N : N;
 fun soubrette_N : N;
 fun soubriquet_N : N;
-fun soufflé_N : N;
+fun souffle_N : N;
 fun sough_V : V;
 fun soul_N : N;
 fun soul_destroying_A : A;
@@ -35779,7 +35779,7 @@ fun soundtrack_N : N;
 fun soup_N : N;
 fun soup_V2 : V2;
 fun soup_kitchen_N : N;
-fun soupçon_N : N;
+fun soupcon_N : N;
 fun sour_A : A;
 fun sour_V : V;
 fun sour_V2 : V2;
@@ -38084,7 +38084,7 @@ fun systematically_Adv : Adv;
 fun systematization_N : N;
 fun systematize_V2 : V2;
 fun syston_PN : PN;
-fun séance_N : N;
+fun seance_N : N;
 fun t_N : N;
 fun t_junction_N : N;
 fun t_shirt_N : N;
@@ -38097,8 +38097,8 @@ fun tabby_cat_N : N;
 fun tabernacle_N : N;
 fun table_N : N;
 fun table_V2 : V2;
-fun table_d'hôte_A : A;
-fun table_d'hôte_Adv : Adv;
+fun table_d'hote_A : A;
+fun table_d'hote_Adv : Adv;
 fun table_knife_N : N;
 fun table_lifting_N : N;
 fun table_linen_N : N;
@@ -40453,8 +40453,8 @@ fun tyrone_PN : PN;
 fun tzar_N : N;
 fun tzarina_N : N;
 fun tzupo_PN : PN;
-fun tête_à_tête_Adv : Adv;
-fun tête_à_tête_N : N;
+fun tete_a_tete_Adv : Adv;
+fun tete_a_tete_N : N;
 fun u_N : N;
 fun u_boat_N : N;
 fun u_turn_N : N;
@@ -42156,7 +42156,7 @@ fun victual_N : N;
 fun victual_V : V;
 fun victual_V2 : V2;
 fun victualler_N : N;
-fun vicuña_N : N;
+fun vicuna_N : N;
 fun videlicet_Adv : Adv;
 fun video_N : N;
 fun videotape_N : N;
@@ -42258,7 +42258,7 @@ fun virulence_N : N;
 fun virulent_A : A;
 fun virulently_Adv : Adv;
 fun virus_N : N;
-fun vis_à_vis_Adv : Adv;
+fun vis_a_vis_Adv : Adv;
 fun visa_N : N;
 fun visa_V2 : V2;
 fun visage_N : N;
@@ -43955,12 +43955,12 @@ fun zoophyte_N : N;
 fun zoot_suit_N : N;
 fun zucchini_N : N;
 fun zurich_PN : PN;
-fun à_la_carte_Adv : Adv;
-fun à_la_mode_Adv : Adv;
-fun éclair_N : N;
-fun éclat_N : N;
-fun élan_N : N;
-fun élite_N : N;
-fun émigré_N : N;
-fun épée_N : N;
+fun a_la_carte_Adv : Adv;
+fun a_la_mode_Adv : Adv;
+fun eclair_N : N;
+fun eclat_N : N;
+fun elan_N : N;
+fun elite_N : N;
+fun emigre_N : N;
+fun epee_N : N;
 }
\ No newline at end of file