add factory for ISO-IR -111 userdefined charset ad cns11643 p3-7

intl/uconv/src/registryhack2.h

@@ -17,7 +17,7 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
 
-  mDecSize           = 52;
+  mDecSize           = 55;
   mDecArray          = new ConverterInfo [mDecSize];
 
   PRInt32 i =0;
@@ -31,8 +31,10 @@
   mDecArray[i++].mCID  = &kISO88597ToUnicodeCID;
   mDecArray[i++].mCID  = &kISO88598ToUnicodeCID;
   mDecArray[i++].mCID  = &kISO88599ToUnicodeCID;
+  mDecArray[i++].mCID  = &kISO885910ToUnicodeCID;
   mDecArray[i++].mCID  = &kISO885914ToUnicodeCID;
   mDecArray[i++].mCID  = &kISO885915ToUnicodeCID;
+  mDecArray[i++].mCID  = &kISOIR111ToUnicodeCID;
   mDecArray[i++].mCID  = &kCP1250ToUnicodeCID;
   mDecArray[i++].mCID  = &kCP1251ToUnicodeCID;
   mDecArray[i++].mCID  = &kCP1252ToUnicodeCID;
@@ -74,8 +76,9 @@
   mDecArray[i++].mCID  = &kUCS4BEToUnicodeCID;
   mDecArray[i++].mCID  = &kUCS4LEToUnicodeCID;
   mDecArray[i++].mCID  = &kT61ToUnicodeCID;
+  mDecArray[i++].mCID  = &kUserDefinedToUnicodeCID;
 
-  mEncSize           = 60;
+  mEncSize           = 68;
   mEncArray          = new ConverterInfo [mEncSize];
 
   i = 0;
@@ -88,8 +91,10 @@
   mEncArray[i++].mCID  = &kUnicodeToISO88597CID;
   mEncArray[i++].mCID  = &kUnicodeToISO88598CID;
   mEncArray[i++].mCID  = &kUnicodeToISO88599CID;
+  mEncArray[i++].mCID  = &kUnicodeToISO885910CID;
   mEncArray[i++].mCID  = &kUnicodeToISO885914CID;
   mEncArray[i++].mCID  = &kUnicodeToISO885915CID;
+  mEncArray[i++].mCID  = &kUnicodeToISOIR111CID;
   mEncArray[i++].mCID  = &kUnicodeToCP1250CID;
   mEncArray[i++].mCID  = &kUnicodeToCP1251CID;
   mEncArray[i++].mCID  = &kUnicodeToCP1252CID;
@@ -131,6 +136,7 @@
   mEncArray[i++].mCID  = &kUnicodeToUCS4BECID;
   mEncArray[i++].mCID  = &kUnicodeToUCS4LECID;
   mEncArray[i++].mCID  = &kUnicodeToT61CID;
+  mEncArray[i++].mCID  = &kUnicodeToUserDefinedCID;
   mEncArray[i++].mCID  = &kUnicodeToJISx0201CID;
   mEncArray[i++].mCID  = &kUnicodeToJISx0208CID;
   mEncArray[i++].mCID  = &kUnicodeToJISx0212CID;
@@ -139,4 +145,9 @@
   mEncArray[i++].mCID  = &kUnicodeToBIG5NoAsciiCID;
   mEncArray[i++].mCID  = &kUnicodeToCNS11643p1CID;
   mEncArray[i++].mCID  = &kUnicodeToCNS11643p2CID;
+  mEncArray[i++].mCID  = &kUnicodeToCNS11643p3CID;
+  mEncArray[i++].mCID  = &kUnicodeToCNS11643p4CID;
+  mEncArray[i++].mCID  = &kUnicodeToCNS11643p5CID;
+  mEncArray[i++].mCID  = &kUnicodeToCNS11643p6CID;
+  mEncArray[i++].mCID  = &kUnicodeToCNS11643p7CID;
 

intl/uconv/ucvlatin/nsUCvLatinDll.cpp

@@ -36,8 +36,10 @@
 #include "nsISO88597ToUnicode.h"
 #include "nsISO88598ToUnicode.h"
 #include "nsISO88599ToUnicode.h"
+#include "nsISO885910ToUnicode.h"
 #include "nsISO885914ToUnicode.h"
 #include "nsISO885915ToUnicode.h"
+#include "nsISOIR111ToUnicode.h"
 #include "nsCP1250ToUnicode.h"
 #include "nsCP1251ToUnicode.h"
 #include "nsCP1252ToUnicode.h"
@@ -72,6 +74,7 @@
 #include "nsUCS2BEToUnicode.h"
 #include "nsUCS2LEToUnicode.h"
 #include "nsT61ToUnicode.h"
+#include "nsUserDefinedToUnicode.h"
 #include "nsUnicodeToISO88591.h"
 #include "nsUnicodeToISO88592.h"
 #include "nsUnicodeToISO88593.h"
@@ -81,8 +84,10 @@
 #include "nsUnicodeToISO88597.h"
 #include "nsUnicodeToISO88598.h"
 #include "nsUnicodeToISO88599.h"
+#include "nsUnicodeToISO885910.h"
 #include "nsUnicodeToISO885914.h"
 #include "nsUnicodeToISO885915.h"
+#include "nsUnicodeToISOIR111.h"
 #include "nsUnicodeToCP1250.h"
 #include "nsUnicodeToCP1251.h"
 #include "nsUnicodeToCP1252.h"
@@ -117,6 +122,7 @@
 #include "nsUnicodeToUCS4BE.h"
 #include "nsUnicodeToUCS4LE.h"
 #include "nsUnicodeToT61.h"
+#include "nsUnicodeToUserDefined.h"
 
 // just for NS_IMPL_IDS; this is a good, central place to implement GUIDs
 #include "nsIUnicodeDecoder.h"
@@ -202,6 +208,12 @@ FactoryData g_FactoryData[] =
     "ISO-8859-9",
     "Unicode"
   },
+  {
+    &kISO885910ToUnicodeCID,
+    nsISO885910ToUnicode::CreateInstance,
+    "ISO-8859-10",
+    "Unicode"
+  },
   {
     &kISO885914ToUnicodeCID,
     nsISO885914ToUnicode::CreateInstance,
@@ -214,6 +226,12 @@ FactoryData g_FactoryData[] =
     "ISO-8859-15",
     "Unicode"
   },
+  {
+    &kISOIR111ToUnicodeCID,
+    nsISOIR111ToUnicode::CreateInstance,
+    "ISO-IR-111",
+    "Unicode"
+  },
   {
     &kCP1250ToUnicodeCID,
     nsCP1250ToUnicode::CreateInstance,
@@ -418,6 +436,12 @@ FactoryData g_FactoryData[] =
     "T.61-8bit",
     "Unicode"
   },
+  {
+    &kUserDefinedToUnicodeCID,
+    nsUserDefinedToUnicode::CreateInstance,
+    "x-user-defined",
+    "Unicode"
+  },
   {
     &kUnicodeToISO88591CID,
     nsUnicodeToISO88591::CreateInstance,
@@ -472,6 +496,12 @@ FactoryData g_FactoryData[] =
     "Unicode",
     "ISO-8859-9"
   },
+  {
+    &kUnicodeToISO885910CID,
+    nsUnicodeToISO885910::CreateInstance,
+    "Unicode",
+    "ISO-8859-10"
+  },
   {
     &kUnicodeToISO885914CID,
     nsUnicodeToISO885914::CreateInstance,
@@ -484,6 +514,12 @@ FactoryData g_FactoryData[] =
     "Unicode",
     "ISO-8859-15"
   },
+  {
+    &kUnicodeToISOIR111CID,
+    nsUnicodeToISOIR111::CreateInstance,
+    "Unicode",
+    "ISO-IR-111"
+  },
   {
     &kUnicodeToCP1250CID,
     nsUnicodeToCP1250::CreateInstance,
@@ -687,6 +723,12 @@ FactoryData g_FactoryData[] =
     nsUnicodeToT61::CreateInstance,
     "Unicode",
     "T.61-8bit"
+  },
+  {
+    &kUnicodeToUserDefinedCID,
+    nsUnicodeToUserDefined::CreateInstance,
+    "Unicode",
+    "x-user-defined"
   }
 };
 

intl/uconv/ucvtw2/nsUCvTW2Dll.cpp

@@ -31,6 +31,11 @@
 #include "nsUnicodeToEUCTW.h"
 #include "nsUnicodeToCNS11643p1.h"
 #include "nsUnicodeToCNS11643p2.h"
+#include "nsUnicodeToCNS11643p3.h"
+#include "nsUnicodeToCNS11643p4.h"
+#include "nsUnicodeToCNS11643p5.h"
+#include "nsUnicodeToCNS11643p6.h"
+#include "nsUnicodeToCNS11643p7.h"
 
 // just for NS_IMPL_IDS; this is a good, central place to implement GUIDs
 #include "nsIUnicodeDecoder.h"
@@ -132,6 +137,36 @@ FactoryData g_FactoryData[] =
     nsUnicodeToCNS11643p2::CreateInstance,
     "Unicode",
     "x-cns-11643-2"
+  },
+  {
+    &kUnicodeToCNS11643p3CID,
+    nsUnicodeToCNS11643p3::CreateInstance,
+    "Unicode",
+    "x-cns-11643-3"
+  },
+  {
+    &kUnicodeToCNS11643p4CID,
+    nsUnicodeToCNS11643p4::CreateInstance,
+    "Unicode",
+    "x-cns-11643-4"
+  },
+  {
+    &kUnicodeToCNS11643p5CID,
+    nsUnicodeToCNS11643p5::CreateInstance,
+    "Unicode",
+    "x-cns-11643-5"
+  },
+  {
+    &kUnicodeToCNS11643p6CID,
+    nsUnicodeToCNS11643p6::CreateInstance,
+    "Unicode",
+    "x-cns-11643-6"
+  },
+  {
+    &kUnicodeToCNS11643p7CID,
+    nsUnicodeToCNS11643p7::CreateInstance,
+    "Unicode",
+    "x-cns-11643-7"
   }
 };