dos -> unix

3 files changed, 127 insertions, 127 deletions

diff --git a/libX11/nls/zh_CN.gb18030/Compose.pre b/libX11/nls/zh_CN.gb18030/Compose.pre
index 7a7c7f241..a9e259fab 100644
--- a/libX11/nls/zh_CN.gb18030/Compose.pre
+++ b/libX11/nls/zh_CN.gb18030/Compose.pre
@@ -1,14 +1,14 @@
-XCOMM

-XCOMM zh_CN.GB18030 Compose Sequence

-XCOMM

-XCOMM Sequence Definition

-XCOMM

-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

+XCOMM
+XCOMM zh_CN.GB18030 Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+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/libX11/nls/zh_CN.gb18030/XI18N_OBJS b/libX11/nls/zh_CN.gb18030/XI18N_OBJS
index e9fef4c7a..a92b4033c 100644
--- a/libX11/nls/zh_CN.gb18030/XI18N_OBJS
+++ b/libX11/nls/zh_CN.gb18030/XI18N_OBJS
@@ -1,7 +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

+# 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/libX11/nls/zh_CN.gb18030/XLC_LOCALE.pre b/libX11/nls/zh_CN.gb18030/XLC_LOCALE.pre
index 4d01c8f7f..f9544c70e 100644
--- a/libX11/nls/zh_CN.gb18030/XLC_LOCALE.pre
+++ b/libX11/nls/zh_CN.gb18030/XLC_LOCALE.pre
@@ -1,106 +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

+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