dos -> unix

3 files changed, 145 insertions, 145 deletions

diff --git a/libX11/nls/ja.JIS/Compose.pre b/libX11/nls/ja.JIS/Compose.pre
index 7473fb859..b1f8e55a0 100644
--- a/libX11/nls/ja.JIS/Compose.pre
+++ b/libX11/nls/ja.JIS/Compose.pre
@@ -1,14 +1,14 @@
-XCOMM

-XCOMM ja.JIS 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 ja.JIS 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/ja.JIS/XI18N_OBJS b/libX11/nls/ja.JIS/XI18N_OBJS
index b709c8210..0cf97ee81 100644
--- a/libX11/nls/ja.JIS/XI18N_OBJS
+++ b/libX11/nls/ja.JIS/XI18N_OBJS
@@ -1,7 +1,7 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME

-#

-#	XI18N objects table for ja.JIS 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

+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for ja.JIS 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/libX11/nls/ja.JIS/XLC_LOCALE.pre b/libX11/nls/ja.JIS/XLC_LOCALE.pre
index 8fc4d056c..4b771aca2 100644
--- a/libX11/nls/ja.JIS/XLC_LOCALE.pre
+++ b/libX11/nls/ja.JIS/XLC_LOCALE.pre
@@ -1,124 +1,124 @@
-XCOMM 

-XCOMM  XLocale Database Sample for ja_JP.jis

-XCOMM 

-

-XCOMM 

-XCOMM 	XLC_FONTSET category

-XCOMM 

-XLC_FONTSET

-XCOMM 	fs0 class (7 bit ASCII)

-fs0	{

-	charset	{

-		name		ISO8859-1:GL

-	}

-	font	{

-		primary		ISO8859-1:GL

-		substitute	JISX0201.1976-0:GL

-		vertical_rotate	all

-	}

-}

-XCOMM 	fs1 class (Kanji)

-fs1	{

-	charset	{

-		name		JISX0208.1983-0:GL

-	}

-	font	{

-		primary		JISX0208.1983-0:GL

-		substitute      JISX0208.1990-0:GL

-	}

-}

-XCOMM 	fs2 class (Half Kana)

-fs2	{

-	charset	{

-		name		JISX0201.1976-0:GR

-	}

-	font	{

-		primary		JISX0201.1976-0:GR

-		substitute      JISX0201.1976-0:GR

-		vertical_rotate	all

-	}

-}

-XCOMM 	fs3 class (Supplementary Kanji)

-XCOMM fs3	{

-XCOMM	charset	{

-XCOMM		name		JISX0212.1990-0:GL

-XCOMM	}

-XCOMM	font	{

-XCOMM		primary		JISX0212.1990-0:GL

-XCOMM	}

-XCOMM }

-END XLC_FONTSET

-

-XCOMM 

-XCOMM 	XLC_XLOCALE category

-XCOMM 

-XLC_XLOCALE

-

-encoding_name		ja.jis

-mb_cur_max		5

-state_depend_encoding	True

-#if WCHAR32

-wc_encoding_mask	\x30000000

-wc_shift_bits		7

-#else

-wc_encoding_mask	\x00008080

-wc_shift_bits		8

-#endif

-

-#ifndef X_LOCALE

-use_stdc_env		True

-force_convert_to_mb	True

-#endif

-

-XCOMM 	cs0 class

-cs0	{

-	side		GL:Default

-	length		1

-	mb_encoding	<LSL> \x1b \x28 \x4a;\

-			<LSL> \x1b \x28 \x42

-	wc_encoding	\x00000000

-	ct_encoding	ISO8859-1:GL; JISX0201.1976-0:GL

-}

-

-XCOMM 	cs1 class

-cs1	{

-	side		GL

-	length		2

-	mb_encoding	<LSL> \x1b \x24 \x42;\

-			<LSL> \x1b \x24 \x40

-#if WCHAR32

-	wc_encoding	\x30000000

-#else

-	wc_encoding	\x00008080

-#endif

-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\

-			JISX0208.1983-1:GL; JISX0208.1983-1:GR

-}

-

-XCOMM 	cs2 class

-cs2	{

-	side		GL

-	length		1

-	mb_encoding	<LSL> \x1b \x28 \x49

-#if WCHAR32

-	wc_encoding	\x10000000

-#else

-	wc_encoding	\x00000080

-#endif

-	ct_encoding	JISX0201.1976-0:GR

-}

-

-XCOMM 	cs3 class

-XCOMM cs3	{

-XCOMM 	side		GL

-XCOMM 	length		2

-XCOMM 	mb_encoding	<LSL> \x1b \x24 \x28 \x44

-XCOMM #if WCHAR32

-XCOMM 	wc_encoding	\x20000000

-XCOMM #else

-XCOMM 	wc_encoding	\x00008000

-XCOMM #endif

-XCOMM 	ct_encoding	JISX0212.1990-0:GL; JISX0212.1990-0:GR

-XCOMM }

-

-END XLC_XLOCALE

+XCOMM 
+XCOMM  XLocale Database Sample for ja_JP.jis
+XCOMM 
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+XCOMM 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		substitute	JISX0201.1976-0:GL
+		vertical_rotate	all
+	}
+}
+XCOMM 	fs1 class (Kanji)
+fs1	{
+	charset	{
+		name		JISX0208.1983-0:GL
+	}
+	font	{
+		primary		JISX0208.1983-0:GL
+		substitute      JISX0208.1990-0:GL
+	}
+}
+XCOMM 	fs2 class (Half Kana)
+fs2	{
+	charset	{
+		name		JISX0201.1976-0:GR
+	}
+	font	{
+		primary		JISX0201.1976-0:GR
+		substitute      JISX0201.1976-0:GR
+		vertical_rotate	all
+	}
+}
+XCOMM 	fs3 class (Supplementary Kanji)
+XCOMM fs3	{
+XCOMM	charset	{
+XCOMM		name		JISX0212.1990-0:GL
+XCOMM	}
+XCOMM	font	{
+XCOMM		primary		JISX0212.1990-0:GL
+XCOMM	}
+XCOMM }
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		ja.jis
+mb_cur_max		5
+state_depend_encoding	True
+#if WCHAR32
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+#else
+wc_encoding_mask	\x00008080
+wc_shift_bits		8
+#endif
+
+#ifndef X_LOCALE
+use_stdc_env		True
+force_convert_to_mb	True
+#endif
+
+XCOMM 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	mb_encoding	<LSL> \x1b \x28 \x4a;\
+			<LSL> \x1b \x28 \x42
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL; JISX0201.1976-0:GL
+}
+
+XCOMM 	cs1 class
+cs1	{
+	side		GL
+	length		2
+	mb_encoding	<LSL> \x1b \x24 \x42;\
+			<LSL> \x1b \x24 \x40
+#if WCHAR32
+	wc_encoding	\x30000000
+#else
+	wc_encoding	\x00008080
+#endif
+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
+			JISX0208.1983-1:GL; JISX0208.1983-1:GR
+}
+
+XCOMM 	cs2 class
+cs2	{
+	side		GL
+	length		1
+	mb_encoding	<LSL> \x1b \x28 \x49
+#if WCHAR32
+	wc_encoding	\x10000000
+#else
+	wc_encoding	\x00000080
+#endif
+	ct_encoding	JISX0201.1976-0:GR
+}
+
+XCOMM 	cs3 class
+XCOMM cs3	{
+XCOMM 	side		GL
+XCOMM 	length		2
+XCOMM 	mb_encoding	<LSL> \x1b \x24 \x28 \x44
+XCOMM #if WCHAR32
+XCOMM 	wc_encoding	\x20000000
+XCOMM #else
+XCOMM 	wc_encoding	\x00008000
+XCOMM #endif
+XCOMM 	ct_encoding	JISX0212.1990-0:GL; JISX0212.1990-0:GR
+XCOMM }
+
+END XLC_XLOCALE