Merging XORG-CURRENT into trunk

2 files changed, 93 insertions, 80 deletions

diff --git a/nls/zh_CN.UTF-8/XI18N_OBJS b/nls/zh_CN.UTF-8/XI18N_OBJS
index 00f7b508..d42180e5 100644
--- a/nls/zh_CN.UTF-8/XI18N_OBJS
+++ b/nls/zh_CN.UTF-8/XI18N_OBJS
@@ -2,7 +2,7 @@
 #
 #	XI18N objects table for zh_CN.UTF-8 locale
 #
-# $XFree86: xc/nls/XI18N_OBJS/zh_CN.UTF-8,v 1.2 2003/10/24 16:36:46 tsi Exp $
+# $XFree86$
 #
 XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
 XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
index c10fee24..6d43fcca 100644
--- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre
+++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
@@ -1,127 +1,140 @@
-XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_CN.UTF-8,v 1.2 2003/10/24 16:36:46 tsi Exp $
-
-# 	XLC_FONTSET category
+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 $XFree86$
 
+XCOMM 
+XCOMM  XLC_FONTSET category
+XCOMM 
 XLC_FONTSET
 
-on_demand_loading	True
+on_demand_loading      True
 
-object_name		generic
+object_name            generic
 
-#	We leave the legacy encodings in for the moment, because we don't
-#	have that many ISO10646 fonts yet.
-# 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name	ISO8859-1:GL
-	}
-	font	{
-		primary		ISO8859-1:GL
-		vertical_rotate	all
-	}
+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
+       }
 }
-fs1     {
-        charset {
-                name    ISO8859-1:GR
-        }
-        font    {
-                primary ISO8859-1:GR
-        }
 
+XCOMM  fs1 class (ISO8859 families)
+fs1    {
+       charset {
+               name    ISO8859-1:GR
+       }
+       font    {
+               primary ISO8859-1:GR
+       }
 }
-fs2	{
-	charset	{
-		name	GB2312.1980-0:GL
-	}
-	font	{
-		primary	GB2312.1980-0:GL
-	}
+
+XCOMM  fs2 class (Chinese Han Character)
+fs2    {
+       charset {
+               name    GB2312.1980-0:GL
+       }
+       font    {
+               primary GB2312.1980-0:GL
+       }
 }
-fs3	{
-	charset {
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-		primary	JISX0208.1983-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 (Kanji)
 fs4	{
 	charset	{
-		name	KSC5601.1987-0:GL
+		name	JISX0208.1983-0:GL
 	}
 	font	{
-		primary	KSC5601.1987-0:GL
+		primary	JISX0208.1983-0:GL
 	}
 }
+
+XCOMM   fs5 class (Korean Character)
 fs5	{
 	charset	{
-		name	BIG5-0:GLGR
+		name	KSC5601.1987-0:GL
 	}
 	font	{
-		primary	BIG5-0:GLGR
-		substitute	BIG5-0:GLGR
+		primary	KSC5601.1987-0:GL
 	}
 }
+
+XCOMM	fs6 class (Half Kana)
 fs6	{
 	charset	{
-		name	ISO10646-1
+		name	JISX0201.1976-0:GR
 	}
 	font	{
-		primary	ISO10646-1
-		                  
+		primary		JISX0201.1976-0:GR
+		vertical_rotate	all
 	}
 }
-END XLC_FONTSET
 
+XCOMM  fs7 class
+fs7    {
+       charset {
+               name    ISO10646-1
+       }
+       font    {
+               primary ISO10646-1
+       }
+}
+END XLC_FONTSET
 
-# 	XLC_XLOCALE category
-
+XCOMM 
+XCOMM  XLC_XLOCALE category
+XCOMM 
 XLC_XLOCALE
 
-encoding_name		GB18030
-mb_cur_max		4
-state_depend_encoding	False
+encoding_name          UTF-8
+mb_cur_max             6
+state_depend_encoding  False
 
-cs0	{
-	side		GL:Default
-	length		1
-	ct_encoding	ISO8859-1:GL
+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
 }
-cs3	{
-	side		none
-	ct_encoding	iso10646-1
-}
-cs4	{
-	side		GR
-	length		2
-	ct_encoding	JISX0208.19832-0:GL; JISX0208.1983-0:GR;	JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-cs5	{
-	side		GL
-	length		2
-	ct_encoding	KSC5601.1987-0:GL; KSC5601.1987-0:GR;		KSC5601.1987-1:GL; KSC5601.1987-1:GR
-}
-cs6	{
-	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
+XCOMM  cs3 class
+cs3    {
+       side            none
+       ct_encoding     ISO10646-1
 }
 
 END XLC_XLOCALE
+