[PATCH libX11 4/5] i18n: Remove ja.S90 and ja.U90 locales.

Egbert Eich eich at freedesktop.org
Wed Dec 5 06:38:24 PST 2012


Both locales carry a copyright notice and a prorietary statement:

Copyright 1995 by FUJITSU LIMITED
This is source code modified by FUJITSU LIMITED under the Joint
Development Agreement for the CDEnext PST.
This is unpublished proprietary source code of FUJITSU LIMITED

Signed-off-by: Egbert Eich <eich at freedesktop.org>
---
 nls/compose.dir.pre       |    2 -
 nls/ja.S90/XI18N_OBJS     |    7 --
 nls/ja.S90/XLC_LOCALE.pre |  150 --------------------------------------------
 nls/ja.U90/XI18N_OBJS     |    7 --
 nls/ja.U90/XLC_LOCALE.pre |  151 ---------------------------------------------
 nls/locale.alias.pre      |   10 ---
 nls/locale.dir.pre        |    4 -
 7 files changed, 0 insertions(+), 331 deletions(-)
 delete mode 100644 nls/ja.S90/Compose.pre
 delete mode 100644 nls/ja.S90/XI18N_OBJS
 delete mode 100644 nls/ja.S90/XLC_LOCALE.pre
 delete mode 100644 nls/ja.U90/Compose.pre
 delete mode 100644 nls/ja.U90/XI18N_OBJS
 delete mode 100644 nls/ja.U90/XLC_LOCALE.pre

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index b91bbbd..a166391 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -167,8 +167,6 @@ iso8859-15/Compose:		it_IT.ISO8859-15
 ja/Compose:			ja_JP.eucJP
 ja.SJIS/Compose:		ja_JP.SJIS
 ja.JIS/Compose:			ja_JP.JIS7
-ja.S90/Compose:			ja_JP.S90
-ja.U90/Compose:			ja_JP.U90
 georgian-academy/Compose:	ka_GE.GEORGIAN-ACADEMY
 georgian-ps/Compose:		ka_GE.GEORGIAN-PS
 iso8859-1/Compose:		kl_GL.ISO8859-1
diff --git a/nls/ja.S90/Compose.pre b/nls/ja.S90/Compose.pre
deleted file mode 100644
index e69de29..0000000
diff --git a/nls/ja.S90/XI18N_OBJS b/nls/ja.S90/XI18N_OBJS
deleted file mode 100644
index d8f0fdd..0000000
--- a/nls/ja.S90/XI18N_OBJS
+++ /dev/null
@@ -1,7 +0,0 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for ja.S90 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/ja.S90/XLC_LOCALE.pre b/nls/ja.S90/XLC_LOCALE.pre
deleted file mode 100644
index cb4e49d..0000000
--- a/nls/ja.S90/XLC_LOCALE.pre
+++ /dev/null
@@ -1,150 +0,0 @@
-XCOMM Copyright 1995 by FUJITSU LIMITED
-XCOMM This is source code modified by FUJITSU LIMITED under the Joint
-XCOMM Development Agreement for the CDEnext PST.
-XCOMM This is unpublished proprietary source code of FUJITSU LIMITED
-XCOMM
-XCOMM NLS-DB for ja_JP.S90
-
-XCOMM
-XCOMM	XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0	{
-	charset_name	u90x03.1991-0
-	side		GL
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x28\x32
-	encoding_name	fujitsu.U90X03
-}
-
-csd1	{
-	charset_name	u90x03.1991-0
-	side		GR
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x2f\x32
-	encoding_name	fujitsu.U90X03
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name	JISX0201.1976-0:GL
-	}
-	font	{
-		primary		JISX0201.1976-0:GL
-		substitute	ISO8859-1:GL
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs1 class (Kanji)
-fs1	{
-	charset	{
-		name	JISX0208.1983-0:GL
-		udc_area \x7521,\x7e7e
-	}
-	font	{
-		primary		fujitsu.u90x01.1991-0:GL,[\x2121,\x747e];\
-				fujitsu.u90x03.1991-0:GL,[\x7521,\x7e7e]->\x6521
-                substitute      u90x01.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-		vertical_map	u90x01.1991-0.2:GL,\
-			[\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\
-			[\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\
-			[\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\
-			[\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\
-			[\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\
-			[\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\
-			[\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\
-			[\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\
-			[\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\
-			[\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\
-			[\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\
-			[\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\
-			[\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b
-	}
-}
-XCOMM 	fs2 class (Half Kana)
-fs2	{
-	charset	{
-		name		JISX0201.1976-0:GR
-        }
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs3 class (JEF Kanji + User Defined Character)
-fs3	{
-	charset	{
-		name	u90x03.1991-0:GR; u90x03.1991-0:GL
-		udc_area	\x6521,\x787e
-	}
-	font	{
-		primary		fujitsu.u90x03.1991-0:GL
-                substitute      u90x03.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-	}
-}
-END XLC_FONTSET
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-XCOMM encoding_name		ja.euc
-encoding_name ja_JP.S90
-mb_cur_max		3
-state_depend_encoding	False
-
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding	JISX0201.1976-0:GL; ISO8859-1:GL
-}
-
-XCOMM 	cs1 class
-cs1	{
-	side		GR:Default
-	length		2
-	wc_encoding	\x30000000
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM 	cs2 class
-cs2	{
-	side		GR
-	length		1
-	mb_encoding	<SS> \x8e
-	wc_encoding	\x10000000
-	ct_encoding	JISX0201.1976-0:GR
-}
-XCOMM 	cs3 class
-cs3	{
-	side		GR
-	length		2
-	mb_encoding	<SS> \x8f
-	wc_encoding	\x20000000
-	ct_encoding	u90x03.1991-0:GR; u90x03.1991-0:GL
-}
-END XLC_XLOCALE
diff --git a/nls/ja.U90/Compose.pre b/nls/ja.U90/Compose.pre
deleted file mode 100644
index e69de29..0000000
diff --git a/nls/ja.U90/XI18N_OBJS b/nls/ja.U90/XI18N_OBJS
deleted file mode 100644
index 8c766a9..0000000
--- a/nls/ja.U90/XI18N_OBJS
+++ /dev/null
@@ -1,7 +0,0 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for ja.U90 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/ja.U90/XLC_LOCALE.pre b/nls/ja.U90/XLC_LOCALE.pre
deleted file mode 100644
index 5d8fd3c..0000000
--- a/nls/ja.U90/XLC_LOCALE.pre
+++ /dev/null
@@ -1,151 +0,0 @@
-XCOMM Copyright 1995 by FUJITSU LIMITED
-XCOMM This is source code modified by FUJITSU LIMITED under the Joint
-XCOMM Development Agreement for the CDEnext PST.
-XCOMM This is unpublished proprietary source code of FUJITSU LIMITED
-XCOMM
-XCOMM NLS-DB for ja_JP.U90
-
-XCOMM
-XCOMM	XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0	{
-	charset_name	u90x03.1991-0
-	side		GL
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x28\x32
-	encoding_name	fujitsu.U90X03
-}
-
-csd1	{
-	charset_name	u90x03.1991-0
-	side		GR
-	length		2
-	gc_number	94
-	string_encoding	False
-	sequence	\x1b\x25\x2f\x32
-	encoding_name	fujitsu.U90X03
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name	JISX0201.1976-0:GL
-	}
-	font	{
-		primary		JISX0201.1976-0:GL
-		substitute	ISO8859-1:GL
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs1 class (Kanji)
-fs1	{
-	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-                primary         fujitsu.u90x01.1991-0:GL
-XCOMM		primary		JISX0208.1983-0:GL
-                substitute	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR;\
-				u90x01.1991-0:GL
-		vertical_map	u90x01.1991-0.2:GL,\
-			[\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\
-			[\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\
-			[\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\
-			[\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\
-			[\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\
-			[\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\
-			[\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\
-			[\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\
-			[\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\
-			[\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\
-			[\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\
-			[\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\
-			[\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b
-	}
-}
-XCOMM 	fs2 class (Half Kana)
-fs2	{
-	charset	{
-		name		JISX0201.1976-0:GR
-        }
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM 	fs3 class (JEF Kanji + User Defined Character)
-fs3	{
-	charset	{
-		name	u90x03.1991-0:GR; u90x03.1991-0:GL
-		udc_area	\x6521,\x787e
-	}
-	font	{
-                primary         fujitsu.u90x03.1991-0:GL
-                substitute      u90x03.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-	}
-}
-END XLC_FONTSET
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-XCOMM encoding_name		ja.euc
-encoding_name ja_JP.U90
-mb_cur_max		3
-state_depend_encoding	False
-
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding	JISX0201.1976-0:GL; ISO8859-1:GL
-}
-
-XCOMM 	cs1 class
-cs1	{
-	side		GR:Default
-	length		2
-	wc_encoding	\x30000000
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM 	cs2 class
-cs2	{
-	side		GR
-	length		1
-	mb_encoding	<SS> \x8e
-	wc_encoding	\x10000000
-	ct_encoding	JISX0201.1976-0:GR
-}
-
-XCOMM 	cs3 class
-cs3	{
-	side		GR
-	length		2
-	mb_encoding	<SS> \x8f
-	wc_encoding	\x20000000
-	ct_encoding	u90x03.1991-0:GR; u90x03.1991-0:GL
-}
-
-END XLC_XLOCALE
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index c9d2d39..1b66b9b 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -701,13 +701,7 @@ iw_IL:						he_IL.ISO8859-8
 Iw_IL:						he_IL.ISO8859-8
 iw_IL.iso88598:					he_IL.ISO8859-8
 iw_IL.ISO-8859-8:				he_IL.ISO8859-8
-#ifndef __uxp__
 ja_JP:						ja_JP.eucJP
-#else /* __uxp__ */
-ja_JP:						ja_JP.U90
-ja_JP.U90:					ja_JP.U90
-ja_JP.S90:					ja_JP.S90
-#endif /* __uxp__ */
 ja:						ja_JP.eucJP
 ja.JIS:						ja_JP.JIS7
 ja.SJIS:					ja_JP.SJIS
@@ -1392,9 +1386,5 @@ Chinese(Taiwan)_Taiwan.950:			zh_TW.EUC
 XCOMM Other miscellaneous locale names
 ISO8859-1:					en_US.ISO8859-1
 ISO-8859-1:					en_US.ISO8859-1
-#ifndef __uxp__
 japan:						ja_JP.eucJP
-#else
-japan:						ja_JP.U90
-#endif
 Japanese-EUC:					ja_JP.eucJP
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 8f9a355..4ec9297 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -470,7 +470,3 @@ 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
 en_US.UTF-8/XLC_LOCALE:			zu_ZA.UTF-8
-#ifdef __uxp__
-ja.U90/XLC_LOCALE:			ja_JP.U90
-ja.S90/XLC_LOCALE:			ja_JP.S90
-#endif
-- 
1.7.7



More information about the xorg-devel mailing list