688N/A###############################################################################
943N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
688N/A#
688N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
688N/A#
688N/A
1370N/Adiff --git a/nls/en_US.UTF-8/XI18N_OBJS b/nls/en_US.UTF-8/XI18N_OBJS
1370N/Aindex 97b30b9..337b362 100644
1370N/A--- a/nls/en_US.UTF-8/XI18N_OBJS
1370N/A+++ b/nls/en_US.UTF-8/XI18N_OBJS
1370N/A@@ -5,3 +5,6 @@
688N/A XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
1370N/A XOM common/xomGeneric _XomGenericOpenOM # XOM_open
1370N/A XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
1370N/A+XIM common/xiiimp _XimpLocalOpenIM # XIM_open
688N/A+XIM common/ximll _XimpLocalOpenIM # XIM_open
688N/A+XIM common/ximlocal _XimpLocalOpenIM # XIM_open
1370N/Adiff --git a/nls/en_US.UTF-8/XLC_LOCALE.pre b/nls/en_US.UTF-8/XLC_LOCALE.pre
1370N/Aindex 35d009f..949a877 100644
1370N/A--- a/nls/en_US.UTF-8/XLC_LOCALE.pre
1370N/A+++ b/nls/en_US.UTF-8/XLC_LOCALE.pre
962N/A@@ -53,6 +53,7 @@ fs4 {
688N/A name ISO8859-4:GR
688N/A }
688N/A font {
688N/A+ load_option delay_nocheck
688N/A primary ISO8859-4:GR
688N/A }
688N/A }
962N/A@@ -66,16 +67,16 @@ fs5 {
719N/A }
719N/A }
719N/A XCOMM fs6 class (koi8-r)
962N/A-fs6 {
962N/A- charset {
962N/A- name KOI8-R:GR
962N/A- }
962N/A- font {
962N/A- primary KOI8-R:GR
962N/A- }
962N/A-}
719N/A+XCOMM fs6 {
719N/A+XCOMM charset {
719N/A+XCOMM name KOI8-R:GR
719N/A+XCOMM }
719N/A+XCOMM font {
719N/A+XCOMM primary KOI8-R:GR
719N/A+XCOMM }
719N/A+XCOMM}
962N/A XCOMM fs7 class (ISO8859 families)
962N/A-fs7 {
962N/A+fs6 {
719N/A charset {
719N/A name ISO8859-7:GR
719N/A }
962N/A@@ -84,7 +85,7 @@ fs7 {
719N/A }
719N/A }
719N/A XCOMM fs9 class (ISO8859 families)
719N/A-fs8 {
719N/A+fs7 {
719N/A charset {
719N/A name ISO8859-9:GR
719N/A }
962N/A@@ -93,7 +94,7 @@ fs8 {
719N/A }
719N/A }
719N/A XCOMM fs13 class (ISO8859 families)
719N/A-fs9 {
719N/A+fs8 {
719N/A charset {
719N/A name ISO8859-13:GR
719N/A }
962N/A@@ -102,7 +103,7 @@ fs9 {
719N/A }
719N/A }
719N/A XCOMM fs14 class (ISO8859 families)
719N/A-fs10 {
719N/A+fs9 {
719N/A charset {
719N/A name ISO8859-14:GR
719N/A }
962N/A@@ -111,16 +112,17 @@ fs10 {
719N/A }
719N/A }
719N/A XCOMM fs15 class (ISO8859 families)
719N/A-fs11 {
719N/A+fs10 {
719N/A charset {
719N/A name ISO8859-15:GR
719N/A }
719N/A- font {
719N/A+ font {
719N/A+ load_option delay_nocheck
719N/A primary ISO8859-15:GR
719N/A }
719N/A }
719N/A XCOMM fs16 class (Kanji)
719N/A-fs12 {
719N/A+fs11 {
719N/A charset {
719N/A name JISX0208.1983-0:GL
719N/A }
962N/A@@ -129,16 +131,16 @@ fs12 {
719N/A }
719N/A }
688N/A XCOMM fs17 class (Korean Character)
719N/A-fs13 {
719N/A+fs12 {
688N/A charset {
688N/A- name KSC5601.1987-0:GL
688N/A+ name KSC5601.1992-3:GLGR
688N/A }
688N/A font {
688N/A- primary KSC5601.1987-0:GL
688N/A+ primary KSC5601.1992-3:GLGR
688N/A }
688N/A }
688N/A XCOMM fs18 class (Chinese Han Character)
719N/A-fs14 {
719N/A+fs13 {
719N/A charset {
719N/A name GB2312.1980-0:GL
719N/A }
962N/A@@ -147,7 +149,7 @@ fs14 {
719N/A }
719N/A }
719N/A XCOMM fs20 class (Half Kana)
719N/A-fs15 {
719N/A+fs14 {
719N/A charset {
719N/A name JISX0201.1976-0:GR
719N/A }
962N/A@@ -156,9 +158,70 @@ fs15 {
688N/A vertical_rotate all
688N/A }
688N/A }
688N/A+XCOMM
719N/A+fs15 {
688N/A+ charset {
688N/A+ name BIG5-0:GLGR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary BIG5-0:GLGR
688N/A+ }
688N/A+}
688N/A+XCOMM CTL language
719N/A+fs16 {
688N/A+ charset {
688N/A+ name TIS620-0:GR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary TIS620-0:GR
688N/A+ }
688N/A+}
688N/A+XCOMM fs18 class (ISO8859-6) (Arabic)
719N/A+fs17 {
688N/A+ charset {
688N/A+ name ISO8859-6:GLGR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-6:GLGR
688N/A+ }
688N/A+}
688N/A+XCOMM fs19 class (ISO8859-8) (Hebrew)
719N/A+fs18 {
688N/A+ charset {
688N/A+ name ISO8859-8:GR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-8:GR
688N/A+ }
688N/A+}
688N/A+XCOMM fs20 class (SUN.UNICODE.INDIA-0) (Indian Script)
719N/A+fs19 {
688N/A+ charset {
688N/A+ name SUN.UNICODE.INDIA-0:GLGR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary SUN.UNICODE.INDIA-0:GLGR
688N/A+ }
688N/A+}
719N/A+XCOMM fs20 (Last, fallback) class (unicode-fontspecific)
719N/A+fs20 {
688N/A+ charset {
688N/A+ name UNICODE-FONTSPECIFIC:GLGR
719N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary UNICODE-FONTSPECIFIC:GLGR
688N/A+ }
688N/A+}
688N/A+
688N/A XCOMM ISO10646 should come last so the fonts above will actually be used
688N/A XCOMM fs24 class
688N/A-fs16 {
719N/A+fs21 {
688N/A charset {
688N/A name ISO10646-1
688N/A }
962N/A@@ -220,79 +283,120 @@ cs5 {
719N/A }
719N/A
719N/A XCOMM cs6 class
719N/A-cs6 {
719N/A- side GR
719N/A- length 1
719N/A- ct_encoding KOI8-R:GR
719N/A-}
719N/A+XCOMM cs6 {
719N/A+XCOMM side GR
719N/A+XCOMM length 1
719N/A+XCOMM ct_encoding KOI8-R:GR
719N/A+XCOMM}
719N/A
719N/A XCOMM cs7 class
719N/A-cs7 {
719N/A- side GR
719N/A+cs6 {
719N/A+ side GR:Default
719N/A length 1
719N/A ct_encoding ISO8859-7:GR
719N/A }
719N/A
719N/A XCOMM cs9 class
719N/A-cs8 {
719N/A+cs7 {
719N/A side GR
719N/A length 1
719N/A ct_encoding ISO8859-9:GR
719N/A }
719N/A
719N/A XCOMM cs13 class
719N/A-cs9 {
719N/A+cs8 {
719N/A side GR
719N/A length 1
719N/A ct_encoding ISO8859-13:GR
719N/A }
719N/A
719N/A XCOMM cs14 class
719N/A-cs10 {
719N/A+cs9 {
719N/A side GR
719N/A length 1
719N/A ct_encoding ISO8859-14:GR
719N/A }
719N/A
719N/A XCOMM cs15 class
719N/A-cs11 {
719N/A+cs10 {
719N/A side GR
719N/A length 1
719N/A ct_encoding ISO8859-15:GR
719N/A }
719N/A
719N/A XCOMM cs16 class
719N/A-cs12 {
719N/A+cs11 {
719N/A side GR
719N/A length 2
719N/A- ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
719N/A- JISX0208.1983-1:GL; JISX0208.1983-1:GR
719N/A+ ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
719N/A+
719N/A }
719N/A
719N/A XCOMM cs17 class
719N/A-cs13 {
719N/A+cs12 {
688N/A side GL
688N/A length 2
688N/A- ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
688N/A- KSC5601.1987-1:GL; KSC5601.1987-1:GR
688N/A+ ct_encoding KSC5601.1992-3:GLGR
688N/A }
688N/A
688N/A XCOMM cs18 class
719N/A-cs14 {
719N/A+cs13 {
719N/A side GR
719N/A length 2
719N/A ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
719N/A }
719N/A
719N/A XCOMM cs20 class
719N/A-cs15 {
719N/A+cs14 {
719N/A side GR
719N/A length 1
688N/A ct_encoding JISX0201.1976-0:GR
688N/A }
688N/A
719N/A+cs15 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding BIG5-0:GLGR
688N/A+
688N/A+}
688N/A+
688N/A+XCOMM Thai
719N/A+cs16 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding TIS620-0:GR
688N/A+}
688N/A+
688N/A+XCOMM Ar
719N/A+cs17 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding ISO8859-6:GLGR
688N/A+}
688N/A+
688N/A+XCOMM cs15 class He
719N/A+cs18 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-8:GR
688N/A+}
688N/A+
688N/A+XCOMM cs16 class
719N/A+cs19 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding SUN.UNICODE.INDIA-0:GLGR
688N/A+}
688N/A+
688N/A+XCOMM Last, fallback class
719N/A+cs20 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding UNICODE-FONTSPECIFIC:GLGR
688N/A+}
688N/A+
688N/A XCOMM cs24 class
688N/A-cs16 {
719N/A+cs21 {
688N/A side none
688N/A ct_encoding ISO10646-1
688N/A }