| blob | 115285048e1af07fb3a208304402ac6ac92792bb |
1 ###############################################################################
2 # Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
3 #
4 # Permission is hereby granted, free of charge, to any person obtaining a
5 # copy of this software and associated documentation files (the "Software"),
6 # to deal in the Software without restriction, including without limitation
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 # and/or sell copies of the Software, and to permit persons to whom the
9 # Software is furnished to do so, subject to the following conditions:
10 #
11 # The above copyright notice and this permission notice (including the next
12 # paragraph) shall be included in all copies or substantial portions of the
13 # Software.
14 #
15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21 # DEALINGS IN THE SOFTWARE.
22 #
24 diff --git a/nls/zh_CN.gb18030/XI18N_OBJS b/nls/zh_CN.gb18030/XI18N_OBJS
25 index a92b403..0a5a137 100644
26 --- a/nls/zh_CN.gb18030/XI18N_OBJS
27 +++ b/nls/zh_CN.gb18030/XI18N_OBJS
28 @@ -2,6 +2,6 @@
29 #
30 # XI18N objects table for zh_CN.gb18030 locale
31 #
32 -XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
33 +XLC common/xlcGB18030 _XlcGb18030Loader # XLC_open
34 XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
35 XOM common/xomGeneric _XomGenericOpenOM # XOM_open
36 diff --git a/nls/zh_CN.gb18030/XLC_LOCALE.pre b/nls/zh_CN.gb18030/XLC_LOCALE.pre
37 index f9544c7..8950080 100644
38 --- a/nls/zh_CN.gb18030/XLC_LOCALE.pre
39 +++ b/nls/zh_CN.gb18030/XLC_LOCALE.pre
40 @@ -1,70 +1,51 @@
41 XCOMM XFree86 NLS for Chinese encoding GB18030
42 -XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
43 -XCOMM by James Su <suzhe@turbolinux.com.cn>
45 XCOMM
46 XCOMM XLC_FONTSET category
47 XCOMM
48 XLC_FONTSET
50 -on_demand_loading True
51 -
52 -object_name generic
53 -
54 XCOMM We leave the legacy encodings in for the moment, because we don't
55 XCOMM have that many ISO10646 fonts yet.
56 XCOMM fs0 class (7 bit ASCII)
57 fs0 {
58 - charset {
59 - name ISO8859-1:GL
60 - }
61 - font {
62 - primary ISO8859-1:GL
63 - vertical_rotate all
64 - }
65 + charset ISO8859-1:GL
66 + font GBK1988.1989-0:GL;ISO8859-1:GL
67 }
68 -
69 -XCOMM fs1 class (ISO8859 families)
70 +XCOMM fs1 class
71 fs1 {
72 - charset {
73 - name ISO8859-1:GR
74 - }
75 - font {
76 - primary ISO8859-1:GR
77 + charset GB18030.2000-0:GLGR
78 + font {
79 + primary GB18030.2000-0:GLGR,[\x8140,\xA0FE]
80 + supplement sunudczh.GB18030.2000-0:GLGR,[\xA140,\xA1A0]->\x2121,\
81 + [\xA240,\xA2A0]->\x2221,\
82 + [\xA340,\xA3A0]->\x2321,\
83 + [\xA440,\xA4A0]->\x2421,\
84 + [\xA540,\xA5A0]->\x2521,\
85 + [\xA640,\xA6A0]->\x2621,\
86 + [\xA740,\xA7A0]->\x2721,\
87 + [\xAAA1,\xAAFE]->\x2821,\
88 + [\xABA1,\xABFE]->\x2921,\
89 + [\xACA1,\xACFE]->\x2A21,\
90 + [\xADA1,\xADFE]->\x2B21,\
91 + [\xAEA1,\xAEFE]->\x2C21,\
92 + [\xAFA1,\xAFFE]->\x2D21,\
93 + [\xF8A1,\xF8FE]->\x2E21,\
94 + [\xF9A1,\xF9FE]->\x2F21,\
95 + [\xFAA1,\xFAFE]->\x3021,\
96 + [\xFBA1,\xFBFE]->\x3121,\
97 + [\xFCA1,\xFCFE]->\x3221,\
98 + [\xFDA1,\xFDFE]->\x3321,\
99 + [\xFEA1,\xFEFE]->\x3421
100 }
101 }
103 -XCOMM fs2 class (Chinese Han Character)
104 +XCOMM fs2 class
105 fs2 {
106 - charset {
107 - name GB2312.1980-0:GL
108 - }
109 - font {
110 - primary GB2312.1980-0:GL
111 - }
112 -}
113 -
114 -XCOMM fs3 class (Chinese Han Character GBK)
115 -fs3 {
116 - charset {
117 - name GBK-0:GLGR
118 - }
119 - font {
120 - primary GBK-0:GLGR
121 - substitute GB13000.1993-1:GLGR
122 - }
123 + charset GB18030.2000-1:GLGR
124 + font GB18030.2000-1:GLGR
125 }
127 -XCOMM fs4 class
128 -fs4 {
129 - charset {
130 - name ISO10646-1
131 - }
132 - font {
133 - primary GB18030-0
134 - substitute GBK2K-0
135 - }
136 -}
137 END XLC_FONTSET
139 XCOMM
140 @@ -75,32 +56,33 @@ XLC_XLOCALE
141 encoding_name GB18030
142 mb_cur_max 4
143 state_depend_encoding False
144 +wc_encoding_mask \x00000000
145 +wc_shift_bits 7
146 +
148 XCOMM cs0 class
149 cs0 {
150 - side GL:Default
151 - length 1
152 - ct_encoding ISO8859-1:GL
153 + side GLGR:Default
154 + length 2
155 + wc_encoding \x00000000
156 + ct_encoding GB18030.2000-0:GLGR
157 }
159 XCOMM cs1 class
160 cs1 {
161 - side GR:Default
162 - length 1
163 - ct_encoding ISO8859-1:GR
164 + side GLGR:Default
165 + length 2
166 + mb_encoding \x81\x30\x81\x30
167 + wc_encoding \x00005e84
168 + ct_encoding GB18030.2000-1:GLGR
169 }
170 -
171 +
172 XCOMM cs2 class
173 cs2 {
174 - side GR
175 - length 2
176 - ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
177 -}
178 -
179 -XCOMM cs3 class
180 -cs3 {
181 - side none
182 - ct_encoding ISO10646-1
183 + side GL:Default
184 + length 1
185 + wc_encoding \x00000000
186 + ct_encoding ISO8859-1:GL
187 }
189 END XLC_XLOCALE