fix bug 33930. r=cata add ISO-8859-{6,8}-{I,E}

intl/uconv/src/charsetData.properties

@@ -79,7 +79,11 @@ utf-8.MIMEMailCharset           = utf-8
 
 
 iso-8859-6.notForBrowser    = true
+iso-8859-6-i.notForBrowser  = true
+iso-8859-6-e.notForBrowser  = true
 iso-8859-8.notForBrowser    = true
+iso-8859-8-i.notForBrowser  = true
+iso-8859-8-e.notForBrowser  = true
 windows-1255.notForBrowser  = true
 windows-1256.notForBrowser  = true
 ibm862.notForBrowser        = true

intl/uconv/src/charsetTitles.properties

@@ -75,7 +75,11 @@ x-viet-vps.title = Vietnamese (VPS)
 tis-620.title = Thai (TIS-620)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
+iso-8859-6-i.title = Arabic (ISO-8859-6-I)
+iso-8859-6-e.title = Arabic (ISO-8859-6-E)
 iso-8859-8.title = Hebrew (ISO-8859-8)
+iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
+iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
 windows-1255.title = Hebrew (Windows-1255)
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined

intl/uconv/src/charsetalias.properties

@@ -46,8 +46,12 @@ iso-8859-3=ISO-8859-3
 iso-8859-4=ISO-8859-4
 iso-8859-5=ISO-8859-5
 iso-8859-6=ISO-8859-6
+iso-8859-6-i=ISO-8859-6-I
+iso-8859-6-e=ISO-8859-6-E
 iso-8859-7=ISO-8859-7
 iso-8859-8=ISO-8859-8
+iso-8859-8-i=ISO-8859-8-I
+iso-8859-8-e=ISO-8859-8-E
 iso-8859-9=ISO-8859-9
 iso-8859-10=ISO-8859-10
 iso-8859-13=ISO-8859-13
@@ -182,6 +186,14 @@ ecma-114=ISO-8859-6
 asmo-708=ISO-8859-6
 csisolatinarabic=ISO-8859-6
 ##
+## Aliases for ISO-8859-6-I
+##
+csiso88596i=ISO-8859-6-I
+##
+## Aliases for ISO-8859-6-E
+##
+csiso88596e=ISO-8859-6-E
+##
 ## Aliases for ISO-8859-7
 ##
 greek=ISO-8859-7
@@ -203,6 +215,14 @@ iso_8859-8=ISO-8859-8
 iso-ir-138=ISO-8859-8
 csisolatinhebrew=ISO-8859-8
 ##
+## Aliases for ISO-8859-8-I
+##
+csiso88598i=ISO-8859-8-I
+##
+## Aliases for ISO-8859-8-E
+##
+csiso88598e=ISO-8859-8-E
+##
 ## Aliases for ISO-8859-9
 ##
 latin5=ISO-8859-9

intl/uconv/ucvlatin/nsUCvLatinCID.h

@@ -55,6 +55,16 @@ NS_DECLARE_ID(kISO88595ToUnicodeCID,
 NS_DECLARE_ID(kISO88596ToUnicodeCID,
   0x660d8ca3, 0xf763, 0x11d2, 0x8a, 0xad, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+// Class ID for our ISO88596IToUnicode charset converter
+// {495ECA44-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kISO88596IToUnicodeCID,
+  0x495eca44, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
+// Class ID for our ISO88596EToUnicode charset converter
+// {495ECA45-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kISO88596EToUnicodeCID,
+  0x495eca45, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
 // Class ID for our ISO88597ToUnicode charset converter
 // {AF7A9951-AA48-11d2-B3AE-00805F8A6670}
 NS_DECLARE_ID(kISO88597ToUnicodeCID, 
@@ -65,6 +75,16 @@ NS_DECLARE_ID(kISO88597ToUnicodeCID,
 NS_DECLARE_ID(kISO88598ToUnicodeCID, 
   0x660d8ca4, 0xf763, 0x11d2, 0x8a, 0xad, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+// Class ID for our ISO88598EToUnicode charset converter
+// {495ECA42-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kISO88598EToUnicodeCID, 
+  0x495eca42, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
+// Class ID for our ISO88598IToUnicode charset converter
+// {495ECA43-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kISO88598IToUnicodeCID, 
+  0x495eca43, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
 // Class ID for our ISO88599ToUnicode charset converter
 // {7C657D13-EC5E-11d2-8AAC-00600811A836}
 NS_DECLARE_ID(kISO88599ToUnicodeCID, 
@@ -240,6 +260,16 @@ NS_DECLARE_ID(kUnicodeToISO88595CID,
 NS_DECLARE_ID(kUnicodeToISO88596CID, 
   0x660d8ca8, 0xf763, 0x11d2, 0x8a, 0xad, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+// Class ID for our UnicodeToISO88596I charset converter
+// {495ECA46-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kUnicodeToISO88596ICID, 
+  0x495eca46, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
+// Class ID for our UnicodeToISO88596E charset converter
+// {495ECA47-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kUnicodeToISO88596ECID, 
+  0x495eca47, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
 // Class ID for our UnicodeToISO88597 charset converter
 // {7B8556A8-EC79-11d2-8AAC-00600811A836}
 NS_DECLARE_ID(kUnicodeToISO88597CID, 
@@ -250,6 +280,16 @@ NS_DECLARE_ID(kUnicodeToISO88597CID,
 NS_DECLARE_ID(kUnicodeToISO88598CID, 
   0x660d8ca9, 0xf763, 0x11d2, 0x8a, 0xad, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+// Class ID for our UnicodeToISO88598I charset converter
+// {495ECA48-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kUnicodeToISO88598ICID, 
+  0x495eca48, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
+// Class ID for our UnicodeToISO88598E charset converter
+// {495ECA49-0A5C-11d4-A135-005004832142}
+NS_DECLARE_ID(kUnicodeToISO88598ECID, 
+  0x495eca49, 0xa5c, 0x11d4, 0xa1, 0x35, 0x0, 0x50, 0x4, 0x83, 0x21, 0x42);
+
 // Class ID for our UnicodeToISO88599 charset converter
 // {7B8556A9-EC79-11d2-8AAC-00600811A836}
 NS_DECLARE_ID(kUnicodeToISO88599CID, 

intl/uconv/ucvlatin/nsUCvLatinModule.cpp

@@ -210,6 +210,18 @@ static FactoryData g_FactoryData[] =
     "ISO-8859-6",
     "Unicode"
   },
+  {
+    &kISO88596IToUnicodeCID,
+    nsISO88596ToUnicode::CreateInstance,
+    "ISO-8859-6-I",
+    "Unicode"
+  },
+  {
+    &kISO88596EToUnicodeCID,
+    nsISO88596ToUnicode::CreateInstance,
+    "ISO-8859-6-E",
+    "Unicode"
+  },
   {
     &kISO88597ToUnicodeCID,
     nsISO88597ToUnicode::CreateInstance,
@@ -222,6 +234,18 @@ static FactoryData g_FactoryData[] =
     "ISO-8859-8",
     "Unicode"
   },
+  {
+    &kISO88598IToUnicodeCID,
+    nsISO88598ToUnicode::CreateInstance,
+    "ISO-8859-8-I",
+    "Unicode"
+  },
+  {
+    &kISO88598EToUnicodeCID,
+    nsISO88598ToUnicode::CreateInstance,
+    "ISO-8859-8-E",
+    "Unicode"
+  },
   {
     &kISO88599ToUnicodeCID,
     nsISO88599ToUnicode::CreateInstance,
@@ -518,6 +542,18 @@ static FactoryData g_FactoryData[] =
     "Unicode",
     "ISO-8859-6"
   },
+  {
+    &kUnicodeToISO88596ICID,
+    nsUnicodeToISO88596::CreateInstance,
+    "Unicode",
+    "ISO-8859-6-I"
+  },
+  {
+    &kUnicodeToISO88596ECID,
+    nsUnicodeToISO88596::CreateInstance,
+    "Unicode",
+    "ISO-8859-6-E"
+  },
   {
     &kUnicodeToISO88597CID,
     nsUnicodeToISO88597::CreateInstance,
@@ -530,6 +566,18 @@ static FactoryData g_FactoryData[] =
     "Unicode",
     "ISO-8859-8"
   },
+  {
+    &kUnicodeToISO88598ICID,
+    nsUnicodeToISO88598::CreateInstance,
+    "Unicode",
+    "ISO-8859-8-I"
+  },
+  {
+    &kUnicodeToISO88598ECID,
+    nsUnicodeToISO88598::CreateInstance,
+    "Unicode",
+    "ISO-8859-8-E"
+  },
   {
     &kUnicodeToISO88599CID,
     nsUnicodeToISO88599::CreateInstance,