Correcting font encodings for GB18030, GBK and BIG5-HKSCS. Adding nls support for those encodings (Bugzilla 1573, James Su).

15 files changed, 293 insertions, 205 deletions

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 3a9d1248..e64261da 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -213,6 +213,11 @@ microsoft-cp1255/Compose:	yi_US.CP1256
 zh_CN/Compose:			zh_CN.eucCN
 zh_CN/Compose:			zh_CN.GB2312
 zh_CN.gbk/Compose:		zh_CN.GBK
+zh_CN.gb18030/Compose:		zh_CN.GB18030
+zh_HK.big5/Compose:		zh_HK.big5
+zh_HK.big5/Compose:		zh_HK.Big5
+zh_HK.big5hkscs/Compose:	zh_HK.big5hkscs
+zh_HK.big5hkscs/Compose:	zh_HK.Big5HKSCS
 zh_TW.big5/Compose:		zh_TW.big5
 zh_TW.big5/Compose:		zh_TW.Big5
 zh_TW/Compose:			zh_TW.eucTW
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 0842efbf..1cc0544e 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1,4 +1,4 @@
-XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.3 2004-10-18 14:21:45 eich Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.4 2004-10-18 17:29:03 eich Exp $
 XCOMM	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains alias name of locale.
@@ -66,7 +66,7 @@ ar_YE.utf8:					ar_YE.UTF-8
 az:						az_AZ.ISO8859-9E
 az_AZ:						az_AZ.ISO8859-9E
 az_AZ.iso88599e:				az_AZ.ISO8859-9E
-a3:						a3_AZKOI8-C
+a3:						a3_AZ.KOI8-C
 a3_AZ:						a3_AZ.KOI8-C
 a3_AZ.koi8c:					a3_AZ.KOI8-C
 be:						be_BY.CP1251
@@ -826,6 +826,7 @@ zh_CN.Big5:					zh_TW.big5
 zh_CN.EUC:					zh_CN.eucCN
 zh_CN.GB2312:					zh_CN.gb2312
 zh_CN.GBK:					zh_CN.gbk
+zh_CN.GB18030:					zh_CN.gb18030
 zh_CN.big5:					zh_TW.big5
 zh_CN.euc:					zh_CN.eucCN
 zh_CN.utf8:					zh_CN.UTF-8
@@ -839,7 +840,7 @@ zh_HK.BIG5-HKSCS:				zh_HK.big5hkscs
 zh_HK.BIG5_HKSCS:				zh_HK.big5hkscs
 zh_HK.Big5:					zh_HK.big5
 zh_HK.utf8:					zh_HK.UTF-8
-ZH_HK.UTF-8:					zh_CN.UTF-8
+ZH_HK.UTF-8:					zh_HK.UTF-8
 ZH_SG.UTF-8:					zh_SG.UTF-8
 zh_TW:						zh_TW.big5
 zh_TW.Big5:					zh_TW.big5
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 6e4b09ae..5bd4a507 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -1,4 +1,4 @@
-XCOMM	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.2 2004-04-23 18:44:33 eich Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.3 2004-10-18 17:29:03 eich Exp $
 XCOMM	$Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains locale database file names
@@ -228,6 +228,7 @@ microsoft-cp1255/XLC_LOCALE:		yi_US.CP1255
 zh_CN/XLC_LOCALE:			zh_CN.eucCN
 zh_CN/XLC_LOCALE:			zh_CN.gb2312
 zh_CN.gbk/XLC_LOCALE:			zh_CN.gbk
+zh_CN.gb18030/XLC_LOCALE:		zh_CN.gb18030
 zh_HK.big5/XLC_LOCALE:			zh_HK.big5
 zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.big5-hkscs
 zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.Big5-HKSCS
@@ -383,7 +384,7 @@ en_US.UTF-8/XLC_LOCALE:			vi_VN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			wa_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			yi_US.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
-zh_CN.UTF-8/XLC_LOCALE:			zh_HK.UTF-8
+zh_HK.UTF-8/XLC_LOCALE:			zh_HK.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_SG.UTF-8
 zh_TW.UTF-8/XLC_LOCALE:			zh_TW.UTF-8
 #ifdef __uxp__
diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
index 6d43fcca..0979d86a 100644
--- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre
+++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
@@ -2,7 +2,7 @@ XCOMM     XFree86 NLS for Chinese locale zh_CN.UTF-8
 XCOMM          Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
 XCOMM          by James Su <suzhe@turbolinux.com.cn>
 XCOMM
-XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.2 2004-04-23 18:44:34 eich Exp $
+XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.3 2004-10-18 17:29:03 eich Exp $
 XCOMM $XFree86$
 
 XCOMM 
@@ -58,39 +58,8 @@ fs3    {
        }
 }
 
-XCOMM 	fs4 class (Kanji)
-fs4	{
-	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-		primary	JISX0208.1983-0:GL
-	}
-}
-
-XCOMM   fs5 class (Korean Character)
-fs5	{
-	charset	{
-		name	KSC5601.1987-0:GL
-	}
-	font	{
-		primary	KSC5601.1987-0:GL
-	}
-}
-
-XCOMM	fs6 class (Half Kana)
-fs6	{
-	charset	{
-		name	JISX0201.1976-0:GR
-	}
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-
-XCOMM  fs7 class
-fs7    {
+XCOMM  fs4 class
+fs4    {
        charset {
                name    ISO10646-1
        }
diff --git a/nls/zh_CN.gb18030/Compose.pre b/nls/zh_CN.gb18030/Compose.pre
new file mode 100644
index 00000000..5327716b
--- /dev/null
+++ b/nls/zh_CN.gb18030/Compose.pre
@@ -0,0 +1,15 @@
+XCOMM
+XCOMM zh_CN.GB18030 Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM $XFree86: xc/nls/Compose/zh_CN.gb18030,v 1.2 2001/04/26 21:09:40 dawes Exp $
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff --git a/nls/zh_CN.gb18030/XI18N_OBJS b/nls/zh_CN.gb18030/XI18N_OBJS
new file mode 100644
index 00000000..a92b4033
--- /dev/null
+++ b/nls/zh_CN.gb18030/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for zh_CN.gb18030 locale
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/nls/zh_CN.gb18030/XLC_LOCALE.pre b/nls/zh_CN.gb18030/XLC_LOCALE.pre
new file mode 100644
index 00000000..f9544c70
--- /dev/null
+++ b/nls/zh_CN.gb18030/XLC_LOCALE.pre
@@ -0,0 +1,106 @@
+XCOMM     XFree86 NLS for Chinese encoding GB18030
+XCOMM		Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
+XCOMM    	by James Su <suzhe@turbolinux.com.cn>
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+
+on_demand_loading	True
+
+object_name		generic
+
+XCOMM	We leave the legacy encodings in for the moment, because we don't
+XCOMM	have that many ISO10646 fonts yet.
+XCOMM 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+
+XCOMM	fs1 class (ISO8859 families)
+fs1	{
+	charset	{
+		name	ISO8859-1:GR
+	}
+	font	{
+		primary	ISO8859-1:GR
+	}
+}
+
+XCOMM	fs2 class (Chinese Han Character)
+fs2	{
+	charset	{
+		name	GB2312.1980-0:GL
+	}
+	font	{
+		primary	GB2312.1980-0:GL
+	}
+}
+
+XCOMM	fs3 class (Chinese Han Character GBK)
+fs3	{
+	charset	{
+		name    GBK-0:GLGR
+	}
+	font	{
+		primary GBK-0:GLGR
+		substitute GB13000.1993-1:GLGR
+	}
+}
+
+XCOMM	fs4 class
+fs4	{
+	charset	{
+		name	ISO10646-1
+	}
+	font	{
+		primary	GB18030-0
+		substitute GBK2K-0
+	}
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		GB18030
+mb_cur_max		4
+state_depend_encoding	False
+
+XCOMM	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	ct_encoding	ISO8859-1:GL
+}
+
+XCOMM	cs1 class
+cs1	{
+	side            GR:Default
+	length          1
+	ct_encoding     ISO8859-1:GR
+}
+ 
+XCOMM	cs2 class
+cs2	{
+	side            GR
+	length          2
+	ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
+XCOMM	cs3 class
+cs3	{
+	side		none
+	ct_encoding	ISO10646-1
+}
+
+END XLC_XLOCALE
diff --git a/nls/zh_CN.gbk/XLC_LOCALE.pre b/nls/zh_CN.gbk/XLC_LOCALE.pre
index 6ec238e0..d90e82f6 100644
--- a/nls/zh_CN.gbk/XLC_LOCALE.pre
+++ b/nls/zh_CN.gbk/XLC_LOCALE.pre
@@ -62,7 +62,7 @@ cs1	{
 	byte2		\x40,\x7e;\x80,\xfe
 
 	wc_encoding	\x00008000
-	ct_encoding	GBK-0:GLGR:\x1b\x25\x2f\x32\x80\x88\x47\x42\x4b\x2d\x30\x02
+	ct_encoding	GBK-0:GLGR:\x1b\x25\x2f\x32
 
 	mb_conversion	[\x8140,\xfefe]->\x0140
 	ct_conversion	[\x0140,\x7efe]->\x8140
diff --git a/nls/zh_HK.UTF-8/XI18N_OBJS b/nls/zh_HK.UTF-8/XI18N_OBJS
new file mode 100644
index 00000000..e9d5ef8a
--- /dev/null
+++ b/nls/zh_HK.UTF-8/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for zh_HK.UTF-8 locale
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/nls/zh_HK.UTF-8/XLC_LOCALE.pre b/nls/zh_HK.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 00000000..c0880325
--- /dev/null
+++ b/nls/zh_HK.UTF-8/XLC_LOCALE.pre
@@ -0,0 +1,96 @@
+XCOMM     XFree86 NLS for Chinese locale zh_HK.UTF-8
+XCOMM          Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
+XCOMM          by James Su <suzhe@turbolinux.com.cn>
+
+XCOMM 
+XCOMM  XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+
+on_demand_loading      True
+
+object_name            generic
+
+XCOMM  We leave the legacy encodings in for the moment, because we don't
+XCOMM  have that many ISO10646 fonts yet.
+XCOMM  fs0 class (7 bit ASCII)
+fs0    {
+       charset {
+               name    ISO8859-1:GL
+       }
+       font    {
+               primary ISO8859-1:GL
+               vertical_rotate all
+       }
+}
+
+XCOMM  fs1 class (ISO8859 families)
+fs1    {
+       charset {
+               name    ISO8859-1:GR
+       }
+       font    {
+               primary ISO8859-1:GR
+       }
+}
+
+XCOMM   fs2 class
+fs2    {
+       charset {
+               name    BIG5HKSCS-0:GLGR
+       }
+       font    {
+               primary BIG5HKSCS-0:GLGR
+               substitute BIG5-0:GLGR
+       }
+}
+
+XCOMM  fs3 class
+fs3    {
+       charset {
+               name    ISO10646-1
+       }
+       font    {
+               primary ISO10646-1
+       }
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM  XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name          UTF-8
+mb_cur_max             6
+state_depend_encoding  False
+
+XCOMM  cs0 class
+cs0    {
+       side            GL:Default
+       length          1
+       ct_encoding     ISO8859-1:GL
+}
+
+XCOMM  cs1 class
+cs1     {
+        side            GR:Default
+        length          1
+        ct_encoding     ISO8859-1:GR
+}
+ 
+XCOMM  cs2 class
+cs2    {
+       side            none
+       length          2
+       ct_encoding     BIG5HKSCS-0:GLGR
+}
+
+XCOMM  cs3 class
+cs3    {
+       side            none
+       ct_encoding     ISO10646-1
+}
+
+END XLC_XLOCALE
+
diff --git a/nls/zh_HK.big5/Compose.pre b/nls/zh_HK.big5/Compose.pre
new file mode 100644
index 00000000..79dd3a00
--- /dev/null
+++ b/nls/zh_HK.big5/Compose.pre
@@ -0,0 +1,13 @@
+XCOMM
+XCOMM zh_HK.big5 Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff --git a/nls/zh_HK.big5/XI18N_OBJS b/nls/zh_HK.big5/XI18N_OBJS
new file mode 100644
index 00000000..826c7983
--- /dev/null
+++ b/nls/zh_HK.big5/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for zh_HK.big5 locale
+#
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/nls/zh_HK.big5hkscs/Compose.pre b/nls/zh_HK.big5hkscs/Compose.pre
new file mode 100644
index 00000000..a06611f0
--- /dev/null
+++ b/nls/zh_HK.big5hkscs/Compose.pre
@@ -0,0 +1,13 @@
+XCOMM
+XCOMM zh_HK.big5hkscs Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff --git a/nls/zh_HK.big5hkscs/XLC_LOCALE.pre b/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
index d5955e09..4fc6b6cd 100644
--- a/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
+++ b/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
@@ -19,20 +19,11 @@ fs0	{
 		vertical_rotate	all
         }
 }
-XCOMM fs1 class (standard Big5)
+
+XCOMM fs1 class (HKSCS extensions)
 fs1	{
 	charset	{
-		name	BIG5-0:GLGR;BIG5-1:GLGR;BIG5-2:GLGR
-	}
-	font    {
-		primary		BIG5-0:GLGR
-		substitute	BIG5-0:GLGR
-	}
-}
-XCOMM fs2 class (HKSCS extensions)
-fs2	{
-	charset	{
-		name	BIG5HKSCS-0:GLGR;BIG5HKSCS-1:GLGR;BIG5HKSCS-2:GLGR
+		name	BIG5HKSCS-0:GLGR
 	}
 	font	{
 		primary		BIG5HKSCS-0:GLGR
@@ -46,7 +37,7 @@ XCOMM	XLC_XLOCALE category
 XCOMM
 XLC_XLOCALE
 
-encoding_name		zh_HK.Big5HKSCS
+encoding_name		zh_HK.big5hkscs
 mb_cur_max		2
 state_depend_encoding	False
 
@@ -56,6 +47,7 @@ wc_shift_bits		8
 use_stdc_env		True
 force_convert_to_mb	True
 
++XCOMM	cs0 class
 cs0	{
 	side		GL:Default
 	length		1
@@ -63,89 +55,18 @@ cs0	{
 	ct_encoding	ISO8859-1:GL
 }
 
-XCOMM standard Big5, A140-C5FE + C940-F8FE
+XCOMM	cs1 class
 cs1	{
 	side		none
 	length		2
-	byte1		\xa1,\xc5;\xc9,\xf8
-	byte2		\x40,\x7e;\xa1,\xfe
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02
-
-	mb_conversion	[\x8140,\xfefe]->\x0140
-	ct_conversion	[\x0140,\x7efe]->\x8140
-}
-
-XCOMM standard Big5, C640-C67E
-cs2	{
-	side		none
-	length		2
-	byte1		\xc6
-	byte2		\x40,\x7e
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5-1:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x31\x02
-
-	mb_conversion	[\x8140,\xfefe]->\x0140
-	ct_conversion	[\x0140,\x7efe]->\x8140
-}
-
-XCOMM standard Big5, F940-F9D5
-cs3	{
-	side		none
-	length		2
-	byte1		\xf9
-	byte2		\x40,\xd5
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5-2:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x32\x02
-
-	mb_conversion	[\x8140,\xfefe]->\x0140
-	ct_conversion	[\x0140,\x7efe]->\x8140
-}
-
-
-XCOMM HKSCS extensions, 8540-A0FE + C740-C8FE + FA40-FEFE
-cs4     {
-	side		none
-	length		2
-	byte1		\x85,\xa0;\xc7,\xc8;\xfa,\xfe
+	byte1		\x85,\xfe
 	byte2		\x40,\x7e;\xa1,\xfe
 
 	wc_encoding	\x00008000
-	ct_encoding	BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x30\x02
-
-	mb_conversion	[\x8140,\xfefe]->\0x0140
-	ct_conversion	[\x0140,\x7efe]->\0x8140
-}
-
-XCOMM HKSCS extensions, C6A1-C6FE
-cs5     {
-	side		none
-	length		2
-	byte1		\xc6
-	byte2		\xa1,\xfe
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5HKSCS-1:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x31\x02
-
-	mb_conversion	[\x8140,\xfefe]->\0x0140
-	ct_conversion	[\x0140,\x7efe]->\0x8140
-}
-
-XCOMM HKSCS extensions, F9D6-F9FE
-cs6     {
-	side		none
-	length		2
-	byte1		\xf9
-	byte2		\xd6,\xfe
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5HKSCS-2:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x32\x02
+	ct_encoding	BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32
 
-	mb_conversion	[\x8140,\xfefe]->\0x0140
-	ct_conversion	[\x0140,\x7efe]->\0x8140
+	mb_conversion	[\x8540,\xfefe]->\x0540
+	ct_conversion	[\x0540,\x7efe]->\x8540
 }
 
 END XLC_XLOCALE
diff --git a/nls/zh_TW.UTF-8/XLC_LOCALE.pre b/nls/zh_TW.UTF-8/XLC_LOCALE.pre
index 4d1166af..86b65f80 100644
--- a/nls/zh_TW.UTF-8/XLC_LOCALE.pre
+++ b/nls/zh_TW.UTF-8/XLC_LOCALE.pre
@@ -42,46 +42,9 @@ fs2	{
 				substitute BIG5-0:GLGR
         }
 }
-XCOMM 	fs3 class (Kanji)
+XCOMM	fs3 class
 fs3	{
 	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-		primary	JISX0208.1983-0:GL
-	}
-}
-XCOMM   fs4 class (Korean Character)
-fs4	{
-	charset	{
-		name	KSC5601.1987-0:GL
-	}
-	font	{
-		primary	KSC5601.1987-0:GL
-	}
-}
-XCOMM   fs5 class (Chinese Han Character)
-fs5	{
-	charset	{
-		name	GB2312.1980-0:GL
-	}
-	font	{
-		primary	GB2312.1980-0:GL
-	}
-}
-XCOMM	fs6 class (Half Kana)
-fs6	{
-	charset	{
-		name	JISX0201.1976-0:GR
-	}
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM	fs7 class
-fs7	{
-	charset	{
 		name	ISO10646-1
 	}
 	font	{
@@ -117,47 +80,11 @@ XCOMM	cs2 class
 cs2	{
 	side		none
 	length		2
-	byte1		\xa1,\xf9
-	byte2		\x40,\x7e;\xa1,\xfe
-
-	wc_encoding	\x00008000
-	ct_encoding	BIG5-0:GLGR:\x1b\x25\x2f\x32
-
-	mb_conversion	[\xa140,\xf9fe]->\x2140
-	ct_conversion	[\x2140,\x79fe]->\xa140
+	ct_encoding	BIG5-0:GLGR
 }
+
 XCOMM	cs3 class
 cs3	{
-	side		GR
-	length		2
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-
-}
-
-XCOMM	cs4 class
-cs4     {
-        side            GL
-        length          2
-        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
-
-}
- 
-XCOMM	cs5 class
-cs5     {
-        side            GR
-        length          2
-        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
-}
- 
-XCOMM	cs6 class
-cs6	{
-	side		GR
-	length		1
-	ct_encoding	JISX0201.1976-0:GR
-}
-
-XCOMM	cs7 class
-cs7	{
 	side		none
 	ct_encoding	ISO10646-1
 }