encoding.c: Fix the ISO 8859 encoding names with date suffices.

src/libespeak-ng/encoding.c

 	{ "IBM819",           ESPEAKNG_ENCODING_ISO_8859_1 },
 	{ "ISO_646.irv:1991", ESPEAKNG_ENCODING_US_ASCII },
 	{ "ISO_8859-1",       ESPEAKNG_ENCODING_ISO_8859_1 },
+	{ "ISO_8859-1:1987",  ESPEAKNG_ENCODING_ISO_8859_1 },
 	{ "ISO_8859-2",       ESPEAKNG_ENCODING_ISO_8859_2 },
+	{ "ISO_8859-2:1987",  ESPEAKNG_ENCODING_ISO_8859_2 },
 	{ "ISO_8859-3",       ESPEAKNG_ENCODING_ISO_8859_3 },
+	{ "ISO_8859-3:1988",  ESPEAKNG_ENCODING_ISO_8859_3 },
 	{ "ISO_8859-4",       ESPEAKNG_ENCODING_ISO_8859_4 },
+	{ "ISO_8859-4:1988",  ESPEAKNG_ENCODING_ISO_8859_4 },
 	{ "ISO_8859-5",       ESPEAKNG_ENCODING_ISO_8859_5 },
+	{ "ISO_8859-5:1988",  ESPEAKNG_ENCODING_ISO_8859_5 },
 	{ "ISO_8859-6",       ESPEAKNG_ENCODING_ISO_8859_6 },
+	{ "ISO_8859-6:1987",  ESPEAKNG_ENCODING_ISO_8859_6 },
 	{ "ISO_8859-7",       ESPEAKNG_ENCODING_ISO_8859_7 },
+	{ "ISO_8859-7:1987",  ESPEAKNG_ENCODING_ISO_8859_7 },
 	{ "ISO_8859-8",       ESPEAKNG_ENCODING_ISO_8859_8 },
+	{ "ISO_8859-8:1988",  ESPEAKNG_ENCODING_ISO_8859_8 },
 	{ "ISO_8859-9",       ESPEAKNG_ENCODING_ISO_8859_9 },
+	{ "ISO_8859-9:1989",  ESPEAKNG_ENCODING_ISO_8859_9 },
 	{ "ISO_8859-10",      ESPEAKNG_ENCODING_ISO_8859_10 },
+	{ "ISO_8859-10:1992", ESPEAKNG_ENCODING_ISO_8859_10 },
 	{ "ISO_8859-14",      ESPEAKNG_ENCODING_ISO_8859_14 },
+	{ "ISO_8859-14:1998", ESPEAKNG_ENCODING_ISO_8859_14 },
 	{ "ISO646-US",        ESPEAKNG_ENCODING_US_ASCII },
 	{ "ISO-8859-1",       ESPEAKNG_ENCODING_ISO_8859_1 },
-	{ "ISO-8859-1:1987",  ESPEAKNG_ENCODING_ISO_8859_1 },
 	{ "ISO-8859-2",       ESPEAKNG_ENCODING_ISO_8859_2 },
-	{ "ISO-8859-2:1987",  ESPEAKNG_ENCODING_ISO_8859_2 },
 	{ "ISO-8859-3",       ESPEAKNG_ENCODING_ISO_8859_3 },
-	{ "ISO-8859-3:1988",  ESPEAKNG_ENCODING_ISO_8859_3 },
 	{ "ISO-8859-4",       ESPEAKNG_ENCODING_ISO_8859_4 },
-	{ "ISO-8859-4:1988",  ESPEAKNG_ENCODING_ISO_8859_4 },
 	{ "ISO-8859-5",       ESPEAKNG_ENCODING_ISO_8859_5 },
-	{ "ISO-8859-5:1988",  ESPEAKNG_ENCODING_ISO_8859_5 },
 	{ "ISO-8859-6",       ESPEAKNG_ENCODING_ISO_8859_6 },
-	{ "ISO-8859-6:1987",  ESPEAKNG_ENCODING_ISO_8859_6 },
 	{ "ISO-8859-7",       ESPEAKNG_ENCODING_ISO_8859_7 },
-	{ "ISO-8859-7:1987",  ESPEAKNG_ENCODING_ISO_8859_7 },
 	{ "ISO-8859-8",       ESPEAKNG_ENCODING_ISO_8859_8 },
-	{ "ISO-8859-8:1988",  ESPEAKNG_ENCODING_ISO_8859_8 },
 	{ "ISO-8859-9",       ESPEAKNG_ENCODING_ISO_8859_9 },
-	{ "ISO-8859-9:1989",  ESPEAKNG_ENCODING_ISO_8859_9 },
 	{ "ISO-8859-10",      ESPEAKNG_ENCODING_ISO_8859_10 },
-	{ "ISO-8859-10:1992", ESPEAKNG_ENCODING_ISO_8859_10 },
 	{ "ISO-8859-11",      ESPEAKNG_ENCODING_ISO_8859_11 },
 	{ "ISO-8859-13",      ESPEAKNG_ENCODING_ISO_8859_13 },
 	{ "ISO-8859-14",      ESPEAKNG_ENCODING_ISO_8859_14 },
-	{ "ISO-8859-14:1998", ESPEAKNG_ENCODING_ISO_8859_14 },
 	{ "TIS-620",          ESPEAKNG_ENCODING_ISO_8859_11 },
 	{ "US-ASCII",         ESPEAKNG_ENCODING_US_ASCII },
 	{ "cp367",            ESPEAKNG_ENCODING_US_ASCII },

tests/encoding.c

 {
 	printf("testing ISO-8859-1 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-1:1987") == ESPEAKNG_ENCODING_ISO_8859_1);
 	assert(espeak_ng_EncodingFromName("ISO-8859-1") == ESPEAKNG_ENCODING_ISO_8859_1);
 	assert(espeak_ng_EncodingFromName("ISO_8859-1") == ESPEAKNG_ENCODING_ISO_8859_1);
+	assert(espeak_ng_EncodingFromName("ISO_8859-1:1987") == ESPEAKNG_ENCODING_ISO_8859_1);
 	assert(espeak_ng_EncodingFromName("iso-ir-100") == ESPEAKNG_ENCODING_ISO_8859_1);
 	assert(espeak_ng_EncodingFromName("latin1") == ESPEAKNG_ENCODING_ISO_8859_1);
 	assert(espeak_ng_EncodingFromName("l1") == ESPEAKNG_ENCODING_ISO_8859_1);
 {
 	printf("testing ISO-8859-2 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-2:1987") == ESPEAKNG_ENCODING_ISO_8859_2);
 	assert(espeak_ng_EncodingFromName("ISO-8859-2") == ESPEAKNG_ENCODING_ISO_8859_2);
 	assert(espeak_ng_EncodingFromName("ISO_8859-2") == ESPEAKNG_ENCODING_ISO_8859_2);
+	assert(espeak_ng_EncodingFromName("ISO_8859-2:1987") == ESPEAKNG_ENCODING_ISO_8859_2);
 	assert(espeak_ng_EncodingFromName("iso-ir-101") == ESPEAKNG_ENCODING_ISO_8859_2);
 	assert(espeak_ng_EncodingFromName("latin2") == ESPEAKNG_ENCODING_ISO_8859_2);
 	assert(espeak_ng_EncodingFromName("l2") == ESPEAKNG_ENCODING_ISO_8859_2);
 {
 	printf("testing ISO-8859-3 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-3:1988") == ESPEAKNG_ENCODING_ISO_8859_3);
 	assert(espeak_ng_EncodingFromName("ISO-8859-3") == ESPEAKNG_ENCODING_ISO_8859_3);
 	assert(espeak_ng_EncodingFromName("ISO_8859-3") == ESPEAKNG_ENCODING_ISO_8859_3);
+	assert(espeak_ng_EncodingFromName("ISO_8859-3:1988") == ESPEAKNG_ENCODING_ISO_8859_3);
 	assert(espeak_ng_EncodingFromName("iso-ir-109") == ESPEAKNG_ENCODING_ISO_8859_3);
 	assert(espeak_ng_EncodingFromName("latin3") == ESPEAKNG_ENCODING_ISO_8859_3);
 	assert(espeak_ng_EncodingFromName("l3") == ESPEAKNG_ENCODING_ISO_8859_3);
 {
 	printf("testing ISO-8859-4 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-4:1988") == ESPEAKNG_ENCODING_ISO_8859_4);
 	assert(espeak_ng_EncodingFromName("ISO-8859-4") == ESPEAKNG_ENCODING_ISO_8859_4);
 	assert(espeak_ng_EncodingFromName("ISO_8859-4") == ESPEAKNG_ENCODING_ISO_8859_4);
+	assert(espeak_ng_EncodingFromName("ISO_8859-4:1988") == ESPEAKNG_ENCODING_ISO_8859_4);
 	assert(espeak_ng_EncodingFromName("iso-ir-110") == ESPEAKNG_ENCODING_ISO_8859_4);
 	assert(espeak_ng_EncodingFromName("latin4") == ESPEAKNG_ENCODING_ISO_8859_4);
 	assert(espeak_ng_EncodingFromName("l4") == ESPEAKNG_ENCODING_ISO_8859_4);
 {
 	printf("testing ISO-8859-5 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-5:1988") == ESPEAKNG_ENCODING_ISO_8859_5);
 	assert(espeak_ng_EncodingFromName("ISO-8859-5") == ESPEAKNG_ENCODING_ISO_8859_5);
 	assert(espeak_ng_EncodingFromName("ISO_8859-5") == ESPEAKNG_ENCODING_ISO_8859_5);
+	assert(espeak_ng_EncodingFromName("ISO_8859-5:1988") == ESPEAKNG_ENCODING_ISO_8859_5);
 	assert(espeak_ng_EncodingFromName("iso-ir-144") == ESPEAKNG_ENCODING_ISO_8859_5);
 	assert(espeak_ng_EncodingFromName("cyrillic") == ESPEAKNG_ENCODING_ISO_8859_5);
 	assert(espeak_ng_EncodingFromName("csISOLatinCyrillic") == ESPEAKNG_ENCODING_ISO_8859_5);
 {
 	printf("testing ISO-8859-6 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-6:1987") == ESPEAKNG_ENCODING_ISO_8859_6);
 	assert(espeak_ng_EncodingFromName("ISO-8859-6") == ESPEAKNG_ENCODING_ISO_8859_6);
 	assert(espeak_ng_EncodingFromName("ISO_8859-6") == ESPEAKNG_ENCODING_ISO_8859_6);
+	assert(espeak_ng_EncodingFromName("ISO_8859-6:1987") == ESPEAKNG_ENCODING_ISO_8859_6);
 	assert(espeak_ng_EncodingFromName("iso-ir-127") == ESPEAKNG_ENCODING_ISO_8859_6);
 	assert(espeak_ng_EncodingFromName("ECMA-114") == ESPEAKNG_ENCODING_ISO_8859_6);
 	assert(espeak_ng_EncodingFromName("ASMO-708") == ESPEAKNG_ENCODING_ISO_8859_6);
 {
 	printf("testing ISO-8859-7 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-7:1987") == ESPEAKNG_ENCODING_ISO_8859_7);
 	assert(espeak_ng_EncodingFromName("ISO-8859-7") == ESPEAKNG_ENCODING_ISO_8859_7);
 	assert(espeak_ng_EncodingFromName("ISO_8859-7") == ESPEAKNG_ENCODING_ISO_8859_7);
+	assert(espeak_ng_EncodingFromName("ISO_8859-7:1987") == ESPEAKNG_ENCODING_ISO_8859_7);
 	assert(espeak_ng_EncodingFromName("iso-ir-126") == ESPEAKNG_ENCODING_ISO_8859_7);
 	assert(espeak_ng_EncodingFromName("ECMA-118") == ESPEAKNG_ENCODING_ISO_8859_7);
 	assert(espeak_ng_EncodingFromName("ELOT_928") == ESPEAKNG_ENCODING_ISO_8859_7);
 {
 	printf("testing ISO-8859-8 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-8:1988") == ESPEAKNG_ENCODING_ISO_8859_8);
 	assert(espeak_ng_EncodingFromName("ISO-8859-8") == ESPEAKNG_ENCODING_ISO_8859_8);
 	assert(espeak_ng_EncodingFromName("ISO_8859-8") == ESPEAKNG_ENCODING_ISO_8859_8);
+	assert(espeak_ng_EncodingFromName("ISO_8859-8:1988") == ESPEAKNG_ENCODING_ISO_8859_8);
 	assert(espeak_ng_EncodingFromName("iso-ir-138") == ESPEAKNG_ENCODING_ISO_8859_8);
 	assert(espeak_ng_EncodingFromName("hebrew") == ESPEAKNG_ENCODING_ISO_8859_8);
 	assert(espeak_ng_EncodingFromName("csISOLatinHebrew") == ESPEAKNG_ENCODING_ISO_8859_8);
 {
 	printf("testing ISO-8859-9 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-9:1989") == ESPEAKNG_ENCODING_ISO_8859_9);
 	assert(espeak_ng_EncodingFromName("ISO-8859-9") == ESPEAKNG_ENCODING_ISO_8859_9);
 	assert(espeak_ng_EncodingFromName("ISO_8859-9") == ESPEAKNG_ENCODING_ISO_8859_9);
+	assert(espeak_ng_EncodingFromName("ISO_8859-9:1989") == ESPEAKNG_ENCODING_ISO_8859_9);
 	assert(espeak_ng_EncodingFromName("iso-ir-148") == ESPEAKNG_ENCODING_ISO_8859_9);
 	assert(espeak_ng_EncodingFromName("latin5") == ESPEAKNG_ENCODING_ISO_8859_9);
 	assert(espeak_ng_EncodingFromName("l5") == ESPEAKNG_ENCODING_ISO_8859_9);
 {
 	printf("testing ISO-8859-10 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-10:1992") == ESPEAKNG_ENCODING_ISO_8859_10);
 	assert(espeak_ng_EncodingFromName("ISO-8859-10") == ESPEAKNG_ENCODING_ISO_8859_10);
 	assert(espeak_ng_EncodingFromName("ISO_8859-10") == ESPEAKNG_ENCODING_ISO_8859_10);
+	assert(espeak_ng_EncodingFromName("ISO_8859-10:1992") == ESPEAKNG_ENCODING_ISO_8859_10);
 	assert(espeak_ng_EncodingFromName("iso-ir-157") == ESPEAKNG_ENCODING_ISO_8859_10);
 	assert(espeak_ng_EncodingFromName("latin6") == ESPEAKNG_ENCODING_ISO_8859_10);
 	assert(espeak_ng_EncodingFromName("l6") == ESPEAKNG_ENCODING_ISO_8859_10);
 {
 	printf("testing ISO-8859-14 encoding\n");
 
-	assert(espeak_ng_EncodingFromName("ISO-8859-14:1998") == ESPEAKNG_ENCODING_ISO_8859_14);
 	assert(espeak_ng_EncodingFromName("ISO-8859-14") == ESPEAKNG_ENCODING_ISO_8859_14);
 	assert(espeak_ng_EncodingFromName("ISO_8859-14") == ESPEAKNG_ENCODING_ISO_8859_14);
+	assert(espeak_ng_EncodingFromName("ISO_8859-14:1998") == ESPEAKNG_ENCODING_ISO_8859_14);
 	assert(espeak_ng_EncodingFromName("iso-ir-199") == ESPEAKNG_ENCODING_ISO_8859_14);
 	assert(espeak_ng_EncodingFromName("iso-celtic") == ESPEAKNG_ENCODING_ISO_8859_14);
 	assert(espeak_ng_EncodingFromName("latin8") == ESPEAKNG_ENCODING_ISO_8859_14);