| blob | 39065ed3e8b6b7c5f8f853365aa3ea22da5dfe9d |
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/en_US.UTF-8/XI18N_OBJS b/nls/en_US.UTF-8/XI18N_OBJS
25 index 97b30b9..337b362 100644
26 --- a/nls/en_US.UTF-8/XI18N_OBJS
27 +++ b/nls/en_US.UTF-8/XI18N_OBJS
28 @@ -5,3 +5,6 @@
29 XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
30 XOM common/xomGeneric _XomGenericOpenOM # XOM_open
31 XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
32 +XIM common/xiiimp _XimpLocalOpenIM # XIM_open
33 +XIM common/ximll _XimpLocalOpenIM # XIM_open
34 +XIM common/ximlocal _XimpLocalOpenIM # XIM_open
35 diff --git a/nls/en_US.UTF-8/XLC_LOCALE.pre b/nls/en_US.UTF-8/XLC_LOCALE.pre
36 index 35d009f..949a877 100644
37 --- a/nls/en_US.UTF-8/XLC_LOCALE.pre
38 +++ b/nls/en_US.UTF-8/XLC_LOCALE.pre
39 @@ -53,6 +53,7 @@ fs4 {
40 name ISO8859-4:GR
41 }
42 font {
43 + load_option delay_nocheck
44 primary ISO8859-4:GR
45 }
46 }
47 @@ -66,16 +67,16 @@ fs5 {
48 }
49 }
50 XCOMM fs6 class (koi8-r)
51 -fs6 {
52 - charset {
53 - name KOI8-R:GR
54 - }
55 - font {
56 - primary KOI8-R:GR
57 - }
58 -}
59 +XCOMM fs6 {
60 +XCOMM charset {
61 +XCOMM name KOI8-R:GR
62 +XCOMM }
63 +XCOMM font {
64 +XCOMM primary KOI8-R:GR
65 +XCOMM }
66 +XCOMM}
67 XCOMM fs7 class (ISO8859 families)
68 -fs7 {
69 +fs6 {
70 charset {
71 name ISO8859-7:GR
72 }
73 @@ -84,7 +85,7 @@ fs7 {
74 }
75 }
76 XCOMM fs9 class (ISO8859 families)
77 -fs8 {
78 +fs7 {
79 charset {
80 name ISO8859-9:GR
81 }
82 @@ -93,7 +94,7 @@ fs8 {
83 }
84 }
85 XCOMM fs13 class (ISO8859 families)
86 -fs9 {
87 +fs8 {
88 charset {
89 name ISO8859-13:GR
90 }
91 @@ -102,7 +103,7 @@ fs9 {
92 }
93 }
94 XCOMM fs14 class (ISO8859 families)
95 -fs10 {
96 +fs9 {
97 charset {
98 name ISO8859-14:GR
99 }
100 @@ -111,16 +112,17 @@ fs10 {
101 }
102 }
103 XCOMM fs15 class (ISO8859 families)
104 -fs11 {
105 +fs10 {
106 charset {
107 name ISO8859-15:GR
108 }
109 - font {
110 + font {
111 + load_option delay_nocheck
112 primary ISO8859-15:GR
113 }
114 }
115 XCOMM fs16 class (Kanji)
116 -fs12 {
117 +fs11 {
118 charset {
119 name JISX0208.1983-0:GL
120 }
121 @@ -129,16 +131,16 @@ fs12 {
122 }
123 }
124 XCOMM fs17 class (Korean Character)
125 -fs13 {
126 +fs12 {
127 charset {
128 - name KSC5601.1987-0:GL
129 + name KSC5601.1992-3:GLGR
130 }
131 font {
132 - primary KSC5601.1987-0:GL
133 + primary KSC5601.1992-3:GLGR
134 }
135 }
136 XCOMM fs18 class (Chinese Han Character)
137 -fs14 {
138 +fs13 {
139 charset {
140 name GB2312.1980-0:GL
141 }
142 @@ -147,7 +149,7 @@ fs14 {
143 }
144 }
145 XCOMM fs20 class (Half Kana)
146 -fs15 {
147 +fs14 {
148 charset {
149 name JISX0201.1976-0:GR
150 }
151 @@ -156,9 +158,70 @@ fs15 {
152 vertical_rotate all
153 }
154 }
155 +XCOMM
156 +fs15 {
157 + charset {
158 + name BIG5-0:GLGR
159 + }
160 + font {
161 + load_option delay_nocheck
162 + primary BIG5-0:GLGR
163 + }
164 +}
165 +XCOMM CTL language
166 +fs16 {
167 + charset {
168 + name TIS620-0:GR
169 + }
170 + font {
171 + load_option delay_nocheck
172 + primary TIS620-0:GR
173 + }
174 +}
175 +XCOMM fs18 class (ISO8859-6) (Arabic)
176 +fs17 {
177 + charset {
178 + name ISO8859-6:GLGR
179 + }
180 + font {
181 + load_option delay_nocheck
182 + primary ISO8859-6:GLGR
183 + }
184 +}
185 +XCOMM fs19 class (ISO8859-8) (Hebrew)
186 +fs18 {
187 + charset {
188 + name ISO8859-8:GR
189 + }
190 + font {
191 + load_option delay_nocheck
192 + primary ISO8859-8:GR
193 + }
194 +}
195 +XCOMM fs20 class (SUN.UNICODE.INDIA-0) (Indian Script)
196 +fs19 {
197 + charset {
198 + name SUN.UNICODE.INDIA-0:GLGR
199 + }
200 + font {
201 + load_option delay_nocheck
202 + primary SUN.UNICODE.INDIA-0:GLGR
203 + }
204 +}
205 +XCOMM fs20 (Last, fallback) class (unicode-fontspecific)
206 +fs20 {
207 + charset {
208 + name UNICODE-FONTSPECIFIC:GLGR
209 + }
210 + font {
211 + load_option delay_nocheck
212 + primary UNICODE-FONTSPECIFIC:GLGR
213 + }
214 +}
215 +
216 XCOMM ISO10646 should come last so the fonts above will actually be used
217 XCOMM fs24 class
218 -fs16 {
219 +fs21 {
220 charset {
221 name ISO10646-1
222 }
223 @@ -220,79 +283,120 @@ cs5 {
224 }
226 XCOMM cs6 class
227 -cs6 {
228 - side GR
229 - length 1
230 - ct_encoding KOI8-R:GR
231 -}
232 +XCOMM cs6 {
233 +XCOMM side GR
234 +XCOMM length 1
235 +XCOMM ct_encoding KOI8-R:GR
236 +XCOMM}
238 XCOMM cs7 class
239 -cs7 {
240 - side GR
241 +cs6 {
242 + side GR:Default
243 length 1
244 ct_encoding ISO8859-7:GR
245 }
247 XCOMM cs9 class
248 -cs8 {
249 +cs7 {
250 side GR
251 length 1
252 ct_encoding ISO8859-9:GR
253 }
255 XCOMM cs13 class
256 -cs9 {
257 +cs8 {
258 side GR
259 length 1
260 ct_encoding ISO8859-13:GR
261 }
263 XCOMM cs14 class
264 -cs10 {
265 +cs9 {
266 side GR
267 length 1
268 ct_encoding ISO8859-14:GR
269 }
271 XCOMM cs15 class
272 -cs11 {
273 +cs10 {
274 side GR
275 length 1
276 ct_encoding ISO8859-15:GR
277 }
279 XCOMM cs16 class
280 -cs12 {
281 +cs11 {
282 side GR
283 length 2
284 - ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
285 - JISX0208.1983-1:GL; JISX0208.1983-1:GR
286 + ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
287 +
288 }
290 XCOMM cs17 class
291 -cs13 {
292 +cs12 {
293 side GL
294 length 2
295 - ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
296 - KSC5601.1987-1:GL; KSC5601.1987-1:GR
297 + ct_encoding KSC5601.1992-3:GLGR
298 }
300 XCOMM cs18 class
301 -cs14 {
302 +cs13 {
303 side GR
304 length 2
305 ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
306 }
308 XCOMM cs20 class
309 -cs15 {
310 +cs14 {
311 side GR
312 length 1
313 ct_encoding JISX0201.1976-0:GR
314 }
316 +cs15 {
317 + side GR:Default
318 + length 2
319 + ct_encoding BIG5-0:GLGR
320 +
321 +}
322 +
323 +XCOMM Thai
324 +cs16 {
325 + side GR:Default
326 + length 1
327 + ct_encoding TIS620-0:GR
328 +}
329 +
330 +XCOMM Ar
331 +cs17 {
332 + side GR:Default
333 + length 2
334 + ct_encoding ISO8859-6:GLGR
335 +}
336 +
337 +XCOMM cs15 class He
338 +cs18 {
339 + side GR:Default
340 + length 1
341 + ct_encoding ISO8859-8:GR
342 +}
343 +
344 +XCOMM cs16 class
345 +cs19 {
346 + side GR:Default
347 + length 2
348 + ct_encoding SUN.UNICODE.INDIA-0:GLGR
349 +}
350 +
351 +XCOMM Last, fallback class
352 +cs20 {
353 + side GR:Default
354 + length 1
355 + ct_encoding UNICODE-FONTSPECIFIC:GLGR
356 +}
357 +
358 XCOMM cs24 class
359 -cs16 {
360 +cs21 {
361 side none
362 ct_encoding ISO10646-1
363 }