bug 127755 : add two Thai charsets ISO-8859-11 and TIS-620 to libuconv and make corresponding changes in GFX:Gtk and GFX:Xlib. What used to be referred to as TIS-620 is renamed as Windows-874. r=smontague, sr=rbs (ut/uf files are thanks to ftang).

gfx/src/gtk/nsFontMetricsGTK.cpp

@@ -284,16 +284,22 @@ static nsFontCharSetInfo KOI8R =
 static nsFontCharSetInfo KOI8U =
   { "KOI8-U", SingleByteConvert, 0,
     TT_OS2_CPR1_CYRILLIC, TT_OS2_CPR2_RUSSIAN | TT_OS2_CPR2_CYRILLIC };
-static nsFontCharSetInfo TIS620 =
+static nsFontCharSetInfo TIS6202 =
 /* Added to support thai context sensitive shaping if
  * CTL extension is is in force */
 #ifdef SUNCTL
   { "tis620-2", SingleByteConvert, 0,
     TT_OS2_CPR1_THAI, 0 };
 #else
-  { "TIS-620", SingleByteConvert, 0,
+  { "windows-874", SingleByteConvert, 0,
     TT_OS2_CPR1_THAI, 0 };
 #endif /* SUNCTL */
+static nsFontCharSetInfo TIS620 =
+  { "TIS-620", SingleByteConvert, 0,
+    TT_OS2_CPR1_THAI, 0 };
+static nsFontCharSetInfo ISO885911 =
+  { "ISO-8859-11", SingleByteConvert, 0,
+    TT_OS2_CPR1_THAI, 0 };
 static nsFontCharSetInfo Big5 =
   { "x-x-big5", DoubleByteConvert, 1,
     TT_OS2_CPR1_CHINESE_TRAD, 0 };
@@ -550,7 +556,8 @@ static nsFontCharSetMap gCharSetMap[] =
   { "tis620.2533-0",      &FLG_THAI,    &TIS620        },
   { "tis620.2533-1",      &FLG_THAI,    &TIS620        },
   { "tis620-0",           &FLG_THAI,    &TIS620        },
-  { "iso8859-11",         &FLG_THAI,    &TIS620        },
+  { "tis620-2",           &FLG_THAI,    &TIS6202       },
+  { "iso8859-11",         &FLG_THAI,    &ISO885911     },
   { "ucs2.cjk-0",         &FLG_NONE,    &ISO106461     },
   { "ucs2.cjk_china-0",   &FLG_ZHCN,    &ISO106461     },
   { "ucs2.cjk_japan-0",   &FLG_JA,      &ISO106461     },

gfx/src/xlib/nsFontMetricsXlib.cpp

@@ -352,16 +352,22 @@ static nsFontCharSetInfoXlib KOI8R =
 static nsFontCharSetInfoXlib KOI8U =
   { "KOI8-U", SingleByteConvert, 0,
     TT_OS2_CPR1_CYRILLIC, TT_OS2_CPR2_RUSSIAN | TT_OS2_CPR2_CYRILLIC };
-static nsFontCharSetInfoXlib TIS620 =
+static nsFontCharSetInfoXlib TIS6202 =
 /* Added to support thai context sensitive shaping if
  * CTL extension is is in force */
 #ifdef SUNCTL
   { "tis620-2", SingleByteConvert, 0,
     TT_OS2_CPR1_THAI, 0 };
 #else
-  { "TIS-620", SingleByteConvert, 0,
+  { "windows-874", SingleByteConvert, 0,
     TT_OS2_CPR1_THAI, 0 };
 #endif /* SUNCTL */
+static nsFontCharSetInfoXlib TIS620 =
+  { "TIS-620", SingleByteConvert, 0,
+    TT_OS2_CPR1_THAI, 0 };
+static nsFontCharSetInfoXlib ISO885911 =
+  { "ISO-8859-11", SingleByteConvert, 0,
+    TT_OS2_CPR1_THAI, 0 };
 static nsFontCharSetInfoXlib Big5 =
   { "x-x-big5", DoubleByteConvert, 1,
     TT_OS2_CPR1_CHINESE_TRAD, 0 };
@@ -618,7 +624,8 @@ static const nsFontCharSetMapXlib gConstCharSetMap[] =
   { "tis620.2533-0",      &FLG_THAI,    &TIS620        },
   { "tis620.2533-1",      &FLG_THAI,    &TIS620        },
   { "tis620-0",           &FLG_THAI,    &TIS620        },
-  { "iso8859-11",         &FLG_THAI,    &TIS620        },
+  { "tis620-2",           &FLG_THAI,    &TIS6202       },
+  { "iso8859-11",         &FLG_THAI,    &ISO885911     },
   { "ucs2.cjk-0",         &FLG_NONE,    &ISO106461     },
   { "ucs2.cjk_china-0",   &FLG_ZHCN,    &ISO106461     },
   { "ucs2.cjk_japan-0",   &FLG_JA,      &ISO106461     },

intl/uconv/src/charsetData.properties

@@ -118,6 +118,8 @@ koi8-u.LangGroup                   = x-cyrillic
 shift_jis.LangGroup                = ja
 tis-620.LangGroup                  = th
 tis620-2.LangGroup                 = th
+windows-874.LangGroup              = th
+iso-8859-11.LangGroup              = th
 x-thaittf-0.LangGroup              = th
 us-ascii.LangGroup                 = x-western
 utf-16be.LangGroup                 = x-unicode

intl/uconv/src/charsetTitles.properties

@@ -79,6 +79,9 @@ viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 geostd8.title = Georgian (GEOSTD8)
 tis-620.title = Thai (TIS-620)
+iso-8859-11.title = Thai (ISO-8859-11)
+windows-874.title = Thai (Windows-874)
+ibm874.title = Thai (IBM-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-6-i.title = Arabic (ISO-8859-6-I)

intl/uconv/src/charsetalias.properties

@@ -56,7 +56,7 @@ 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-11=TIS-620
+iso-8859-11=ISO-8859-11
 iso-8859-13=ISO-8859-13
 iso-8859-14=ISO-8859-14
 iso-8859-15=ISO-8859-15
@@ -150,7 +150,7 @@ iso8859-7=ISO-8859-7
 iso8859-8=ISO-8859-8
 iso8859-9=ISO-8859-9
 iso8859-10=ISO-8859-10
-iso8859-11=TIS-620
+iso8859-11=ISO-8859-11
 iso8859-13=ISO-8859-13
 iso8859-14=ISO-8859-14
 iso8859-15=ISO-8859-15
@@ -338,9 +338,8 @@ x-cp1258=windows-1258
 ##
 ## Aliases for windows-874 
 ##
-windows-874=TIS-620
-ibm874=TIS-620
-tis620.2533=TIS-620
+windows-874=windows-874
+ibm874=windows-874
 ##
 ## Aliases for IBM866
 ##
@@ -465,7 +464,7 @@ iso88597=ISO-8859-7
 iso88598=ISO-8859-8
 iso88599=ISO-8859-9
 iso885910=ISO-8859-10
-iso885911=TIS-620
+iso885911=ISO-8859-11
 iso885912=ISO-8859-12
 iso885913=ISO-8859-13
 iso885914=ISO-8859-14

intl/uconv/src/nsUConvModule.cpp

@@ -116,6 +116,8 @@
 #include "nsCP1257ToUnicode.h"
 #include "nsCP1258ToUnicode.h"
 #include "nsCP874ToUnicode.h"
+#include "nsISO885911ToUnicode.h"
+#include "nsTIS620ToUnicode.h"
 #include "nsCP866ToUnicode.h"
 #include "nsKOI8RToUnicode.h"
 #include "nsKOI8UToUnicode.h"
@@ -167,6 +169,8 @@
 #include "nsUnicodeToCP1257.h"
 #include "nsUnicodeToCP1258.h"
 #include "nsUnicodeToCP874.h"
+#include "nsUnicodeToISO885911.h"
+#include "nsUnicodeToTIS620.h"
 #include "nsUnicodeToCP866.h"
 #include "nsUnicodeToKOI8R.h"
 #include "nsUnicodeToKOI8U.h"
@@ -342,7 +346,9 @@ NS_UCONV_REG_UNREG("windows-1255", NS_CP1255TOUNICODE_CID, NS_UNICODETOCP1255_CI
 NS_UCONV_REG_UNREG("windows-1256", NS_CP1256TOUNICODE_CID, NS_UNICODETOCP1256_CID)
 NS_UCONV_REG_UNREG("windows-1257", NS_CP1257TOUNICODE_CID, NS_UNICODETOCP1257_CID)
 NS_UCONV_REG_UNREG("windows-1258", NS_CP1258TOUNICODE_CID, NS_UNICODETOCP1258_CID)
-NS_UCONV_REG_UNREG("TIS-620", NS_CP874TOUNICODE_CID, NS_UNICODETOCP874_CID)
+NS_UCONV_REG_UNREG("TIS-620", NS_TIS620TOUNICODE_CID, NS_UNICODETOTIS620_CID)
+NS_UCONV_REG_UNREG("windows-874", NS_CP874TOUNICODE_CID, NS_UNICODETOCP874_CID)
+NS_UCONV_REG_UNREG("ISO-8859-11", NS_ISO885911TOUNICODE_CID, NS_UNICODETOISO885911_CID)
 NS_UCONV_REG_UNREG("IBM866", NS_CP866TOUNICODE_CID, NS_UNICODETOCP866_CID)
 NS_UCONV_REG_UNREG("KOI8-R", NS_KOI8RTOUNICODE_CID, NS_UNICODETOKOI8R_CID)
 NS_UCONV_REG_UNREG("KOI8-U", NS_KOI8UTOUNICODE_CID, NS_UNICODETOKOI8U_CID)
@@ -924,8 +930,18 @@ static const nsModuleComponentInfo components[] =
     nsCP1258ToUnicodeConstructor ,
   },
   { 
-    DECODER_NAME_BASE "TIS-620" , NS_CP874TOUNICODE_CID, 
+    DECODER_NAME_BASE "TIS-620" , NS_TIS620TOUNICODE_CID, 
     NS_UNICODEDECODER_CONTRACTID_BASE "TIS-620",
+    nsTIS620ToUnicodeConstructor ,
+  },
+  { 
+    DECODER_NAME_BASE "ISO-8859-11" , NS_ISO885911TOUNICODE_CID, 
+    NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-11",
+    nsISO885911ToUnicodeConstructor ,
+  },
+  { 
+    DECODER_NAME_BASE "windows-874" , NS_CP874TOUNICODE_CID, 
+    NS_UNICODEDECODER_CONTRACTID_BASE "windows-874",
     nsCP874ToUnicodeConstructor ,
   },
   { 
@@ -1219,9 +1235,19 @@ static const nsModuleComponentInfo components[] =
     nsUnicodeToCP1258Constructor, 
   },
   { 
-    ENCODER_NAME_BASE "TIS-620" , NS_UNICODETOCP874_CID, 
+    ENCODER_NAME_BASE "TIS-620" , NS_UNICODETOTIS620_CID, 
     NS_UNICODEENCODER_CONTRACTID_BASE "TIS-620",
-    nsUnicodeToCP874Constructor, 
+    nsUnicodeToTIS620Constructor, 
+  },
+  { 
+    ENCODER_NAME_BASE "ISO-8859-11" , NS_UNICODETOISO885911_CID, 
+    NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-11",
+    nsUnicodeToISO885911Constructor ,
+  },
+  { 
+    ENCODER_NAME_BASE "windows-874" , NS_UNICODETOCP874_CID, 
+    NS_UNICODEENCODER_CONTRACTID_BASE "windows-874",
+    nsUnicodeToCP874Constructor ,
   },
   { 
     ENCODER_NAME_BASE "IBM866" , NS_UNICODETOCP866_CID, 

intl/uconv/ucvlatin/8859-11.uf

@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Netscape Public License
+* Version 1.0 (the "NPL"); you may not use this file except in
+* compliance with the NPL.  You may obtain a copy of the NPL at
+* http://www.mozilla.org/NPL/
+*
+* Software distributed under the NPL is distributed on an "AS IS" basis, 
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL 
+* for the specific language governing rights and limitations under the 
+* NPL. 
+*
+* The Initial Developer of this code under the NPL is Netscape
+* Communications Corporation.  Portions created by Netscape are
+* Copyright (C) 2001 Netscape Communications Corporation.  All Rights
+* Reserved.
+*/
+ /*========================================================
+  This is a Generated file. Please don't edit it.
+
+  The tool which used to generate this file is called umaptable.
+  You can find this tool under mozilla/intl/uconv/tools/umaptable.c.
+  If you have any problem of this file. Please contact 
+  Netscape Client International Team or 
+  ftang@netscape <Frank Tang> 
+
+              Table in Debug form 
+Begin of Item 0000
+ Format 0
+  srcBegin = 0000
+  srcEnd = 007F
+  destBegin = 0000
+End of Item 0000 
+
+Begin of Item 0001
+ Format 0
+  srcBegin = 0E01
+  srcEnd = 0E3A
+  destBegin = 00A1
+End of Item 0001 
+
+Begin of Item 0002
+ Format 0
+  srcBegin = 0E3F
+  srcEnd = 0E5B
+  destBegin = 00DF
+End of Item 0002 
+
+Begin of Item 0003
+ Format 2
+  srcBegin = 00A0
+  destBegin = 00A0
+End of Item 0003 
+
+========================================================*/
+/* Offset=0x0000  ItemOfList */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0001  offsetToFormatArray */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0002  offsetToMapCellArray */ 
+  0x0006,
+/*-------------------------------------------------------*/
+/* Offset=0x0003  offsetToMappingTable */ 
+  0x0012,
+/*-------------------------------------------------------*/
+/*       Offset=0x0004   Start of Format Array */ 
+/*	Total of Format 0 : 0x0003			 */
+/*	Total of Format 1 : 0x0000			 */
+/*	Total of Format 2 : 0x0001			 */
+/*	Total of Format 3 : 0x0000			 */
+
+0x2000, 0x0000, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0006   Start of MapCell Array */ 
+/* 0000 */    0x0000, 0x007F, 0x0000, 
+/* 0001 */    0x0E01, 0x0E3A, 0x00A1, 
+/* 0002 */    0x0E3F, 0x0E5B, 0x00DF, 
+/* 0003 */    0x00A0, 0x0000, 0x00A0, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0012   Start of MappingTable */ 
+
+/*	End of table Total Length = 0x0012 * 2 */

intl/uconv/ucvlatin/8859-11.ut

@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Netscape Public License
+* Version 1.0 (the "NPL"); you may not use this file except in
+* compliance with the NPL.  You may obtain a copy of the NPL at
+* http://www.mozilla.org/NPL/
+*
+* Software distributed under the NPL is distributed on an "AS IS" basis, 
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL 
+* for the specific language governing rights and limitations under the 
+* NPL. 
+*
+* The Initial Developer of this code under the NPL is Netscape
+* Communications Corporation.  Portions created by Netscape are
+* Copyright (C) 2001 Netscape Communications Corporation.  All Rights
+* Reserved.
+*/
+ /*========================================================
+  This is a Generated file. Please don't edit it.
+
+  The tool which used to generate this file is called umaptable.
+  You can find this tool under mozilla/intl/uconv/tools/umaptable.c.
+  If you have any problem of this file. Please contact 
+  Netscape Client International Team or 
+  ftang@netscape <Frank Tang> 
+
+              Table in Debug form 
+Begin of Item 0000
+ Format 0
+  srcBegin = 0000
+  srcEnd = 007F
+  destBegin = 0000
+End of Item 0000 
+
+Begin of Item 0001
+ Format 0
+  srcBegin = 00A1
+  srcEnd = 00DA
+  destBegin = 0E01
+End of Item 0001 
+
+Begin of Item 0002
+ Format 0
+  srcBegin = 00DF
+  srcEnd = 00FB
+  destBegin = 0E3F
+End of Item 0002 
+
+Begin of Item 0003
+ Format 2
+  srcBegin = 00A0
+  destBegin = 00A0
+End of Item 0003 
+
+========================================================*/
+/* Offset=0x0000  ItemOfList */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0001  offsetToFormatArray */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0002  offsetToMapCellArray */ 
+  0x0006,
+/*-------------------------------------------------------*/
+/* Offset=0x0003  offsetToMappingTable */ 
+  0x0012,
+/*-------------------------------------------------------*/
+/*       Offset=0x0004   Start of Format Array */ 
+/*	Total of Format 0 : 0x0003			 */
+/*	Total of Format 1 : 0x0000			 */
+/*	Total of Format 2 : 0x0001			 */
+/*	Total of Format 3 : 0x0000			 */
+
+0x2000, 0x0000, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0006   Start of MapCell Array */ 
+/* 0000 */    0x0000, 0x007F, 0x0000, 
+/* 0001 */    0x00A1, 0x00DA, 0x0E01, 
+/* 0002 */    0x00DF, 0x00FB, 0x0E3F, 
+/* 0003 */    0x00A0, 0x0000, 0x00A0, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0012   Start of MappingTable */ 
+
+/*	End of table Total Length = 0x0012 * 2 */

intl/uconv/ucvlatin/Makefile.in

@@ -51,6 +51,7 @@ CPPSRCS		= \
 		nsISO88598IToUnicode.cpp \
 		nsISO88599ToUnicode.cpp \
 		nsISO885910ToUnicode.cpp \
+		nsISO885911ToUnicode.cpp \
 		nsISO885913ToUnicode.cpp \
 		nsISO885914ToUnicode.cpp \
 		nsISO885915ToUnicode.cpp \
@@ -66,6 +67,7 @@ CPPSRCS		= \
 		nsCP1258ToUnicode.cpp \
 		nsCP866ToUnicode.cpp \
 		nsCP874ToUnicode.cpp \
+		nsTIS620ToUnicode.cpp \
 		nsKOI8UToUnicode.cpp \
 		nsKOI8RToUnicode.cpp \
 		nsMacCEToUnicode.cpp \
@@ -111,6 +113,7 @@ CPPSRCS		= \
 		nsUnicodeToISO88598I.cpp \
 		nsUnicodeToISO88599.cpp \
 		nsUnicodeToISO885910.cpp \
+		nsUnicodeToISO885911.cpp \
 		nsUnicodeToISO885913.cpp \
 		nsUnicodeToISO885914.cpp \
 		nsUnicodeToISO885915.cpp \
@@ -125,6 +128,7 @@ CPPSRCS		= \
 		nsUnicodeToCP1257.cpp \
 		nsUnicodeToCP1258.cpp \
 		nsUnicodeToCP874.cpp \
+		nsUnicodeToTIS620.cpp \
 		nsUnicodeToCP866.cpp \
 		nsUnicodeToKOI8R.cpp \
 		nsUnicodeToKOI8U.cpp \

intl/uconv/ucvlatin/nsISO885911ToUnicode.cpp

@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org. 
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jungshik Shin <jshin@mailaps.org> 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsUCConstructors.h"
+#include "nsISO885911ToUnicode.h"
+
+NS_METHOD
+nsISO885911ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
+                            void **aResult)
+{
+  // Just make it an alias to CP874 decoder. (bug 127755)
+  return nsCP874ToUnicodeConstructor(aOuter, aIID, aResult);
+}
+

intl/uconv/ucvlatin/nsISO885911ToUnicode.h

@@ -0,0 +1,50 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2003.
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jungshik Shin <jshin@mailaps.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef nsISO885911ToUnicode_h___
+#define nsISO885911ToUnicode_h___
+
+#include "nsCP874ToUnicode.h"
+
+// Just make it an alias to CP874 decoder. (bug 127755)
+NS_METHOD
+nsISO885911ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult);
+
+#endif /* nsISO885911ToUnicode_h___ */
+

intl/uconv/ucvlatin/nsTIS620ToUnicode.cpp

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jungshik Shin <jshin@mailaps.org>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsUCConstructors.h"
+#include "nsTIS620ToUnicode.h"
+
+NS_METHOD
+nsTIS620ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
+                             void **aResult)
+{
+  // Just make it an alias to CP874 decoder. (bug 127755)
+  return nsCP874ToUnicodeConstructor(aOuter, aIID, aResult);
+}
+

intl/uconv/ucvlatin/nsTIS620ToUnicode.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jungshik Shin <jshin@mailaps.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef nsTIS620ToUnicode_h___
+#define nsTIS620ToUnicode_h___
+
+#include "nsCP874ToUnicode.h"
+
+// Just make it an alias to CP874 decoder. (bug 127755)
+NS_METHOD
+nsTIS620ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult);
+
+#endif /* nsTIS620ToUnicode_h___ */
+

intl/uconv/ucvlatin/nsUCvLatinCID.h

@@ -152,6 +152,11 @@
 #define NS_CP874TOUNICODE_CID \
   { 0x6394eea4, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
+// Class ID for our TIS620ToUnicode charset converter
+// {66634f68-be19-42d0-a4ca-d1c21fa059b8}
+#define NS_TIS620TOUNICODE_CID \
+  { 0x66634f68, 0xbe19, 0x42d0, {0xa4, 0xca, 0xd1, 0xc2, 0x1f, 0xa0, 0x59, 0xb8}}
+
 // Class ID for our KOI8RToUnicode charset converter
 // {6394EEA5-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_KOI8RTOUNICODE_CID \
@@ -348,6 +353,11 @@
 #define NS_UNICODETOCP874_CID \
   { 0x6394eeb4, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
+// Class ID for our UnicodeToTIS620 charset converter
+// {c5de4da2-d667-42d2-b8c2-efdbcf3302ef}
+#define NS_UNICODETOTIS620_CID \
+  { 0xc5de4da2, 0xd667, 0x42d2, {0xb8, 0xc2, 0xef, 0xdb, 0xcf, 0x33, 0x02, 0xef}}
+
 // Class ID for our UnicodeToKOI8R charset converter
 // {6394EEB5-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_UNICODETOKOI8R_CID \
@@ -488,6 +498,11 @@
 #define NS_UNICODETOISO885910_CID \
   { 0xba6151ab, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
+// Class ID for our UnicodeToISO885911 charset converter
+// {9c0ff6f4-deda-40e5-806c-b6cc449c21ce}
+#define NS_UNICODETOISO885911_CID \
+  { 0x9c0ff6f4, 0xdeda, 0x40e5, {0x80, 0x6c, 0xb6, 0xcc, 0x44, 0x9c, 0x21, 0xce}}
+
 // Class ID for our UnicodeToISO885913 charset converter
 // {BA6151AC-1DFA-11d3-B3BF-00805F8A6670}
 #define NS_UNICODETOISO885913_CID \
@@ -513,6 +528,11 @@
 #define NS_ISO885910TOUNICODE_CID \
   { 0xba6151b0, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
+// Class ID for our ISO885911ToUnicode charset converter
+// {776588a6-86d5-47e2-b6b3-992810078202}
+#define NS_ISO885911TOUNICODE_CID \
+  { 0x776588a6, 0x86d5, 0x47e2, {0xb6, 0xb3, 0x99, 0x28, 0x10, 0x07, 0x82, 0x02}}
+
 // Class ID for our ISO885913ToUnicode charset converter
 // {BA6151B1-1DFA-11d3-B3BF-00805F8A6670}
 #define NS_ISO885913TOUNICODE_CID \

intl/uconv/ucvlatin/nsUnicodeToISO885911.cpp

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2003.
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frank Tang <ftang@netscape.com>
+ *   Jungshik Shin <jshin@mailaps.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+#include "nsUCConstructors.h"
+#include "nsUnicodeToISO885911.h"
+
+//----------------------------------------------------------------------
+// Global functions and data [declaration]
+
+static const PRUint16 g_ufMappingTable[] = {
+#include "8859-11.uf"
+};
+
+static const PRInt16 g_ufShiftTable[] =  {
+  0, u1ByteCharset ,
+  ShiftCell(0,0,0,0,0,0,0,0)
+};
+
+NS_METHOD
+nsUnicodeToISO885911Constructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult) 
+{
+  return CreateTableEncoder((uShiftTable*) &g_ufShiftTable, 
+                            (uMappingTable*) &g_ufMappingTable, 1,
+                            aOuter, aIID, aResult);
+}
+

intl/uconv/ucvlatin/nsUnicodeToISO885911.h

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2003.
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frank Tang <ftang@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsUnicodeToISO885911_h___
+#define nsUnicodeToISO885911_h___
+
+#include "nsISupports.h"
+
+NS_METHOD
+nsUnicodeToISO885911Constructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult);
+
+#endif /* nsUnicodeToISO885911_h___ */

intl/uconv/ucvlatin/nsUnicodeToTIS620.cpp

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator Client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * 
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frank Tang <ftang@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsUCConstructors.h"
+#include "nsUnicodeToTIS620.h"
+
+//----------------------------------------------------------------------
+// Global functions and data [declaration]
+
+static const PRUint16 g_ufMappingTable[] = {
+#include "tis620.uf"
+};
+
+static const PRInt16 g_ufShiftTable[] =  {
+  0, u1ByteCharset ,
+  ShiftCell(0,0,0,0,0,0,0,0)
+};
+
+NS_METHOD
+nsUnicodeToTIS620Constructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult) 
+{
+  return CreateTableEncoder((uShiftTable*) &g_ufShiftTable, 
+                            (uMappingTable*) &g_ufMappingTable, 1,
+                            aOuter, aIID, aResult);
+}
+

intl/uconv/ucvlatin/nsUnicodeToTIS620.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communication Corporation. 
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frank Tang <ftang@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef nsUnicodeToTIS620_h___
+#define nsUnicodeToTIS620_h___
+
+#include "nsISupports.h"
+
+/**
+ * A character set converter from Unicode to TIS620.
+ *
+ * @created         4/26/1999
+ * @author  Frank Tang [ftang]
+ */
+NS_METHOD
+nsUnicodeToTIS620Constructor(nsISupports *aOuter, REFNSIID aIID,
+                                void **aResult);
+
+#endif /* nsUnicodeToTIS620_h___ */
+

intl/uconv/ucvlatin/tis620.uf

@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Netscape Public License
+* Version 1.0 (the "NPL"); you may not use this file except in
+* compliance with the NPL.  You may obtain a copy of the NPL at
+* http://www.mozilla.org/NPL/
+*
+* Software distributed under the NPL is distributed on an "AS IS" basis, 
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL 
+* for the specific language governing rights and limitations under the 
+* NPL. 
+*
+* The Initial Developer of this code under the NPL is Netscape
+* Communications Corporation.  Portions created by Netscape are
+* Copyright (C) 2001 Netscape Communications Corporation.  All Rights
+* Reserved.
+*/
+ /*========================================================
+  This is a Generated file. Please don't edit it.
+
+  The tool which used to generate this file is called umaptable.
+  You can find this tool under mozilla/intl/uconv/tools/umaptable.c.
+  If you have any problem of this file. Please contact 
+  Netscape Client International Team or 
+  ftang@netscape <Frank Tang> 
+
+              Table in Debug form 
+Begin of Item 0000
+ Format 0
+  srcBegin = 0000
+  srcEnd = 007F
+  destBegin = 0000
+End of Item 0000 
+
+Begin of Item 0001
+ Format 0
+  srcBegin = 0E01
+  srcEnd = 0E3A
+  destBegin = 00A1
+End of Item 0001 
+
+Begin of Item 0002
+ Format 0
+  srcBegin = 0E3F
+  srcEnd = 0E5B
+  destBegin = 00DF
+End of Item 0002 
+
+Begin of Item 0003
+ Format 2
+  srcBegin = 00A0
+  destBegin = 00A0
+End of Item 0003 
+
+========================================================*/
+/* Offset=0x0000  ItemOfList */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0001  offsetToFormatArray */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0002  offsetToMapCellArray */ 
+  0x0006,
+/*-------------------------------------------------------*/
+/* Offset=0x0003  offsetToMappingTable */ 
+  0x0012,
+/*-------------------------------------------------------*/
+/*       Offset=0x0004   Start of Format Array */ 
+/*	Total of Format 0 : 0x0003			 */
+/*	Total of Format 1 : 0x0000			 */
+/*	Total of Format 2 : 0x0001			 */
+/*	Total of Format 3 : 0x0000			 */
+
+0x2000, 0x0000, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0006   Start of MapCell Array */ 
+/* 0000 */    0x0000, 0x007F, 0x0000, 
+/* 0001 */    0x0E01, 0x0E3A, 0x00A1, 
+/* 0002 */    0x0E3F, 0x0E5B, 0x00DF, 
+/* 0003 */    0x00A0, 0x0000, 0x00A0, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0012   Start of MappingTable */ 
+
+/*	End of table Total Length = 0x0012 * 2 */

intl/uconv/ucvlatin/tis620.ut

@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Netscape Public License
+* Version 1.0 (the "NPL"); you may not use this file except in
+* compliance with the NPL.  You may obtain a copy of the NPL at
+* http://www.mozilla.org/NPL/
+*
+* Software distributed under the NPL is distributed on an "AS IS" basis, 
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL 
+* for the specific language governing rights and limitations under the 
+* NPL. 
+*
+* The Initial Developer of this code under the NPL is Netscape
+* Communications Corporation.  Portions created by Netscape are
+* Copyright (C) 2001 Netscape Communications Corporation.  All Rights
+* Reserved.
+*/
+ /*========================================================
+  This is a Generated file. Please don't edit it.
+
+  The tool which used to generate this file is called umaptable.
+  You can find this tool under mozilla/intl/uconv/tools/umaptable.c.
+  If you have any problem of this file. Please contact 
+  Netscape Client International Team or 
+  ftang@netscape <Frank Tang> 
+
+              Table in Debug form 
+Begin of Item 0000
+ Format 0
+  srcBegin = 0000
+  srcEnd = 007F
+  destBegin = 0000
+End of Item 0000 
+
+Begin of Item 0001
+ Format 0
+  srcBegin = 00A1
+  srcEnd = 00DA
+  destBegin = 0E01
+End of Item 0001 
+
+Begin of Item 0002
+ Format 0
+  srcBegin = 00DF
+  srcEnd = 00FB
+  destBegin = 0E3F
+End of Item 0002 
+
+Begin of Item 0003
+ Format 2
+  srcBegin = 00A0
+  destBegin = 00A0
+End of Item 0003 
+
+========================================================*/
+/* Offset=0x0000  ItemOfList */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0001  offsetToFormatArray */
+  0x0004,
+/*-------------------------------------------------------*/
+/* Offset=0x0002  offsetToMapCellArray */ 
+  0x0006,
+/*-------------------------------------------------------*/
+/* Offset=0x0003  offsetToMappingTable */ 
+  0x0012,
+/*-------------------------------------------------------*/
+/*       Offset=0x0004   Start of Format Array */ 
+/*	Total of Format 0 : 0x0003			 */
+/*	Total of Format 1 : 0x0000			 */
+/*	Total of Format 2 : 0x0001			 */
+/*	Total of Format 3 : 0x0000			 */
+
+0x2000, 0x0000, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0006   Start of MapCell Array */ 
+/* 0000 */    0x0000, 0x007F, 0x0000, 
+/* 0001 */    0x00A1, 0x00DA, 0x0E01, 
+/* 0002 */    0x00DF, 0x00FB, 0x0E3F, 
+/* 0003 */    0x00A0, 0x0000, 0x00A0, 
+/*-------------------------------------------------------*/
+/*       Offset=0x0012   Start of MappingTable */ 
+
+/*	End of table Total Length = 0x0012 * 2 */

xpfe/browser/resources/locale/en-US/navigator.properties

@@ -23,7 +23,7 @@ intl.charsetmenu.browser.static=iso-8859-1
 intl.charsetmenu.browser.more1=iso-8859-1, iso-8859-15, ibm850, x-mac-roman, windows-1252, iso-8859-14, iso-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, iso-8859-10, iso-8859-3
 intl.charsetmenu.browser.more2=iso-8859-4, iso-8859-13, windows-1257, ibm852, iso-8859-2, x-mac-ce, windows-1250, x-mac-croatian, ibm855, iso-8859-5, iso-ir-111, koi8-r, x-mac-cyrillic, windows-1251, ibm866, koi8-u, x-mac-ukrainian, iso-8859-16, x-mac-romanian
 intl.charsetmenu.browser.more3=gb2312, x-gbk, gb18030, hz-gb-2312, iso-2022-cn, big5, big5-hkscs, x-euc-tw, euc-jp, iso-2022-jp, shift_jis, euc-kr, x-windows-949, x-johab, iso-2022-kr
-intl.charsetmenu.browser.more4=armscii-8, geostd8, tis-620, ibm857, iso-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, viscii, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
+intl.charsetmenu.browser.more4=armscii-8, geostd8, tis-620, iso-8859-11, windows-874, ibm857, iso-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, viscii, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
 intl.charsetmenu.browser.more5=iso-8859-6, windows-1256, ibm864, x-mac-arabic, x-mac-farsi, iso-8859-8-i, windows-1255, iso-8859-8, ibm862, x-mac-hebrew
 intl.charset.default=ISO-8859-1
 intl.charset.detector=