| blob | 6024dd4cf3e47b3e1a69afb42f540bbd281ac506 |
1 ###############################################################################
2 # Copyright (c) 2009, 2011, 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 --- a/configure.ac Tue Mar 17 10:20:46 2015
25 +++ b/configure.ac Tue Mar 17 10:21:04 2015
26 @@ -471,6 +471,7 @@
27 modules/im/ximcp/Makefile
28 modules/lc/Makefile
29 modules/lc/def/Makefile
30 + modules/lc/gb18030/Makefile
31 modules/lc/gen/Makefile
32 modules/lc/Utf8/Makefile
33 modules/om/Makefile
34 --- a/modules/lc/Makefile.am Tue Mar 17 10:21:40 2015
35 +++ b/modules/lc/Makefile.am Tue Mar 17 10:22:13 2015
36 @@ -1,1 +1,1 @@
37 -SUBDIRS=Utf8 def gen
38 +SUBDIRS=Utf8 def gen gb18030
39 --- a/src/xlibi18n/Makefile.am Tue Mar 17 10:22:47 2015
40 +++ b/src/xlibi18n/Makefile.am Tue Mar 17 10:23:16 2015
41 @@ -35,7 +35,8 @@
42 LC_LIBS = \
43 ${top_builddir}/modules/lc/def/libxlcDef.la \
44 ${top_builddir}/modules/lc/gen/libxlibi18n.la \
45 - ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la
46 + ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
47 + ${top_builddir}/modules/lc/gb18030/libxlcGB18030.la
49 OM_LIBS = \
50 ${top_builddir}/modules/om/generic/libxomGeneric.la
51 --- a/src/xlibi18n/Xlcint.h Tue Mar 17 10:23:35 2015
52 +++ b/src/xlibi18n/Xlcint.h Tue Mar 17 10:24:49 2015
53 @@ -932,6 +932,12 @@
54 const char* name
55 );
57 +/* The GB18030 locale loader. Suitable for GB18030 encoding.
58 + Uses an XLC_LOCALE configuration file. */
59 +extern XLCd _XlcGb18030Loader(
60 + const char* name
61 +);
62 +
63 extern XLCd _XlcDynamicLoad(
64 const char* name
65 );
66 --- a/src/xlibi18n/lcCT.c Tue Mar 17 10:25:14 2015
67 +++ b/src/xlibi18n/lcCT.c Tue Mar 17 10:26:07 2015
68 @@ -126,6 +126,8 @@
69 { "BIG5-0:GLGR", "\033%/2"},
70 { "BIG5HKSCS-0:GLGR", "\033%/2"},
71 { "GBK-0:GLGR", "\033%/2"},
72 + { "GB18030-0:GLGR", "\033%/2" },
73 + { "GB18030-1:GLGR", "\033%/2" },
74 /* used by Emacs, but not backed by ISO-IR */
75 { "BIG5-E0:GL", "\033$(0" },
76 { "BIG5-E0:GR", "\033$)0" },
77 --- a/src/xlibi18n/lcInit.c Tue Mar 17 10:26:29 2015
78 +++ b/src/xlibi18n/lcInit.c Tue Mar 17 10:27:58 2015
79 @@ -102,6 +102,7 @@
80 #undef USE_DEFAULT_LOADER
81 #undef USE_GENERIC_LOADER
82 #undef USE_UTF8_LOADER
83 +#define USE_GB18030_LOADER
84 #else
85 #define USE_GENERIC_LOADER
86 #define USE_DEFAULT_LOADER
87 @@ -133,6 +134,10 @@
88 _XlcAddLoader(_XlcUtf8Loader, XlcHead);
89 #endif
91 +#ifdef USE_GB18030_LOADER
92 + _XlcAddLoader(_XlcGb18030Loader, XlcHead);
93 +#endif
94 +
95 #ifdef USE_DYNAMIC_LOADER
96 _XlcAddLoader(_XlcDynamicLoader, XlcHead);
97 #endif
98 @@ -160,6 +165,10 @@
99 _XlcRemoveLoader(_XlcUtf8Loader);
100 #endif
102 +#ifdef USE_GB18030_LOADER
103 + _XlcRemoveLoader(_XlcGb18030Loader);
104 +#endif
105 +
106 #ifdef USE_DYNAMIC_LOADER
107 _XlcRemoveLoader(_XlcDynamicLoader);
108 #endif
109 --- a/src/xlibi18n/lcUTF8.c Tue Mar 17 10:28:18 2015
110 +++ b/src/xlibi18n/lcUTF8.c Tue Mar 17 10:35:38 2015
111 @@ -213,6 +213,7 @@
112 #include "lcUniConv/big5_emacs.h"
113 #include "lcUniConv/big5hkscs.h"
114 #include "lcUniConv/gbk.h"
115 +#include "lcUniConv/gb18030.h"
117 static Utf8ConvRec all_charsets[] = {
118 /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
119 @@ -350,6 +351,18 @@
120 { "BIG5HKSCS-0", NULLQUARK,
121 big5hkscs_mbtowc, big5hkscs_wctomb
122 },
123 + { "GB18030.2000-0", NULLQUARK,
124 + gbk_mbtowc, gbk_wctomb
125 + },
126 + { "GB18030.2000-1", NULLQUARK,
127 + gb18030_mbtowc, gb18030_wctomb
128 + },
129 + { "gb18030.2000-0", NULLQUARK,
130 + gbk_mbtowc, gbk_wctomb
131 + },
132 + { "gb18030.2000-1", NULLQUARK,
133 + gb18030_mbtowc, gb18030_wctomb
134 + },
136 /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
137 (for lookup speed), once at the end (as a fallback). */
138 --- a/src/xlibi18n/lcUniConv/gbk.h Tue Mar 17 10:36:02 2015
139 +++ b/src/xlibi18n/lcUniConv/gbk.h Tue Mar 17 10:43:34 2015
140 @@ -1,9 +1,41 @@
141 +/*
142 + * Copyright The Open Group
143 + * Permission to use, copy, modify, distribute, and sell this software and its
144 + * documentation for any purpose is hereby granted without fee, provided that the
145 + * above copyright notice appear in all copies and that both that copyright notice
146 + * and this permission notice appear in supporting documentation.
148 + * The above copyright notice and this permission notice shall be included in all
149 + * copies or substantial portions of the Software.
150 +
151 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
152 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
153 + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP
154 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
155 + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
156 + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
157 +
158 + * Except as contained in this notice, the name of The Open Group shall not be used
159 + * in advertising or otherwise to promote the sale, use or other dealings in this
160 + * Software without prior written authorization from The Open Group.
161 +
162 + * Portions also covered by other licenses as noted in the above URL.
163 + */
164 +
165 /*
166 * GBK-0
167 */
169 -static const unsigned short gbk_2uni_page81[23766] = {
170 +#define UNICODECJKEXTA 52
171 +
172 +typedef struct key_value {
173 + ucs4_t key;
174 + unsigned short value;
175 +} table_t;
176 +
177 +
178 +
179 +static const unsigned short gbk_2uni_page81[23846] = {
180 /* 0x81 */
181 0x4e02, 0x4e04, 0x4e05, 0x4e06, 0x4e0f, 0x4e12, 0x4e17, 0x4e1f,
182 0x4e20, 0x4e21, 0x4e23, 0x4e26, 0x4e29, 0x4e2e, 0x4e2f, 0x4e31,
183 @@ -850,7 +882,7 @@
184 0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f,
185 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, 0x2487,
186 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
187 - 0x2468, 0x2469, 0xfffd, 0xfffd, 0x3220, 0x3221, 0x3222, 0x3223,
188 + 0x2468, 0x2469, 0x20ac, 0xfffd, 0x3220, 0x3221, 0x3222, 0x3223,
189 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0xfffd, 0xfffd,
190 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167,
191 0x2168, 0x2169, 0x216a, 0x216b, 0xfffd, 0xfffd,
192 @@ -995,7 +1027,7 @@
193 0x0101, 0x00e1, 0x01ce, 0x00e0, 0x0113, 0x00e9, 0x011b, 0x00e8,
194 0x012b, 0x00ed, 0x01d0, 0x00ec, 0x014d, 0x00f3, 0x01d2, 0x00f2,
195 0x016b, 0x00fa, 0x01d4, 0x00f9, 0x01d6, 0x01d8, 0x01da, 0x01dc,
196 - 0x00fc, 0x00ea, 0x0251, 0xfffd, 0x0144, 0x0148, 0xfffd, 0x0261,
197 + 0x00fc, 0x00ea, 0x0251, 0xfffd, 0x0144, 0x0148, 0x01f9, 0x0261,
198 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3105, 0x3106, 0x3107, 0x3108,
199 0x3109, 0x310a, 0x310b, 0x310c, 0x310d, 0x310e, 0x310f, 0x3110,
200 0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, 0x3118,
201 @@ -1015,8 +1047,8 @@
202 0xfe5b, 0xfe5c, 0xfe5d, 0xfe5e, 0xfe5f, 0xfe60, 0xfe61, 0xfe62,
203 0xfe63, 0xfe64, 0xfe65, 0xfe66, 0xfe68, 0xfe69, 0xfe6a, 0xfe6b,
204 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
205 - 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3007, 0xfffd, 0xfffd,
206 - 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
207 + 0x303e, 0x2ff0, 0x2ff1, 0x2ff2, 0x2ff3, 0x2ff4, 0x2ff5, 0x2ff6,
208 + 0x2ff7, 0x2ff8, 0x2ff9, 0x2ffa, 0x2ffb, 0x3007, 0xfffd, 0xfffd,
209 0xfffd, 0xfffd, 0xfffd, 0x2500, 0x2501, 0x2502, 0x2503, 0x2504,
210 0x2505, 0x2506, 0x2507, 0x2508, 0x2509, 0x250a, 0x250b, 0x250c,
211 0x250d, 0x250e, 0x250f, 0x2510, 0x2511, 0x2512, 0x2513, 0x2514,
212 @@ -3132,6 +3164,16 @@
213 /* 0xfe */
214 0xfa0c, 0xfa0d, 0xfa0e, 0xfa0f, 0xfa11, 0xfa13, 0xfa14, 0xfa18,
215 0xfa1f, 0xfa20, 0xfa21, 0xfa23, 0xfa24, 0xfa27, 0xfa28, 0xfa29,
216 + 0x2e81, 0xfffd, 0xfffd, 0xfffd, 0x2e84, 0x3473, 0x3447, 0x2e88,
217 + 0x2e8b, 0xfffd, 0x359e, 0x361a, 0x360e, 0x2e8c, 0x2e97, 0x396e,
218 + 0x3918, 0xfffd, 0x39cf, 0x39df, 0x3a73, 0x39d0, 0xfffd, 0xfffd,
219 + 0x3b4e, 0x3c6e, 0x3ce0, 0x2ea7, 0xfffd, 0xfffd, 0x2eaa, 0x4056,
220 + 0x415f, 0x2eae, 0x4337, 0x2eb3, 0x2eb6, 0x2eb7, 0xfffd, 0x43b1,
221 + 0x43ac, 0x2ebb, 0x43dd, 0x44d6, 0x4661, 0x464c, 0xfffd, 0x4723,
222 + 0x4729, 0x477c, 0x478d, 0x2eca, 0x4947, 0x497a, 0x497d, 0x4982,
223 + 0x4983, 0x4985, 0x4986, 0x499f, 0x499b, 0x49b7, 0x49b6, 0xfffd,
224 + 0xfffd, 0x4ca3, 0x4c9f, 0x4ca0, 0x4ca1, 0x4c77, 0x4ca2, 0x4d13,
225 + 0x4d14, 0x4d15, 0x4d16, 0x4d17, 0x4d18, 0x4d19, 0x4dae, 0xfffd,
226 };
228 static int
229 @@ -3145,7 +3187,7 @@
230 unsigned int i = 190 * (c1 - 0x81) + (c2 - (c2 >= 0x80 ? 0x41 : 0x40));
231 unsigned short wc = 0xfffd;
232 {
233 - if (i < 23766)
234 + if (i < 23846)
235 wc = gbk_2uni_page81[i];
236 }
237 if (wc != 0xfffd) {
238 @@ -3335,6 +3377,25 @@
239 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/
240 0xa1e2, 0x0000, 0xa1e1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/
241 };
242 +
243 +static const unsigned short gbk_page2e[74] = {
244 + 0xfe50, 0x0000, 0x0000, 0xfe54, 0x0000, 0x0000, 0x0000, 0xfe57, /*0x00-0x07*/
245 + 0x0000, 0x0000, 0xfe58, 0xfe5d, 0x0000, 0x0000, 0x0000, 0x0000, /*0x08-0x0f*/
246 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfe5e, 0x0000, /*0x10-0x17*/
247 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x18-0x1f*/
248 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfe6b, 0x0000, /*0x20-0x27*/
249 + 0x0000, 0xfe6e, 0x0000, 0x0000, 0x0000, 0xfe71, 0x0000, 0x0000, /*0x28-0x2f*/
250 + 0x0000, 0x0000, 0xfe73, 0x0000, 0x0000, 0xfe74, 0xfe75, 0x0000, /*0x30-0x37*/
251 + 0x0000, 0x0000, 0xfe79, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/
252 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/
253 + 0x0000, 0xfe84,
254 +};
255 +
256 +static const unsigned short gbk_page2f[12] = {
257 + 0xa98a, 0xa98b, 0xa98c, 0xa98d, 0xa98e, 0xa98f, 0xa990, 0xa991, /*0x00-0x07*/
258 + 0xa992, 0xa993, 0xa994, 0xa995, /*0x08-0x0f*/
259 +};
260 +
261 static const unsigned short gbk_page30[304] = {
262 0xa1a1, 0xa1a2, 0xa1a3, 0xa1a8, 0x0000, 0xa1a9, 0xa965, 0xa996, /*0x00-0x07*/
263 0xa1b4, 0xa1b5, 0xa1b6, 0xa1b7, 0xa1b8, 0xa1b9, 0xa1ba, 0xa1bb, /*0x08-0x0f*/
264 @@ -3343,7 +3404,7 @@
265 0x0000, 0xa940, 0xa941, 0xa942, 0xa943, 0xa944, 0xa945, 0xa946, /*0x20-0x27*/
266 0xa947, 0xa948, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/
267 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/
268 - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/
269 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa989, 0x0000, /*0x38-0x3f*/
270 0x0000, 0xa4a1, 0xa4a2, 0xa4a3, 0xa4a4, 0xa4a5, 0xa4a6, 0xa4a7, /*0x40-0x47*/
271 0xa4a8, 0xa4a9, 0xa4aa, 0xa4ab, 0xa4ac, 0xa4ad, 0xa4ae, 0xa4af, /*0x48-0x4f*/
272 0xa4b0, 0xa4b1, 0xa4b2, 0xa4b3, 0xa4b4, 0xa4b5, 0xa4b6, 0xa4b7, /*0x50-0x57*/
273 @@ -6135,6 +6196,92 @@
274 0xa1e9, 0xa1ea, 0xa956, 0xa3fe, 0xa957, 0xa3a4, 0x0000, 0x0000, /*0xe0-0xe7*/
275 };
277 +
278 +static table_t unicodecjkexta_gbk_tab[UNICODECJKEXTA] = {
279 + {0x3447, 0xfe56},
280 + {0x3473, 0xfe55},
281 + {0x359e, 0xfe5a},
282 + {0x360e, 0xfe5c},
283 + {0x361a, 0xfe5b},
284 + {0x3918, 0xfe60},
285 + {0x396e, 0xfe5f},
286 + {0x39cf, 0xfe62},
287 + {0x39d0, 0xfe65},
288 + {0x39df, 0xfe63},
289 + {0x3a73, 0xfe64},
290 + {0x3b4e, 0xfe68},
291 + {0x3c6e, 0xfe69},
292 + {0x3ce0, 0xfe6a},
293 + {0x4056, 0xfe6f},
294 + {0x415f, 0xfe70},
295 + {0x4337, 0xfe72},
296 + {0x43ac, 0xfe78},
297 + {0x43b1, 0xfe77},
298 + {0x43dd, 0xfe7a},
299 + {0x44d6, 0xfe7b},
300 + {0x464c, 0xfe7d},
301 + {0x4661, 0xfe7c},
302 + {0x4723, 0xfe80},
303 + {0x4729, 0xfe81},
304 + {0x477c, 0xfe82},
305 + {0x478d, 0xfe83},
306 + {0x4947, 0xfe85},
307 + {0x497a, 0xfe86},
308 + {0x497d, 0xfe87},
309 + {0x4982, 0xfe88},
310 + {0x4983, 0xfe89},
311 + {0x4985, 0xfe8a},
312 + {0x4986, 0xfe8b},
313 + {0x499b, 0xfe8d},
314 + {0x499f, 0xfe8c},
315 + {0x49b6, 0xfe8f},
316 + {0x49b7, 0xfe8e},
317 + {0x4c77, 0xfe96},
318 + {0x4c9f, 0xfe93},
319 + {0x4ca0, 0xfe94},
320 + {0x4ca1, 0xfe95},
321 + {0x4ca2, 0xfe97},
322 + {0x4ca3, 0xfe92},
323 + {0x4d13, 0xfe98},
324 + {0x4d14, 0xfe99},
325 + {0x4d15, 0xfe9a},
326 + {0x4d16, 0xfe9b},
327 + {0x4d17, 0xfe9c},
328 + {0x4d19, 0xfe9e},
329 + {0x4dae, 0xfe9f},
330 +};
331 +
332 +/* binsearch: find x in v[0] <= v[1] <= ... <= v[n-1] */
333 +static int binsearch(ucs4_t x, table_t v[], int n)
334 +{
335 + int low, high, mid;
336 +
337 + low = 0;
338 + high = n - 1;
339 + while (low <= high) {
340 + mid = (low + high) / 2;
341 + if (x < v[mid].key)
342 + high = mid - 1;
343 + else if (x > v[mid].key)
344 + low = mid + 1;
345 + else /* found match */
346 + return mid;
347 + }
348 + return (-1); /* no match */
349 +}
350 +
351 +unsigned short gbk_cjkexta(ucs4_t wc)
352 +{
353 + int index;
354 +
355 + index = binsearch(wc, unicodecjkexta_gbk_tab, UNICODECJKEXTA);
356 + if(index >= 0)
357 + return unicodecjkexta_gbk_tab[index].value;
358 + else
359 + return 0;
360 +}
361 +
362 +
363 static int
364 gbk_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
365 {
366 @@ -6144,6 +6291,8 @@
367 c = gbk_page00[wc-0x00a0];
368 else if (wc >= 0x01c8 && wc < 0x01e0)
369 c = gbk_page01[wc-0x01c8];
370 + else if (wc == 0x01f9)
371 + c = 0xa8bf; /* Latin Small letter N with grave */
372 else if (wc >= 0x0250 && wc < 0x0268)
373 c = gbk_page02a[wc-0x0250];
374 else if (wc >= 0x02c0 && wc < 0x02e0)
375 @@ -6154,6 +6303,8 @@
376 c = gbk_page04[wc-0x0400];
377 else if (wc >= 0x2010 && wc < 0x2040)
378 c = gbk_page20[wc-0x2010];
379 + else if (wc == 0x20ac)
380 + c = 0xa2e3; /* for euro sign */
381 else if (wc >= 0x2100 && wc < 0x21a0)
382 c = gbk_page21[wc-0x2100];
383 else if (wc >= 0x2208 && wc < 0x22c0)
384 @@ -6166,6 +6317,10 @@
385 c = gbk_page25[wc-0x2500];
386 else if (wc >= 0x2600 && wc < 0x2648)
387 c = gbk_page26[wc-0x2600];
388 + else if (wc >= 0x2e81 && wc < 0x2ecb)
389 + c = gbk_page2e[wc-0x2e81];
390 + else if (wc >= 0x2ff0 && wc < 0x2ffc)
391 + c = gbk_page2f[wc-0x2ff0]; /* Ideographic Description Characters */
392 else if (wc >= 0x3000 && wc < 0x3130)
393 c = gbk_page30[wc-0x3000];
394 else if (wc >= 0x3220 && wc < 0x3238)
395 @@ -6174,6 +6329,8 @@
396 c = 0xa949;
397 else if (wc >= 0x3388 && wc < 0x33d8)
398 c = gbk_page33[wc-0x3388];
399 + else if (wc >=0x3447 && wc < 0x4daf)
400 + c = gbk_cjkexta(wc);
401 else if (wc >= 0x4e00 && wc < 0x9fa8)
402 c = gbk_page4e[wc-0x4e00];
403 else if (wc == 0xf92c)