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/zh_CN.UTF-8/XI18N_OBJS b/nls/zh_CN.UTF-8/XI18N_OBJS
1370N/Aindex 29dd53a..900235c 100644
1370N/A--- a/nls/zh_CN.UTF-8/XI18N_OBJS
1370N/A+++ b/nls/zh_CN.UTF-8/XI18N_OBJS
962N/A@@ -4,5 +4,6 @@
962N/A #
688N/A #
688N/A XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
688N/A+XIM common/xiiimp _SwitchOpenIM
688N/A XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
688N/A XOM common/xomGeneric _XomGenericOpenOM # XOM_open
1370N/Adiff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
1370N/Aindex 6f05d7a..330d134 100644
1370N/A--- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre
1370N/A+++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
962N/A@@ -12,8 +12,7 @@ on_demand_loading True
688N/A
688N/A object_name generic
688N/A
688N/A-XCOMM We leave the legacy encodings in for the moment, because we don't
688N/A-XCOMM have that many ISO10646 fonts yet.
688N/A+
688N/A XCOMM fs0 class (7 bit ASCII)
688N/A fs0 {
688N/A charset {
962N/A@@ -56,15 +55,145 @@ fs3 {
688N/A }
688N/A }
688N/A
688N/A-XCOMM fs4 class
688N/A-fs4 {
688N/A- charset {
688N/A- name ISO10646-1
688N/A- }
688N/A- font {
688N/A- primary ISO10646-1
688N/A- }
688N/A+XCOMM fs3 class
688N/A+fs4 {
688N/A+ charset BIG5-0:GLGR
688N/A+ font {
688N/A+XCOMM load_option delay_nocheck
688N/A+ primary BIG5-0:GLGR
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM fs4 class for JISX0208
688N/A+fs5 {
688N/A+ charset JISX0208.1983-0:GL
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary JISX0208.1983-0:GL
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM fs5 class for JISX0201 kana
688N/A+fs6 {
688N/A+ charset JISX0201.1976-0:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary JISX0201.1976-0:GR
688N/A+ }
688N/A+}
688N/A+
1370N/A+XCOMM fs6 class for KS C 5601-1992 Supplementary Codes 3
688N/A+fs7 {
688N/A+ charset KSC5601.1992-3:GLGR
688N/A+ font {
688N/A+ #load_option delay_nocheck
688N/A+ primary KSC5601.1992-3:GLGR
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM CTL language
688N/A+fs8 {
688N/A+ charset TIS620-0:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary TIS620-0:GR
688N/A+ }
688N/A+}
688N/A+
688N/A+fs9 {
688N/A+ charset ISO8859-5:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-5:GR
688N/A+ }
1370N/A+}
688N/A+
688N/A+XCOMM fs9 class
688N/A+fs10 {
688N/A+ charset ISO8859-7:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-7:GR
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM fs10 class
688N/A+fs11 {
688N/A+ charset ISO8859-2:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-2:GR
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM fs11 class
688N/A+fs12 {
688N/A+ charset ISO8859-4:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-4:GR
688N/A+ }
688N/A+}
688N/A+XCOMM fs12 class
688N/A+fs13 {
688N/A+ charset ISO8859-9:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-9:GR
688N/A+ }
688N/A+}
688N/A+
688N/A+XCOMM fs13 class
688N/A+fs14 {
688N/A+ charset ISO8859-15:GR
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary ISO8859-15:GR
688N/A+ }
1370N/A }
688N/A+XCOMM fs14 class (ISO8859-6) (Arabic)
688N/A+fs15 {
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 fs15 class (ISO8859-8) (Hebrew)
688N/A+fs16 {
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+
688N/A+XCOMM fs16 class (SUN.UNICODE.INDIA-0) (Indian Script)
688N/A+fs17 {
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+}
688N/A+
688N/A+XCOMM fs17 (Last, fallback) class (unicode-fontspecific)
688N/A+fs18 {
688N/A+ charset {
688N/A+ name UNICODE-FONTSPECIFIC:GLGR
688N/A+ }
688N/A+ font {
688N/A+ load_option delay_nocheck
688N/A+ primary UNICODE-FONTSPECIFIC:GLGR
688N/A+ }
688N/A+}
688N/A+
688N/A END XLC_FONTSET
688N/A
688N/A XCOMM
1370N/A@@ -97,10 +226,108 @@ cs2 {
1370N/A ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
688N/A }
1370N/A
1370N/A-XCOMM cs3 class
1370N/A-cs3 {
1370N/A- side none
1370N/A- ct_encoding ISO10646-1
688N/A+
688N/A+XCOMM cs11 class
688N/A+cs3 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding BIG5-0:GLGR
688N/A+
688N/A+}
688N/A+XCOMM cs4 class
688N/A+cs4 {
688N/A+ side GR
688N/A+ length 2
688N/A+ ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;
688N/A+}
688N/A+
688N/A+XCOMM cs5 class
688N/A+cs5 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding JISX0201.1976-0:GL
688N/A+}
688N/A+
688N/A+XCOMM cs15 class
688N/A+cs6 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding KSC5601.1992-3:GLGR
688N/A+
688N/A+}
688N/A+XCOMM Thai
688N/A+cs7 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding TIS620-0:GR
688N/A+}
688N/A+XCOMM cs8 class
688N/A+cs8 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-5:GR
688N/A+}
688N/A+
688N/A+XCOMM cs9 class
688N/A+cs9 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-7:GR
688N/A+}
688N/A+
688N/A+XCOMM cs10 class
688N/A+cs10 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-2:GR
688N/A+}
688N/A+
688N/A+XCOMM cs11 class
688N/A+cs11 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-4:GR
688N/A+}
688N/A+XCOMM cs12 class
688N/A+cs12 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-9:GR
688N/A+
688N/A+}
688N/A+
688N/A+XCOMM cs13 class
688N/A+cs13 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding ISO8859-15:GR
688N/A+}
688N/A+
688N/A+XCOMM cs14 class
688N/A+cs14 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding ISO8859-6:GLGR
688N/A+}
688N/A+XCOMM cs15 class
688N/A+cs15 {
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
688N/A+cs16 {
688N/A+ side GR:Default
688N/A+ length 2
688N/A+ ct_encoding SUN.UNICODE.INDIA-0:GLGR
1370N/A+}
1370N/A+
688N/A+XCOMM Last, fallback class
688N/A+cs17 {
688N/A+ side GR:Default
688N/A+ length 1
688N/A+ ct_encoding UNICODE-FONTSPECIFIC:GLGR
688N/A }
688N/A
688N/A END XLC_XLOCALE