From 5ebf5b8fa466a1c80121afd4d9517a763dfa2d4a Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sun, 1 Apr 2018 11:50:50 +0100
Subject: [PATCH] en: Fix several -er and -est words (e.g. wickeder, wickedest,
 brittlest).

---
 dictsource/en_list            |  2 +-
 dictsource/en_rules           | 14 ++++++++++----
 src/libespeak-ng/dictionary.c |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dictsource/en_list b/dictsource/en_list
index 06a32c54..bbdddb76 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -2457,7 +2457,6 @@ liter		li:t3
 literate	$alt2
 literature	lItrI#tS3
 ?3 literature	lIt3rI#tS3
-littlest	lIt@L@st
 live		laIv          $onlys
 live		lIv           $verb
 (live in)	lIv||I2n
@@ -2630,6 +2629,7 @@ modem		moUdEm
 ?3 modem	moUd@m
 moderate	m0d@reIt      $verb
 modernity	$2
+modest		m0dIst
 mogul		moUg@L
 mohican		moUh'i:k@n
 moi		mwA:
diff --git a/dictsource/en_rules b/dictsource/en_rules
index 83db8092..384b002a 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -2730,6 +2730,8 @@ _it_separ) ate (_  @t
 .group er
      &) er         3
    @@@) er (_S2de  3         // suffix
+   @ed) er (_S2d   3         // suffix, adjective
+   ied) er (_S2de  3         // suffix
     %C) er (_S3    3
     mm) er (_      3
     rn) er (_S2    3
@@ -2936,8 +2938,12 @@ _it_separ) ate (_  @t
    &tr) ess (_     @s
   dist) ess (_     Es
      &) es (y_     @s
-     &) es (t_     I2s
-    Cr) es (t      Es
+     &) est (_S3e  I2st
+   &ng) est (_S3   gI2st	// ng = /N/
+  &ang) est (_S3e  I2st		// ng = /dZ/
+  &eur) est (_S3   I2st
+ inter) est        Est
+    Cr) es (t+     Es
     gu) es (t_     Es
         es (tral_  'Es
      v) es (t+     Es
@@ -4184,6 +4190,7 @@ _it_separ) ate (_  @t
         l (E       l
         lle (_     l
     %C) l (eC_     l
+    %C) l (est_    l
   @@ba) lled (_S2v d
     @@) lled (_S3v d
      B) l (_       @L
@@ -4427,7 +4434,6 @@ multip) ly         laI
     gi) ng (er     ndZ
      o) ng (er     Ng
    you) ng (er     Ng
-        ng (est    Ng
     co) nge (st    ndZE
    cri) nging      ndZI2N
     hi) nging      ndZI2N
@@ -6134,7 +6140,7 @@ multip) ly         laI
         ther (er   D3
         th (erC    D
         there (_   D3        // thering
-        th (est    D
+        thest      DI2st     // farthest, furthest
     ea) th (er     D
      n) th (er+    T
         therap     TEr@p
diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c
index 2569e5b7..e5f72131 100644
--- a/src/libespeak-ng/dictionary.c
+++ b/src/libespeak-ng/dictionary.c
@@ -3031,6 +3031,8 @@ int RemoveEnding(Translator *tr, char *word, int end_type, char *word_copy)
 	static const char *add_e_additions[] = {
 		"c", "rs", "ir", "ur", "ath", "ns", "u",
 		"spong", // sponge
+		"rang", // strange
+		"larg", // large
 		NULL
 	};