Merge lp:~atcurtis/maria/maria-5.1-const into lp:~maria-captains/maria/5.1-converting
- maria-5.1-const
- Merge into 5.1-converting
Proposed by
Antony T Curtis
Status: | Merged |
---|---|
Merge reported by: | Sergei Golubchik |
Merged at revision: | not available |
Proposed branch: | lp:~atcurtis/maria/maria-5.1-const |
Merge into: | lp:~maria-captains/maria/5.1-converting |
Diff against target: |
11592 lines 35 files modified
include/m_ctype.h (+115/-105) include/m_string.h (+2/-2) include/my_sys.h (+2/-2) mysys/charset-def.c (+38/-37) mysys/charset.c (+35/-38) sql/item_cmpfunc.h (+1/-1) sql/sql_class.cc (+1/-1) sql/sql_lex.cc (+3/-3) storage/pbxt/src/datadic_xt.cc (+2/-2) storage/pbxt/src/ha_pbxt.cc (+1/-1) storage/pbxt/src/myxt_xt.cc (+1/-1) storage/pbxt/src/myxt_xt.h (+6/-6) storage/pbxt/src/xt_defs.h (+2/-2) strings/conf_to_src.c (+8/-8) strings/ctype-big5.c (+20/-19) strings/ctype-bin.c (+5/-4) strings/ctype-cp932.c (+26/-25) strings/ctype-czech.c (+18/-17) strings/ctype-euc_kr.c (+20/-19) strings/ctype-eucjpms.c (+269/-268) strings/ctype-extra.c (+320/-320) strings/ctype-gb2312.c (+20/-19) strings/ctype-gbk.c (+18/-17) strings/ctype-latin1.c (+19/-18) strings/ctype-mb.c (+21/-20) strings/ctype-simple.c (+26/-19) strings/ctype-sjis.c (+19/-18) strings/ctype-tis620.c (+12/-11) strings/ctype-uca.c (+127/-124) strings/ctype-ucs2.c (+14/-13) strings/ctype-ujis.c (+255/-254) strings/ctype-utf8.c (+31/-32) strings/ctype-win1250ch.c (+15/-14) strings/ctype.c (+4/-4) strings/int2str.c (+2/-2) |
To merge this branch: | bzr merge lp:~atcurtis/maria/maria-5.1-const |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Widenius | full review | Approve | |
Review via email: mp+14384@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Antony T Curtis (atcurtis) wrote : | # |
Revision history for this message
Michael Widenius (monty) wrote : | # |
I have now added this to the Maria 5.2 tree. I did this in a patch form instead of with a bk pull, as I did some minor changes (to remove a lot of warnings) and I didn't want to have this in the history.
Will be pushed shortly to main 5.2 branch.
review:
Approve
(full review)
Revision history for this message
Sergei Golubchik (sergii) wrote : | # |
marked as "merged" as monty added it to 5.2
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'include/m_ctype.h' | |||
2 | --- include/m_ctype.h 2009-09-07 20:50:10 +0000 | |||
3 | +++ include/m_ctype.h 2009-11-03 19:35:25 +0000 | |||
4 | @@ -38,22 +38,30 @@ | |||
5 | 38 | 38 | ||
6 | 39 | #define my_wc_t ulong | 39 | #define my_wc_t ulong |
7 | 40 | 40 | ||
9 | 41 | typedef struct unicase_info_st | 41 | typedef const struct charset_info_st CHARSET_INFO; |
10 | 42 | typedef const struct my_charset_handler_st MY_CHARSET_HANDLER; | ||
11 | 43 | typedef const struct my_collation_handler_st MY_COLLATION_HANDLER; | ||
12 | 44 | |||
13 | 45 | typedef const struct unicase_info_st MY_UNICASE_INFO; | ||
14 | 46 | typedef const struct uni_ctype_st MY_UNI_CTYPE; | ||
15 | 47 | typedef const struct my_uni_idx_st MY_UNI_IDX; | ||
16 | 48 | |||
17 | 49 | struct unicase_info_st | ||
18 | 42 | { | 50 | { |
19 | 43 | uint16 toupper; | 51 | uint16 toupper; |
20 | 44 | uint16 tolower; | 52 | uint16 tolower; |
21 | 45 | uint16 sort; | 53 | uint16 sort; |
29 | 46 | } MY_UNICASE_INFO; | 54 | }; |
30 | 47 | 55 | ||
31 | 48 | 56 | ||
32 | 49 | extern MY_UNICASE_INFO *my_unicase_default[256]; | 57 | extern MY_UNICASE_INFO *const my_unicase_default[256]; |
33 | 50 | extern MY_UNICASE_INFO *my_unicase_turkish[256]; | 58 | extern MY_UNICASE_INFO *const my_unicase_turkish[256]; |
34 | 51 | 59 | ||
35 | 52 | typedef struct uni_ctype_st | 60 | struct uni_ctype_st |
36 | 53 | { | 61 | { |
37 | 54 | uchar pctype; | 62 | uchar pctype; |
40 | 55 | uchar *ctype; | 63 | const uchar *ctype; |
41 | 56 | } MY_UNI_CTYPE; | 64 | }; |
42 | 57 | 65 | ||
43 | 58 | extern MY_UNI_CTYPE my_uni_ctype[256]; | 66 | extern MY_UNI_CTYPE my_uni_ctype[256]; |
44 | 59 | 67 | ||
45 | @@ -96,12 +104,12 @@ | |||
46 | 96 | #define MY_REPERTOIRE_UNICODE30 3 /* ASCII | EXTENDED: U+0000..U+FFFF */ | 104 | #define MY_REPERTOIRE_UNICODE30 3 /* ASCII | EXTENDED: U+0000..U+FFFF */ |
47 | 97 | 105 | ||
48 | 98 | 106 | ||
50 | 99 | typedef struct my_uni_idx_st | 107 | struct my_uni_idx_st |
51 | 100 | { | 108 | { |
52 | 101 | uint16 from; | 109 | uint16 from; |
53 | 102 | uint16 to; | 110 | uint16 to; |
56 | 103 | uchar *tab; | 111 | const uchar *tab; |
57 | 104 | } MY_UNI_IDX; | 112 | }; |
58 | 105 | 113 | ||
59 | 106 | typedef struct | 114 | typedef struct |
60 | 107 | { | 115 | { |
61 | @@ -130,41 +138,41 @@ | |||
62 | 130 | 138 | ||
63 | 131 | 139 | ||
64 | 132 | /* See strings/CHARSET_INFO.txt for information about this structure */ | 140 | /* See strings/CHARSET_INFO.txt for information about this structure */ |
66 | 133 | typedef struct my_collation_handler_st | 141 | struct my_collation_handler_st |
67 | 134 | { | 142 | { |
68 | 135 | my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t)); | 143 | my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t)); |
69 | 136 | /* Collation routines */ | 144 | /* Collation routines */ |
71 | 137 | int (*strnncoll)(struct charset_info_st *, | 145 | int (*strnncoll)(CHARSET_INFO *, |
72 | 138 | const uchar *, size_t, const uchar *, size_t, my_bool); | 146 | const uchar *, size_t, const uchar *, size_t, my_bool); |
74 | 139 | int (*strnncollsp)(struct charset_info_st *, | 147 | int (*strnncollsp)(CHARSET_INFO *, |
75 | 140 | const uchar *, size_t, const uchar *, size_t, | 148 | const uchar *, size_t, const uchar *, size_t, |
76 | 141 | my_bool diff_if_only_endspace_difference); | 149 | my_bool diff_if_only_endspace_difference); |
78 | 142 | size_t (*strnxfrm)(struct charset_info_st *, | 150 | size_t (*strnxfrm)(CHARSET_INFO *, |
79 | 143 | uchar *, size_t, const uchar *, size_t); | 151 | uchar *, size_t, const uchar *, size_t); |
82 | 144 | size_t (*strnxfrmlen)(struct charset_info_st *, size_t); | 152 | size_t (*strnxfrmlen)(CHARSET_INFO *, size_t); |
83 | 145 | my_bool (*like_range)(struct charset_info_st *, | 153 | my_bool (*like_range)(CHARSET_INFO *, |
84 | 146 | const char *s, size_t s_length, | 154 | const char *s, size_t s_length, |
85 | 147 | pchar w_prefix, pchar w_one, pchar w_many, | 155 | pchar w_prefix, pchar w_one, pchar w_many, |
86 | 148 | size_t res_length, | 156 | size_t res_length, |
87 | 149 | char *min_str, char *max_str, | 157 | char *min_str, char *max_str, |
88 | 150 | size_t *min_len, size_t *max_len); | 158 | size_t *min_len, size_t *max_len); |
90 | 151 | int (*wildcmp)(struct charset_info_st *, | 159 | int (*wildcmp)(CHARSET_INFO *, |
91 | 152 | const char *str,const char *str_end, | 160 | const char *str,const char *str_end, |
92 | 153 | const char *wildstr,const char *wildend, | 161 | const char *wildstr,const char *wildend, |
93 | 154 | int escape,int w_one, int w_many); | 162 | int escape,int w_one, int w_many); |
94 | 155 | 163 | ||
96 | 156 | int (*strcasecmp)(struct charset_info_st *, const char *, const char *); | 164 | int (*strcasecmp)(CHARSET_INFO *, const char *, const char *); |
97 | 157 | 165 | ||
99 | 158 | uint (*instr)(struct charset_info_st *, | 166 | uint (*instr)(CHARSET_INFO *, |
100 | 159 | const char *b, size_t b_length, | 167 | const char *b, size_t b_length, |
101 | 160 | const char *s, size_t s_length, | 168 | const char *s, size_t s_length, |
102 | 161 | my_match_t *match, uint nmatch); | 169 | my_match_t *match, uint nmatch); |
103 | 162 | 170 | ||
104 | 163 | /* Hash calculation */ | 171 | /* Hash calculation */ |
106 | 164 | void (*hash_sort)(struct charset_info_st *cs, const uchar *key, size_t len, | 172 | void (*hash_sort)(CHARSET_INFO *cs, const uchar *key, size_t len, |
107 | 165 | ulong *nr1, ulong *nr2); | 173 | ulong *nr1, ulong *nr2); |
110 | 166 | my_bool (*propagate)(struct charset_info_st *cs, const uchar *str, size_t len); | 174 | my_bool (*propagate)(CHARSET_INFO *cs, const uchar *str, size_t len); |
111 | 167 | } MY_COLLATION_HANDLER; | 175 | }; |
112 | 168 | 176 | ||
113 | 169 | extern MY_COLLATION_HANDLER my_collation_mb_bin_handler; | 177 | extern MY_COLLATION_HANDLER my_collation_mb_bin_handler; |
114 | 170 | extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler; | 178 | extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler; |
115 | @@ -172,83 +180,83 @@ | |||
116 | 172 | extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler; | 180 | extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler; |
117 | 173 | 181 | ||
118 | 174 | /* Some typedef to make it easy for C++ to make function pointers */ | 182 | /* Some typedef to make it easy for C++ to make function pointers */ |
120 | 175 | typedef int (*my_charset_conv_mb_wc)(struct charset_info_st *, my_wc_t *, | 183 | typedef int (*my_charset_conv_mb_wc)(CHARSET_INFO *, my_wc_t *, |
121 | 176 | const uchar *, const uchar *); | 184 | const uchar *, const uchar *); |
123 | 177 | typedef int (*my_charset_conv_wc_mb)(struct charset_info_st *, my_wc_t, | 185 | typedef int (*my_charset_conv_wc_mb)(CHARSET_INFO *, my_wc_t, |
124 | 178 | uchar *, uchar *); | 186 | uchar *, uchar *); |
126 | 179 | typedef size_t (*my_charset_conv_case)(struct charset_info_st *, | 187 | typedef size_t (*my_charset_conv_case)(CHARSET_INFO *, |
127 | 180 | char *, size_t, char *, size_t); | 188 | char *, size_t, char *, size_t); |
128 | 181 | 189 | ||
129 | 182 | 190 | ||
130 | 183 | /* See strings/CHARSET_INFO.txt about information on this structure */ | 191 | /* See strings/CHARSET_INFO.txt about information on this structure */ |
132 | 184 | typedef struct my_charset_handler_st | 192 | struct my_charset_handler_st |
133 | 185 | { | 193 | { |
134 | 186 | my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t)); | 194 | my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t)); |
135 | 187 | /* Multibyte routines */ | 195 | /* Multibyte routines */ |
140 | 188 | uint (*ismbchar)(struct charset_info_st *, const char *, const char *); | 196 | uint (*ismbchar)(CHARSET_INFO *, const char *, const char *); |
141 | 189 | uint (*mbcharlen)(struct charset_info_st *, uint c); | 197 | uint (*mbcharlen)(CHARSET_INFO *, uint c); |
142 | 190 | size_t (*numchars)(struct charset_info_st *, const char *b, const char *e); | 198 | size_t (*numchars)(CHARSET_INFO *, const char *b, const char *e); |
143 | 191 | size_t (*charpos)(struct charset_info_st *, const char *b, const char *e, | 199 | size_t (*charpos)(CHARSET_INFO *, const char *b, const char *e, |
144 | 192 | size_t pos); | 200 | size_t pos); |
146 | 193 | size_t (*well_formed_len)(struct charset_info_st *, | 201 | size_t (*well_formed_len)(CHARSET_INFO *, |
147 | 194 | const char *b,const char *e, | 202 | const char *b,const char *e, |
148 | 195 | size_t nchars, int *error); | 203 | size_t nchars, int *error); |
151 | 196 | size_t (*lengthsp)(struct charset_info_st *, const char *ptr, size_t length); | 204 | size_t (*lengthsp)(CHARSET_INFO *, const char *ptr, size_t length); |
152 | 197 | size_t (*numcells)(struct charset_info_st *, const char *b, const char *e); | 205 | size_t (*numcells)(CHARSET_INFO *, const char *b, const char *e); |
153 | 198 | 206 | ||
154 | 199 | /* Unicode conversion */ | 207 | /* Unicode conversion */ |
155 | 200 | my_charset_conv_mb_wc mb_wc; | 208 | my_charset_conv_mb_wc mb_wc; |
156 | 201 | my_charset_conv_wc_mb wc_mb; | 209 | my_charset_conv_wc_mb wc_mb; |
157 | 202 | 210 | ||
158 | 203 | /* CTYPE scanner */ | 211 | /* CTYPE scanner */ |
160 | 204 | int (*ctype)(struct charset_info_st *cs, int *ctype, | 212 | int (*ctype)(CHARSET_INFO *cs, int *ctype, |
161 | 205 | const uchar *s, const uchar *e); | 213 | const uchar *s, const uchar *e); |
162 | 206 | 214 | ||
163 | 207 | /* Functions for case and sort conversion */ | 215 | /* Functions for case and sort conversion */ |
166 | 208 | size_t (*caseup_str)(struct charset_info_st *, char *); | 216 | size_t (*caseup_str)(CHARSET_INFO *, char *); |
167 | 209 | size_t (*casedn_str)(struct charset_info_st *, char *); | 217 | size_t (*casedn_str)(CHARSET_INFO *, char *); |
168 | 210 | 218 | ||
169 | 211 | my_charset_conv_case caseup; | 219 | my_charset_conv_case caseup; |
170 | 212 | my_charset_conv_case casedn; | 220 | my_charset_conv_case casedn; |
171 | 213 | 221 | ||
172 | 214 | /* Charset dependant snprintf() */ | 222 | /* Charset dependant snprintf() */ |
174 | 215 | size_t (*snprintf)(struct charset_info_st *, char *to, size_t n, | 223 | size_t (*snprintf)(CHARSET_INFO *, char *to, size_t n, |
175 | 216 | const char *fmt, | 224 | const char *fmt, |
176 | 217 | ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5); | 225 | ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5); |
178 | 218 | size_t (*long10_to_str)(struct charset_info_st *, char *to, size_t n, | 226 | size_t (*long10_to_str)(CHARSET_INFO *, char *to, size_t n, |
179 | 219 | int radix, long int val); | 227 | int radix, long int val); |
181 | 220 | size_t (*longlong10_to_str)(struct charset_info_st *, char *to, size_t n, | 228 | size_t (*longlong10_to_str)(CHARSET_INFO *, char *to, size_t n, |
182 | 221 | int radix, longlong val); | 229 | int radix, longlong val); |
183 | 222 | 230 | ||
185 | 223 | void (*fill)(struct charset_info_st *, char *to, size_t len, int fill); | 231 | void (*fill)(CHARSET_INFO *, char *to, size_t len, int fill); |
186 | 224 | 232 | ||
187 | 225 | /* String-to-number conversion routines */ | 233 | /* String-to-number conversion routines */ |
197 | 226 | long (*strntol)(struct charset_info_st *, const char *s, size_t l, | 234 | long (*strntol)(CHARSET_INFO *, const char *s, size_t l, |
198 | 227 | int base, char **e, int *err); | 235 | int base, char **e, int *err); |
199 | 228 | ulong (*strntoul)(struct charset_info_st *, const char *s, size_t l, | 236 | ulong (*strntoul)(CHARSET_INFO *, const char *s, size_t l, |
200 | 229 | int base, char **e, int *err); | 237 | int base, char **e, int *err); |
201 | 230 | longlong (*strntoll)(struct charset_info_st *, const char *s, size_t l, | 238 | longlong (*strntoll)(CHARSET_INFO *, const char *s, size_t l, |
202 | 231 | int base, char **e, int *err); | 239 | int base, char **e, int *err); |
203 | 232 | ulonglong (*strntoull)(struct charset_info_st *, const char *s, size_t l, | 240 | ulonglong (*strntoull)(CHARSET_INFO *, const char *s, size_t l, |
204 | 233 | int base, char **e, int *err); | 241 | int base, char **e, int *err); |
205 | 234 | double (*strntod)(struct charset_info_st *, char *s, size_t l, char **e, | 242 | double (*strntod)(CHARSET_INFO *, char *s, size_t l, char **e, |
206 | 235 | int *err); | 243 | int *err); |
208 | 236 | longlong (*strtoll10)(struct charset_info_st *cs, | 244 | longlong (*strtoll10)(CHARSET_INFO *cs, |
209 | 237 | const char *nptr, char **endptr, int *error); | 245 | const char *nptr, char **endptr, int *error); |
211 | 238 | ulonglong (*strntoull10rnd)(struct charset_info_st *cs, | 246 | ulonglong (*strntoull10rnd)(CHARSET_INFO *cs, |
212 | 239 | const char *str, size_t length, | 247 | const char *str, size_t length, |
213 | 240 | int unsigned_fl, | 248 | int unsigned_fl, |
214 | 241 | char **endptr, int *error); | 249 | char **endptr, int *error); |
216 | 242 | size_t (*scan)(struct charset_info_st *, const char *b, const char *e, | 250 | size_t (*scan)(CHARSET_INFO *, const char *b, const char *e, |
217 | 243 | int sq); | 251 | int sq); |
219 | 244 | } MY_CHARSET_HANDLER; | 252 | }; |
220 | 245 | 253 | ||
221 | 246 | extern MY_CHARSET_HANDLER my_charset_8bit_handler; | 254 | extern MY_CHARSET_HANDLER my_charset_8bit_handler; |
222 | 247 | extern MY_CHARSET_HANDLER my_charset_ucs2_handler; | 255 | extern MY_CHARSET_HANDLER my_charset_ucs2_handler; |
223 | 248 | 256 | ||
224 | 249 | 257 | ||
225 | 250 | /* See strings/CHARSET_INFO.txt about information on this structure */ | 258 | /* See strings/CHARSET_INFO.txt about information on this structure */ |
227 | 251 | typedef struct charset_info_st | 259 | struct charset_info_st |
228 | 252 | { | 260 | { |
229 | 253 | uint number; | 261 | uint number; |
230 | 254 | uint primary_number; | 262 | uint primary_number; |
231 | @@ -258,17 +266,17 @@ | |||
232 | 258 | const char *name; | 266 | const char *name; |
233 | 259 | const char *comment; | 267 | const char *comment; |
234 | 260 | const char *tailoring; | 268 | const char *tailoring; |
242 | 261 | uchar *ctype; | 269 | const uchar *ctype; |
243 | 262 | uchar *to_lower; | 270 | const uchar *to_lower; |
244 | 263 | uchar *to_upper; | 271 | const uchar *to_upper; |
245 | 264 | uchar *sort_order; | 272 | const uchar *sort_order; |
246 | 265 | uint16 *contractions; | 273 | const uint16 *contractions; |
247 | 266 | uint16 **sort_order_big; | 274 | const uint16 *const *sort_order_big; |
248 | 267 | uint16 *tab_to_uni; | 275 | const uint16 *tab_to_uni; |
249 | 268 | MY_UNI_IDX *tab_from_uni; | 276 | MY_UNI_IDX *tab_from_uni; |
253 | 269 | MY_UNICASE_INFO **caseinfo; | 277 | MY_UNICASE_INFO *const *caseinfo; |
254 | 270 | uchar *state_map; | 278 | const uchar *state_map; |
255 | 271 | uchar *ident_map; | 279 | const uchar *ident_map; |
256 | 272 | uint strxfrm_multiply; | 280 | uint strxfrm_multiply; |
257 | 273 | uchar caseup_multiply; | 281 | uchar caseup_multiply; |
258 | 274 | uchar casedn_multiply; | 282 | uchar casedn_multiply; |
259 | @@ -282,41 +290,43 @@ | |||
260 | 282 | MY_CHARSET_HANDLER *cset; | 290 | MY_CHARSET_HANDLER *cset; |
261 | 283 | MY_COLLATION_HANDLER *coll; | 291 | MY_COLLATION_HANDLER *coll; |
262 | 284 | 292 | ||
264 | 285 | } CHARSET_INFO; | 293 | }; |
265 | 286 | #define ILLEGAL_CHARSET_INFO_NUMBER (~0U) | 294 | #define ILLEGAL_CHARSET_INFO_NUMBER (~0U) |
266 | 287 | 295 | ||
299 | 288 | 296 | #ifndef CHARSET_EXTERN | |
300 | 289 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_bin; | 297 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT CHARSET_INFO |
301 | 290 | extern CHARSET_INFO my_charset_big5_chinese_ci; | 298 | #endif |
302 | 291 | extern CHARSET_INFO my_charset_big5_bin; | 299 | extern CHARSET_EXTERN my_charset_bin; |
303 | 292 | extern CHARSET_INFO my_charset_cp932_japanese_ci; | 300 | extern CHARSET_EXTERN my_charset_big5_chinese_ci; |
304 | 293 | extern CHARSET_INFO my_charset_cp932_bin; | 301 | extern CHARSET_EXTERN my_charset_big5_bin; |
305 | 294 | extern CHARSET_INFO my_charset_eucjpms_japanese_ci; | 302 | extern CHARSET_EXTERN my_charset_cp932_japanese_ci; |
306 | 295 | extern CHARSET_INFO my_charset_eucjpms_bin; | 303 | extern CHARSET_EXTERN my_charset_cp932_bin; |
307 | 296 | extern CHARSET_INFO my_charset_euckr_korean_ci; | 304 | extern CHARSET_EXTERN my_charset_eucjpms_japanese_ci; |
308 | 297 | extern CHARSET_INFO my_charset_euckr_bin; | 305 | extern CHARSET_EXTERN my_charset_eucjpms_bin; |
309 | 298 | extern CHARSET_INFO my_charset_gb2312_chinese_ci; | 306 | extern CHARSET_EXTERN my_charset_euckr_korean_ci; |
310 | 299 | extern CHARSET_INFO my_charset_gb2312_bin; | 307 | extern CHARSET_EXTERN my_charset_euckr_bin; |
311 | 300 | extern CHARSET_INFO my_charset_gbk_chinese_ci; | 308 | extern CHARSET_EXTERN my_charset_gb2312_chinese_ci; |
312 | 301 | extern CHARSET_INFO my_charset_gbk_bin; | 309 | extern CHARSET_EXTERN my_charset_gb2312_bin; |
313 | 302 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_latin1; | 310 | extern CHARSET_EXTERN my_charset_gbk_chinese_ci; |
314 | 303 | extern CHARSET_INFO my_charset_latin1_german2_ci; | 311 | extern CHARSET_EXTERN my_charset_gbk_bin; |
315 | 304 | extern CHARSET_INFO my_charset_latin1_bin; | 312 | extern CHARSET_EXTERN my_charset_latin1; |
316 | 305 | extern CHARSET_INFO my_charset_latin2_czech_ci; | 313 | extern CHARSET_EXTERN my_charset_latin1_german2_ci; |
317 | 306 | extern CHARSET_INFO my_charset_sjis_japanese_ci; | 314 | extern CHARSET_EXTERN my_charset_latin1_bin; |
318 | 307 | extern CHARSET_INFO my_charset_sjis_bin; | 315 | extern CHARSET_EXTERN my_charset_latin2_czech_ci; |
319 | 308 | extern CHARSET_INFO my_charset_tis620_thai_ci; | 316 | extern CHARSET_EXTERN my_charset_sjis_japanese_ci; |
320 | 309 | extern CHARSET_INFO my_charset_tis620_bin; | 317 | extern CHARSET_EXTERN my_charset_sjis_bin; |
321 | 310 | extern CHARSET_INFO my_charset_ucs2_general_ci; | 318 | extern CHARSET_EXTERN my_charset_tis620_thai_ci; |
322 | 311 | extern CHARSET_INFO my_charset_ucs2_bin; | 319 | extern CHARSET_EXTERN my_charset_tis620_bin; |
323 | 312 | extern CHARSET_INFO my_charset_ucs2_unicode_ci; | 320 | extern CHARSET_EXTERN my_charset_ucs2_general_ci; |
324 | 313 | extern CHARSET_INFO my_charset_ujis_japanese_ci; | 321 | extern CHARSET_EXTERN my_charset_ucs2_bin; |
325 | 314 | extern CHARSET_INFO my_charset_ujis_bin; | 322 | extern CHARSET_EXTERN my_charset_ucs2_unicode_ci; |
326 | 315 | extern CHARSET_INFO my_charset_utf8_general_ci; | 323 | extern CHARSET_EXTERN my_charset_ujis_japanese_ci; |
327 | 316 | extern CHARSET_INFO my_charset_utf8_unicode_ci; | 324 | extern CHARSET_EXTERN my_charset_ujis_bin; |
328 | 317 | extern CHARSET_INFO my_charset_utf8_bin; | 325 | extern CHARSET_EXTERN my_charset_utf8_general_ci; |
329 | 318 | extern CHARSET_INFO my_charset_cp1250_czech_ci; | 326 | extern CHARSET_EXTERN my_charset_utf8_unicode_ci; |
330 | 319 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_filename; | 327 | extern CHARSET_EXTERN my_charset_utf8_bin; |
331 | 328 | extern CHARSET_EXTERN my_charset_cp1250_czech_ci; | ||
332 | 329 | extern CHARSET_EXTERN my_charset_filename; | ||
333 | 320 | 330 | ||
334 | 321 | /* declarations for simple charsets */ | 331 | /* declarations for simple charsets */ |
335 | 322 | extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, | 332 | extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, |
336 | @@ -335,7 +345,7 @@ | |||
337 | 335 | 345 | ||
338 | 336 | extern size_t my_lengthsp_8bit(CHARSET_INFO *cs, const char *ptr, size_t length); | 346 | extern size_t my_lengthsp_8bit(CHARSET_INFO *cs, const char *ptr, size_t length); |
339 | 337 | 347 | ||
341 | 338 | extern uint my_instr_simple(struct charset_info_st *, | 348 | extern uint my_instr_simple(CHARSET_INFO *, |
342 | 339 | const char *b, size_t b_length, | 349 | const char *b, size_t b_length, |
343 | 340 | const char *s, size_t s_length, | 350 | const char *s, size_t s_length, |
344 | 341 | my_match_t *match, uint nmatch); | 351 | my_match_t *match, uint nmatch); |
345 | @@ -359,7 +369,7 @@ | |||
346 | 359 | 369 | ||
347 | 360 | size_t my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq); | 370 | size_t my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq); |
348 | 361 | 371 | ||
350 | 362 | size_t my_snprintf_8bit(struct charset_info_st *, char *to, size_t n, | 372 | size_t my_snprintf_8bit(CHARSET_INFO *, char *to, size_t n, |
351 | 363 | const char *fmt, ...) | 373 | const char *fmt, ...) |
352 | 364 | ATTRIBUTE_FORMAT(printf, 4, 5); | 374 | ATTRIBUTE_FORMAT(printf, 4, 5); |
353 | 365 | 375 | ||
354 | @@ -450,7 +460,7 @@ | |||
355 | 450 | size_t my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, size_t pos); | 460 | size_t my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, size_t pos); |
356 | 451 | size_t my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, | 461 | size_t my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, |
357 | 452 | size_t pos, int *error); | 462 | size_t pos, int *error); |
359 | 453 | uint my_instr_mb(struct charset_info_st *, | 463 | uint my_instr_mb(CHARSET_INFO *, |
360 | 454 | const char *b, size_t b_length, | 464 | const char *b, size_t b_length, |
361 | 455 | const char *s, size_t s_length, | 465 | const char *s, size_t s_length, |
362 | 456 | my_match_t *match, uint nmatch); | 466 | my_match_t *match, uint nmatch); |
363 | @@ -459,10 +469,10 @@ | |||
364 | 459 | const char *str, const char *str_end, | 469 | const char *str, const char *str_end, |
365 | 460 | const char *wildstr, const char *wildend, | 470 | const char *wildstr, const char *wildend, |
366 | 461 | int escape, int w_one, int w_many, | 471 | int escape, int w_one, int w_many, |
368 | 462 | MY_UNICASE_INFO **weights); | 472 | MY_UNICASE_INFO *const *weights); |
369 | 463 | 473 | ||
370 | 464 | extern my_bool my_parse_charset_xml(const char *bug, size_t len, | 474 | extern my_bool my_parse_charset_xml(const char *bug, size_t len, |
372 | 465 | int (*add)(CHARSET_INFO *cs)); | 475 | int (*add)(struct charset_info_st *cs)); |
373 | 466 | extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, | 476 | extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, |
374 | 467 | pchar c); | 477 | pchar c); |
375 | 468 | 478 | ||
376 | 469 | 479 | ||
377 | === modified file 'include/m_string.h' | |||
378 | --- include/m_string.h 2009-08-13 21:12:12 +0000 | |||
379 | +++ include/m_string.h 2009-11-03 19:35:25 +0000 | |||
380 | @@ -89,8 +89,8 @@ | |||
381 | 89 | #endif | 89 | #endif |
382 | 90 | 90 | ||
383 | 91 | /* Declared in int2str() */ | 91 | /* Declared in int2str() */ |
386 | 92 | extern char NEAR _dig_vec_upper[]; | 92 | extern const char NEAR _dig_vec_upper[]; |
387 | 93 | extern char NEAR _dig_vec_lower[]; | 93 | extern const char NEAR _dig_vec_lower[]; |
388 | 94 | 94 | ||
389 | 95 | /* Defined in strtod.c */ | 95 | /* Defined in strtod.c */ |
390 | 96 | extern const double log_10[309]; | 96 | extern const double log_10[309]; |
391 | 97 | 97 | ||
392 | === modified file 'include/my_sys.h' | |||
393 | --- include/my_sys.h 2009-09-07 20:50:10 +0000 | |||
394 | +++ include/my_sys.h 2009-11-03 19:35:25 +0000 | |||
395 | @@ -231,7 +231,7 @@ | |||
396 | 231 | /* charsets */ | 231 | /* charsets */ |
397 | 232 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; | 232 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; |
398 | 233 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[256]; | 233 | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[256]; |
400 | 234 | extern CHARSET_INFO compiled_charsets[]; | 234 | extern struct charset_info_st compiled_charsets[]; |
401 | 235 | 235 | ||
402 | 236 | /* statistics */ | 236 | /* statistics */ |
403 | 237 | extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; | 237 | extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; |
404 | @@ -992,7 +992,7 @@ | |||
405 | 992 | extern char *get_charsets_dir(char *buf); | 992 | extern char *get_charsets_dir(char *buf); |
406 | 993 | extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); | 993 | extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); |
407 | 994 | extern my_bool init_compiled_charsets(myf flags); | 994 | extern my_bool init_compiled_charsets(myf flags); |
409 | 995 | extern void add_compiled_collation(CHARSET_INFO *cs); | 995 | extern void add_compiled_collation(struct charset_info_st *cs); |
410 | 996 | extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info, | 996 | extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info, |
411 | 997 | char *to, size_t to_length, | 997 | char *to, size_t to_length, |
412 | 998 | const char *from, size_t length); | 998 | const char *from, size_t length); |
413 | 999 | 999 | ||
414 | === modified file 'mysys/charset-def.c' | |||
415 | --- mysys/charset-def.c 2007-06-21 20:10:40 +0000 | |||
416 | +++ mysys/charset-def.c 2009-11-03 19:35:25 +0000 | |||
417 | @@ -13,6 +13,7 @@ | |||
418 | 13 | along with this program; if not, write to the Free Software | 13 | along with this program; if not, write to the Free Software |
419 | 14 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 14 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ |
420 | 15 | 15 | ||
421 | 16 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
422 | 16 | #include "mysys_priv.h" | 17 | #include "mysys_priv.h" |
423 | 17 | 18 | ||
424 | 18 | /* | 19 | /* |
425 | @@ -24,47 +25,47 @@ | |||
426 | 24 | #ifdef HAVE_UCA_COLLATIONS | 25 | #ifdef HAVE_UCA_COLLATIONS |
427 | 25 | 26 | ||
428 | 26 | #ifdef HAVE_CHARSET_ucs2 | 27 | #ifdef HAVE_CHARSET_ucs2 |
447 | 27 | extern CHARSET_INFO my_charset_ucs2_icelandic_uca_ci; | 28 | extern struct charset_info_st my_charset_ucs2_icelandic_uca_ci; |
448 | 28 | extern CHARSET_INFO my_charset_ucs2_latvian_uca_ci; | 29 | extern struct charset_info_st my_charset_ucs2_latvian_uca_ci; |
449 | 29 | extern CHARSET_INFO my_charset_ucs2_romanian_uca_ci; | 30 | extern struct charset_info_st my_charset_ucs2_romanian_uca_ci; |
450 | 30 | extern CHARSET_INFO my_charset_ucs2_slovenian_uca_ci; | 31 | extern struct charset_info_st my_charset_ucs2_slovenian_uca_ci; |
451 | 31 | extern CHARSET_INFO my_charset_ucs2_polish_uca_ci; | 32 | extern struct charset_info_st my_charset_ucs2_polish_uca_ci; |
452 | 32 | extern CHARSET_INFO my_charset_ucs2_estonian_uca_ci; | 33 | extern struct charset_info_st my_charset_ucs2_estonian_uca_ci; |
453 | 33 | extern CHARSET_INFO my_charset_ucs2_spanish_uca_ci; | 34 | extern struct charset_info_st my_charset_ucs2_spanish_uca_ci; |
454 | 34 | extern CHARSET_INFO my_charset_ucs2_swedish_uca_ci; | 35 | extern struct charset_info_st my_charset_ucs2_swedish_uca_ci; |
455 | 35 | extern CHARSET_INFO my_charset_ucs2_turkish_uca_ci; | 36 | extern struct charset_info_st my_charset_ucs2_turkish_uca_ci; |
456 | 36 | extern CHARSET_INFO my_charset_ucs2_czech_uca_ci; | 37 | extern struct charset_info_st my_charset_ucs2_czech_uca_ci; |
457 | 37 | extern CHARSET_INFO my_charset_ucs2_danish_uca_ci; | 38 | extern struct charset_info_st my_charset_ucs2_danish_uca_ci; |
458 | 38 | extern CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci; | 39 | extern struct charset_info_st my_charset_ucs2_lithuanian_uca_ci; |
459 | 39 | extern CHARSET_INFO my_charset_ucs2_slovak_uca_ci; | 40 | extern struct charset_info_st my_charset_ucs2_slovak_uca_ci; |
460 | 40 | extern CHARSET_INFO my_charset_ucs2_spanish2_uca_ci; | 41 | extern struct charset_info_st my_charset_ucs2_spanish2_uca_ci; |
461 | 41 | extern CHARSET_INFO my_charset_ucs2_roman_uca_ci; | 42 | extern struct charset_info_st my_charset_ucs2_roman_uca_ci; |
462 | 42 | extern CHARSET_INFO my_charset_ucs2_persian_uca_ci; | 43 | extern struct charset_info_st my_charset_ucs2_persian_uca_ci; |
463 | 43 | extern CHARSET_INFO my_charset_ucs2_esperanto_uca_ci; | 44 | extern struct charset_info_st my_charset_ucs2_esperanto_uca_ci; |
464 | 44 | extern CHARSET_INFO my_charset_ucs2_hungarian_uca_ci; | 45 | extern struct charset_info_st my_charset_ucs2_hungarian_uca_ci; |
465 | 45 | #endif | 46 | #endif |
466 | 46 | 47 | ||
467 | 47 | #ifdef HAVE_CHARSET_utf8 | 48 | #ifdef HAVE_CHARSET_utf8 |
486 | 48 | extern CHARSET_INFO my_charset_utf8_icelandic_uca_ci; | 49 | extern struct charset_info_st my_charset_utf8_icelandic_uca_ci; |
487 | 49 | extern CHARSET_INFO my_charset_utf8_latvian_uca_ci; | 50 | extern struct charset_info_st my_charset_utf8_latvian_uca_ci; |
488 | 50 | extern CHARSET_INFO my_charset_utf8_romanian_uca_ci; | 51 | extern struct charset_info_st my_charset_utf8_romanian_uca_ci; |
489 | 51 | extern CHARSET_INFO my_charset_utf8_slovenian_uca_ci; | 52 | extern struct charset_info_st my_charset_utf8_slovenian_uca_ci; |
490 | 52 | extern CHARSET_INFO my_charset_utf8_polish_uca_ci; | 53 | extern struct charset_info_st my_charset_utf8_polish_uca_ci; |
491 | 53 | extern CHARSET_INFO my_charset_utf8_estonian_uca_ci; | 54 | extern struct charset_info_st my_charset_utf8_estonian_uca_ci; |
492 | 54 | extern CHARSET_INFO my_charset_utf8_spanish_uca_ci; | 55 | extern struct charset_info_st my_charset_utf8_spanish_uca_ci; |
493 | 55 | extern CHARSET_INFO my_charset_utf8_swedish_uca_ci; | 56 | extern struct charset_info_st my_charset_utf8_swedish_uca_ci; |
494 | 56 | extern CHARSET_INFO my_charset_utf8_turkish_uca_ci; | 57 | extern struct charset_info_st my_charset_utf8_turkish_uca_ci; |
495 | 57 | extern CHARSET_INFO my_charset_utf8_czech_uca_ci; | 58 | extern struct charset_info_st my_charset_utf8_czech_uca_ci; |
496 | 58 | extern CHARSET_INFO my_charset_utf8_danish_uca_ci; | 59 | extern struct charset_info_st my_charset_utf8_danish_uca_ci; |
497 | 59 | extern CHARSET_INFO my_charset_utf8_lithuanian_uca_ci; | 60 | extern struct charset_info_st my_charset_utf8_lithuanian_uca_ci; |
498 | 60 | extern CHARSET_INFO my_charset_utf8_slovak_uca_ci; | 61 | extern struct charset_info_st my_charset_utf8_slovak_uca_ci; |
499 | 61 | extern CHARSET_INFO my_charset_utf8_spanish2_uca_ci; | 62 | extern struct charset_info_st my_charset_utf8_spanish2_uca_ci; |
500 | 62 | extern CHARSET_INFO my_charset_utf8_roman_uca_ci; | 63 | extern struct charset_info_st my_charset_utf8_roman_uca_ci; |
501 | 63 | extern CHARSET_INFO my_charset_utf8_persian_uca_ci; | 64 | extern struct charset_info_st my_charset_utf8_persian_uca_ci; |
502 | 64 | extern CHARSET_INFO my_charset_utf8_esperanto_uca_ci; | 65 | extern struct charset_info_st my_charset_utf8_esperanto_uca_ci; |
503 | 65 | extern CHARSET_INFO my_charset_utf8_hungarian_uca_ci; | 66 | extern struct charset_info_st my_charset_utf8_hungarian_uca_ci; |
504 | 66 | #ifdef HAVE_UTF8_GENERAL_CS | 67 | #ifdef HAVE_UTF8_GENERAL_CS |
506 | 67 | extern CHARSET_INFO my_charset_utf8_general_cs; | 68 | extern struct charset_info_st my_charset_utf8_general_cs; |
507 | 68 | #endif | 69 | #endif |
508 | 69 | #endif | 70 | #endif |
509 | 70 | 71 | ||
510 | 71 | 72 | ||
511 | === modified file 'mysys/charset.c' | |||
512 | --- mysys/charset.c 2009-09-07 20:50:10 +0000 | |||
513 | +++ mysys/charset.c 2009-11-03 19:35:25 +0000 | |||
514 | @@ -53,21 +53,18 @@ | |||
515 | 53 | } | 53 | } |
516 | 54 | 54 | ||
517 | 55 | 55 | ||
519 | 56 | static my_bool init_state_maps(CHARSET_INFO *cs) | 56 | static my_bool init_state_maps(struct charset_info_st *cs) |
520 | 57 | { | 57 | { |
521 | 58 | uint i; | 58 | uint i; |
522 | 59 | uchar *state_map; | 59 | uchar *state_map; |
523 | 60 | uchar *ident_map; | 60 | uchar *ident_map; |
524 | 61 | 61 | ||
526 | 62 | if (!(cs->state_map= (uchar*) my_once_alloc(256, MYF(MY_WME)))) | 62 | if (!(cs->state_map= state_map= (uchar*) my_once_alloc(256, MYF(MY_WME)))) |
527 | 63 | return 1; | 63 | return 1; |
528 | 64 | 64 | ||
530 | 65 | if (!(cs->ident_map= (uchar*) my_once_alloc(256, MYF(MY_WME)))) | 65 | if (!(cs->ident_map= ident_map= (uchar*) my_once_alloc(256, MYF(MY_WME)))) |
531 | 66 | return 1; | 66 | return 1; |
532 | 67 | 67 | ||
533 | 68 | state_map= cs->state_map; | ||
534 | 69 | ident_map= cs->ident_map; | ||
535 | 70 | |||
536 | 71 | /* Fill state_map with states to get a faster parser */ | 68 | /* Fill state_map with states to get a faster parser */ |
537 | 72 | for (i=0; i < 256 ; i++) | 69 | for (i=0; i < 256 ; i++) |
538 | 73 | { | 70 | { |
539 | @@ -118,7 +115,7 @@ | |||
540 | 118 | } | 115 | } |
541 | 119 | 116 | ||
542 | 120 | 117 | ||
544 | 121 | static void simple_cs_init_functions(CHARSET_INFO *cs) | 118 | static void simple_cs_init_functions(struct charset_info_st *cs) |
545 | 122 | { | 119 | { |
546 | 123 | if (cs->state & MY_CS_BINSORT) | 120 | if (cs->state & MY_CS_BINSORT) |
547 | 124 | cs->coll= &my_collation_8bit_bin_handler; | 121 | cs->coll= &my_collation_8bit_bin_handler; |
548 | @@ -130,7 +127,7 @@ | |||
549 | 130 | 127 | ||
550 | 131 | 128 | ||
551 | 132 | 129 | ||
553 | 133 | static int cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from) | 130 | static int cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from) |
554 | 134 | { | 131 | { |
555 | 135 | to->number= from->number ? from->number : to->number; | 132 | to->number= from->number ? from->number : to->number; |
556 | 136 | 133 | ||
557 | @@ -203,7 +200,7 @@ | |||
558 | 203 | 200 | ||
559 | 204 | 201 | ||
560 | 205 | static void | 202 | static void |
562 | 206 | copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from) | 203 | copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from) |
563 | 207 | { | 204 | { |
564 | 208 | to->cset= from->cset; | 205 | to->cset= from->cset; |
565 | 209 | to->coll= from->coll; | 206 | to->coll= from->coll; |
566 | @@ -217,17 +214,18 @@ | |||
567 | 217 | } | 214 | } |
568 | 218 | 215 | ||
569 | 219 | 216 | ||
571 | 220 | static int add_collation(CHARSET_INFO *cs) | 217 | static int add_collation(struct charset_info_st *cs) |
572 | 221 | { | 218 | { |
573 | 222 | if (cs->name && (cs->number || | 219 | if (cs->name && (cs->number || |
574 | 223 | (cs->number=get_collation_number_internal(cs->name)))) | 220 | (cs->number=get_collation_number_internal(cs->name)))) |
575 | 224 | { | 221 | { |
577 | 225 | if (!all_charsets[cs->number]) | 222 | struct charset_info_st *newcs; |
578 | 223 | if (!(newcs= (struct charset_info_st*) all_charsets[cs->number])) | ||
579 | 226 | { | 224 | { |
582 | 227 | if (!(all_charsets[cs->number]= | 225 | if (!(all_charsets[cs->number]= newcs= |
583 | 228 | (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0)))) | 226 | (struct charset_info_st*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0)))) |
584 | 229 | return MY_XML_ERROR; | 227 | return MY_XML_ERROR; |
586 | 230 | bzero((void*)all_charsets[cs->number],sizeof(CHARSET_INFO)); | 228 | bzero(newcs,sizeof(CHARSET_INFO)); |
587 | 231 | } | 229 | } |
588 | 232 | 230 | ||
589 | 233 | if (cs->primary_number == cs->number) | 231 | if (cs->primary_number == cs->number) |
590 | @@ -236,12 +234,11 @@ | |||
591 | 236 | if (cs->binary_number == cs->number) | 234 | if (cs->binary_number == cs->number) |
592 | 237 | cs->state |= MY_CS_BINSORT; | 235 | cs->state |= MY_CS_BINSORT; |
593 | 238 | 236 | ||
595 | 239 | all_charsets[cs->number]->state|= cs->state; | 237 | newcs->state|= cs->state; |
596 | 240 | 238 | ||
598 | 241 | if (!(all_charsets[cs->number]->state & MY_CS_COMPILED)) | 239 | if (!(newcs->state & MY_CS_COMPILED)) |
599 | 242 | { | 240 | { |
602 | 243 | CHARSET_INFO *newcs= all_charsets[cs->number]; | 241 | if (cs_copy_data(newcs,cs)) |
601 | 244 | if (cs_copy_data(all_charsets[cs->number],cs)) | ||
603 | 245 | return MY_XML_ERROR; | 242 | return MY_XML_ERROR; |
604 | 246 | 243 | ||
605 | 247 | if (!strcmp(cs->csname,"ucs2") ) | 244 | if (!strcmp(cs->csname,"ucs2") ) |
606 | @@ -259,15 +256,15 @@ | |||
607 | 259 | } | 256 | } |
608 | 260 | else | 257 | else |
609 | 261 | { | 258 | { |
612 | 262 | uchar *sort_order= all_charsets[cs->number]->sort_order; | 259 | const uchar *sort_order= newcs->sort_order; |
613 | 263 | simple_cs_init_functions(all_charsets[cs->number]); | 260 | simple_cs_init_functions(newcs); |
614 | 264 | newcs->mbminlen= 1; | 261 | newcs->mbminlen= 1; |
615 | 265 | newcs->mbmaxlen= 1; | 262 | newcs->mbmaxlen= 1; |
617 | 266 | if (simple_cs_is_full(all_charsets[cs->number])) | 263 | if (simple_cs_is_full(newcs)) |
618 | 267 | { | 264 | { |
620 | 268 | all_charsets[cs->number]->state |= MY_CS_LOADED; | 265 | newcs->state |= MY_CS_LOADED; |
621 | 269 | } | 266 | } |
623 | 270 | all_charsets[cs->number]->state|= MY_CS_AVAILABLE; | 267 | newcs->state|= MY_CS_AVAILABLE; |
624 | 271 | 268 | ||
625 | 272 | /* | 269 | /* |
626 | 273 | Check if case sensitive sort order: A < a < B. | 270 | Check if case sensitive sort order: A < a < B. |
627 | @@ -277,12 +274,12 @@ | |||
628 | 277 | */ | 274 | */ |
629 | 278 | if (sort_order && sort_order['A'] < sort_order['a'] && | 275 | if (sort_order && sort_order['A'] < sort_order['a'] && |
630 | 279 | sort_order['a'] < sort_order['B']) | 276 | sort_order['a'] < sort_order['B']) |
632 | 280 | all_charsets[cs->number]->state|= MY_CS_CSSORT; | 277 | newcs->state|= MY_CS_CSSORT; |
633 | 281 | 278 | ||
636 | 282 | if (my_charset_is_8bit_pure_ascii(all_charsets[cs->number])) | 279 | if (my_charset_is_8bit_pure_ascii(newcs)) |
637 | 283 | all_charsets[cs->number]->state|= MY_CS_PUREASCII; | 280 | newcs->state|= MY_CS_PUREASCII; |
638 | 284 | if (!my_charset_is_ascii_compatible(cs)) | 281 | if (!my_charset_is_ascii_compatible(cs)) |
640 | 285 | all_charsets[cs->number]->state|= MY_CS_NONASCII; | 282 | newcs->state|= MY_CS_NONASCII; |
641 | 286 | } | 283 | } |
642 | 287 | } | 284 | } |
643 | 288 | else | 285 | else |
644 | @@ -296,16 +293,15 @@ | |||
645 | 296 | If a character set was compiled, this information | 293 | If a character set was compiled, this information |
646 | 297 | will get lost and overwritten in add_compiled_collation(). | 294 | will get lost and overwritten in add_compiled_collation(). |
647 | 298 | */ | 295 | */ |
650 | 299 | CHARSET_INFO *dst= all_charsets[cs->number]; | 296 | newcs->number= cs->number; |
649 | 300 | dst->number= cs->number; | ||
651 | 301 | if (cs->comment) | 297 | if (cs->comment) |
653 | 302 | if (!(dst->comment= my_once_strdup(cs->comment,MYF(MY_WME)))) | 298 | if (!(newcs->comment= my_once_strdup(cs->comment,MYF(MY_WME)))) |
654 | 303 | return MY_XML_ERROR; | 299 | return MY_XML_ERROR; |
655 | 304 | if (cs->csname) | 300 | if (cs->csname) |
657 | 305 | if (!(dst->csname= my_once_strdup(cs->csname,MYF(MY_WME)))) | 301 | if (!(newcs->csname= my_once_strdup(cs->csname,MYF(MY_WME)))) |
658 | 306 | return MY_XML_ERROR; | 302 | return MY_XML_ERROR; |
659 | 307 | if (cs->name) | 303 | if (cs->name) |
661 | 308 | if (!(dst->name= my_once_strdup(cs->name,MYF(MY_WME)))) | 304 | if (!(newcs->name= my_once_strdup(cs->name,MYF(MY_WME)))) |
662 | 309 | return MY_XML_ERROR; | 305 | return MY_XML_ERROR; |
663 | 310 | } | 306 | } |
664 | 311 | cs->number= 0; | 307 | cs->number= 0; |
665 | @@ -390,7 +386,7 @@ | |||
666 | 390 | CHARSET_INFO *all_charsets[256]={NULL}; | 386 | CHARSET_INFO *all_charsets[256]={NULL}; |
667 | 391 | CHARSET_INFO *default_charset_info = &my_charset_latin1; | 387 | CHARSET_INFO *default_charset_info = &my_charset_latin1; |
668 | 392 | 388 | ||
670 | 393 | void add_compiled_collation(CHARSET_INFO *cs) | 389 | void add_compiled_collation(struct charset_info_st *cs) |
671 | 394 | { | 390 | { |
672 | 395 | all_charsets[cs->number]= cs; | 391 | all_charsets[cs->number]= cs; |
673 | 396 | cs->state|= MY_CS_AVAILABLE; | 392 | cs->state|= MY_CS_AVAILABLE; |
674 | @@ -416,7 +412,7 @@ | |||
675 | 416 | */ | 412 | */ |
676 | 417 | if (!charset_initialized) | 413 | if (!charset_initialized) |
677 | 418 | { | 414 | { |
679 | 419 | CHARSET_INFO **cs; | 415 | struct charset_info_st **cs; |
680 | 420 | /* | 416 | /* |
681 | 421 | To make things thread safe we are not allowing other threads to interfere | 417 | To make things thread safe we are not allowing other threads to interfere |
682 | 422 | while we may changing the cs_info_table | 418 | while we may changing the cs_info_table |
683 | @@ -428,8 +424,9 @@ | |||
684 | 428 | init_compiled_charsets(myflags); | 424 | init_compiled_charsets(myflags); |
685 | 429 | 425 | ||
686 | 430 | /* Copy compiled charsets */ | 426 | /* Copy compiled charsets */ |
689 | 431 | for (cs=all_charsets; | 427 | for (cs= (struct charset_info_st**) all_charsets; |
690 | 432 | cs < all_charsets+array_elements(all_charsets)-1 ; | 428 | cs < (struct charset_info_st**) all_charsets + |
691 | 429 | array_elements(all_charsets)-1 ; | ||
692 | 433 | cs++) | 430 | cs++) |
693 | 434 | { | 431 | { |
694 | 435 | if (*cs) | 432 | if (*cs) |
695 | @@ -496,9 +493,9 @@ | |||
696 | 496 | static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) | 493 | static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) |
697 | 497 | { | 494 | { |
698 | 498 | char buf[FN_REFLEN]; | 495 | char buf[FN_REFLEN]; |
700 | 499 | CHARSET_INFO *cs; | 496 | struct charset_info_st *cs; |
701 | 500 | 497 | ||
703 | 501 | if ((cs= all_charsets[cs_number])) | 498 | if ((cs= (struct charset_info_st*) all_charsets[cs_number])) |
704 | 502 | { | 499 | { |
705 | 503 | if (cs->state & MY_CS_READY) /* if CS is already initialized */ | 500 | if (cs->state & MY_CS_READY) /* if CS is already initialized */ |
706 | 504 | return cs; | 501 | return cs; |
707 | 505 | 502 | ||
708 | === modified file 'sql/item_cmpfunc.h' | |||
709 | --- sql/item_cmpfunc.h 2009-08-20 15:51:02 +0000 | |||
710 | +++ sql/item_cmpfunc.h 2009-11-03 19:35:25 +0000 | |||
711 | @@ -756,7 +756,7 @@ | |||
712 | 756 | virtual uchar *get_value(Item *item)=0; | 756 | virtual uchar *get_value(Item *item)=0; |
713 | 757 | void sort() | 757 | void sort() |
714 | 758 | { | 758 | { |
716 | 759 | my_qsort2(base,used_count,size,compare,collation); | 759 | my_qsort2(base,used_count,size,compare,(void*)collation); |
717 | 760 | } | 760 | } |
718 | 761 | int find(Item *item); | 761 | int find(Item *item); |
719 | 762 | 762 | ||
720 | 763 | 763 | ||
721 | === modified file 'sql/sql_class.cc' | |||
722 | --- sql/sql_class.cc 2009-09-15 10:46:35 +0000 | |||
723 | +++ sql/sql_class.cc 2009-11-03 19:35:25 +0000 | |||
724 | @@ -3003,7 +3003,7 @@ | |||
725 | 3003 | 3003 | ||
726 | 3004 | 3004 | ||
727 | 3005 | #ifdef INNODB_COMPATIBILITY_HOOKS | 3005 | #ifdef INNODB_COMPATIBILITY_HOOKS |
729 | 3006 | extern "C" struct charset_info_st *thd_charset(MYSQL_THD thd) | 3006 | extern "C" const struct charset_info_st *thd_charset(MYSQL_THD thd) |
730 | 3007 | { | 3007 | { |
731 | 3008 | return(thd->charset()); | 3008 | return(thd->charset()); |
732 | 3009 | } | 3009 | } |
733 | 3010 | 3010 | ||
734 | === modified file 'sql/sql_lex.cc' | |||
735 | --- sql/sql_lex.cc 2009-09-15 10:46:35 +0000 | |||
736 | +++ sql/sql_lex.cc 2009-11-03 19:35:25 +0000 | |||
737 | @@ -789,9 +789,9 @@ | |||
738 | 789 | Lex_input_stream *lip= & thd->m_parser_state->m_lip; | 789 | Lex_input_stream *lip= & thd->m_parser_state->m_lip; |
739 | 790 | LEX *lex= thd->lex; | 790 | LEX *lex= thd->lex; |
740 | 791 | YYSTYPE *yylval=(YYSTYPE*) arg; | 791 | YYSTYPE *yylval=(YYSTYPE*) arg; |
744 | 792 | CHARSET_INFO *cs= thd->charset(); | 792 | CHARSET_INFO *const cs= thd->charset(); |
745 | 793 | uchar *state_map= cs->state_map; | 793 | const uchar *const state_map= cs->state_map; |
746 | 794 | uchar *ident_map= cs->ident_map; | 794 | const uchar *const ident_map= cs->ident_map; |
747 | 795 | 795 | ||
748 | 796 | LINT_INIT(c); | 796 | LINT_INIT(c); |
749 | 797 | lip->yylval=yylval; // The global state | 797 | lip->yylval=yylval; // The global state |
750 | 798 | 798 | ||
751 | === modified file 'storage/pbxt/src/datadic_xt.cc' | |||
752 | --- storage/pbxt/src/datadic_xt.cc 2009-08-18 07:46:53 +0000 | |||
753 | +++ storage/pbxt/src/datadic_xt.cc 2009-11-03 19:35:25 +0000 | |||
754 | @@ -396,7 +396,7 @@ | |||
755 | 396 | struct charset_info_st; | 396 | struct charset_info_st; |
756 | 397 | 397 | ||
757 | 398 | class XTTokenizer { | 398 | class XTTokenizer { |
759 | 399 | struct charset_info_st *tkn_charset; | 399 | const struct charset_info_st *tkn_charset; |
760 | 400 | char *tkn_cstring; | 400 | char *tkn_cstring; |
761 | 401 | char *tkn_curr_pos; | 401 | char *tkn_curr_pos; |
762 | 402 | XTToken *tkn_current; | 402 | XTToken *tkn_current; |
763 | @@ -1329,7 +1329,7 @@ | |||
764 | 1329 | class XTCreateTable : public XTParseTable { | 1329 | class XTCreateTable : public XTParseTable { |
765 | 1330 | public: | 1330 | public: |
766 | 1331 | bool ct_convert; | 1331 | bool ct_convert; |
768 | 1332 | struct charset_info_st *ct_charset; | 1332 | const struct charset_info_st *ct_charset; |
769 | 1333 | XTPathStrPtr ct_tab_path; | 1333 | XTPathStrPtr ct_tab_path; |
770 | 1334 | u_int ct_contraint_no; | 1334 | u_int ct_contraint_no; |
771 | 1335 | XTDDTable *ct_curr_table; | 1335 | XTDDTable *ct_curr_table; |
772 | 1336 | 1336 | ||
773 | === modified file 'storage/pbxt/src/ha_pbxt.cc' | |||
774 | --- storage/pbxt/src/ha_pbxt.cc 2009-09-03 06:15:03 +0000 | |||
775 | +++ storage/pbxt/src/ha_pbxt.cc 2009-11-03 19:35:25 +0000 | |||
776 | @@ -1675,7 +1675,7 @@ | |||
777 | 1675 | if (!(self = ha_set_current_thread(thd, &err))) | 1675 | if (!(self = ha_set_current_thread(thd, &err))) |
778 | 1676 | return xt_ha_pbxt_to_mysql_error(err); | 1676 | return xt_ha_pbxt_to_mysql_error(err); |
779 | 1677 | try_(a) { | 1677 | try_(a) { |
781 | 1678 | err = myxt_statistics_fill_table(self, thd, tables, cond, system_charset_info); | 1678 | err = myxt_statistics_fill_table(self, thd, tables, cond, (void*) system_charset_info); |
782 | 1679 | } | 1679 | } |
783 | 1680 | catch_(a) { | 1680 | catch_(a) { |
784 | 1681 | err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE); | 1681 | err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE); |
785 | 1682 | 1682 | ||
786 | === modified file 'storage/pbxt/src/myxt_xt.cc' | |||
787 | --- storage/pbxt/src/myxt_xt.cc 2009-09-03 06:15:03 +0000 | |||
788 | +++ storage/pbxt/src/myxt_xt.cc 2009-11-03 19:35:25 +0000 | |||
789 | @@ -36,7 +36,7 @@ | |||
790 | 36 | #include <drizzled/current_session.h> | 36 | #include <drizzled/current_session.h> |
791 | 37 | #include <drizzled/sql_lex.h> | 37 | #include <drizzled/sql_lex.h> |
792 | 38 | #include <drizzled/session.h> | 38 | #include <drizzled/session.h> |
794 | 39 | extern "C" struct charset_info_st *session_charset(Session *session); | 39 | extern "C" const struct charset_info_st *session_charset(Session *session); |
795 | 40 | extern pthread_key_t THR_Session; | 40 | extern pthread_key_t THR_Session; |
796 | 41 | #else | 41 | #else |
797 | 42 | #include "mysql_priv.h" | 42 | #include "mysql_priv.h" |
798 | 43 | 43 | ||
799 | === modified file 'storage/pbxt/src/myxt_xt.h' | |||
800 | --- storage/pbxt/src/myxt_xt.h 2009-09-03 06:15:03 +0000 | |||
801 | +++ storage/pbxt/src/myxt_xt.h 2009-11-03 19:35:25 +0000 | |||
802 | @@ -67,17 +67,17 @@ | |||
803 | 67 | void myxt_move_dictionary(XTDictionaryPtr dic, XTDictionaryPtr source_dic); | 67 | void myxt_move_dictionary(XTDictionaryPtr dic, XTDictionaryPtr source_dic); |
804 | 68 | XTDDTable *myxt_create_table_from_table(XTThreadPtr self, STRUCT_TABLE *my_tab); | 68 | XTDDTable *myxt_create_table_from_table(XTThreadPtr self, STRUCT_TABLE *my_tab); |
805 | 69 | 69 | ||
808 | 70 | void myxt_static_convert_identifier(XTThreadPtr self, struct charset_info_st *cs, char *from, char *to, size_t to_len); | 70 | void myxt_static_convert_identifier(XTThreadPtr self, const struct charset_info_st *cs, char *from, char *to, size_t to_len); |
809 | 71 | char *myxt_convert_identifier(XTThreadPtr self, struct charset_info_st *cs, char *from); | 71 | char *myxt_convert_identifier(XTThreadPtr self, const struct charset_info_st *cs, char *from); |
810 | 72 | void myxt_static_convert_table_name(XTThreadPtr self, char *from, char *to, size_t to_len); | 72 | void myxt_static_convert_table_name(XTThreadPtr self, char *from, char *to, size_t to_len); |
811 | 73 | void myxt_static_convert_file_name(char *from, char *to, size_t to_len); | 73 | void myxt_static_convert_file_name(char *from, char *to, size_t to_len); |
812 | 74 | char *myxt_convert_table_name(XTThreadPtr self, char *from); | 74 | char *myxt_convert_table_name(XTThreadPtr self, char *from); |
813 | 75 | int myxt_strcasecmp(char * a, char *b); | 75 | int myxt_strcasecmp(char * a, char *b); |
817 | 76 | int myxt_isspace(struct charset_info_st *cs, char a); | 76 | int myxt_isspace(const struct charset_info_st *cs, char a); |
818 | 77 | int myxt_ispunct(struct charset_info_st *cs, char a); | 77 | int myxt_ispunct(const struct charset_info_st *cs, char a); |
819 | 78 | int myxt_isdigit(struct charset_info_st *cs, char a); | 78 | int myxt_isdigit(const struct charset_info_st *cs, char a); |
820 | 79 | 79 | ||
822 | 80 | struct charset_info_st *myxt_getcharset(bool convert); | 80 | const struct charset_info_st *myxt_getcharset(bool convert); |
823 | 81 | 81 | ||
824 | 82 | void *myxt_create_thread(); | 82 | void *myxt_create_thread(); |
825 | 83 | void myxt_destroy_thread(void *thread, xtBool end_threads); | 83 | void myxt_destroy_thread(void *thread, xtBool end_threads); |
826 | 84 | 84 | ||
827 | === modified file 'storage/pbxt/src/xt_defs.h' | |||
828 | --- storage/pbxt/src/xt_defs.h 2009-08-17 11:12:36 +0000 | |||
829 | +++ storage/pbxt/src/xt_defs.h 2009-11-03 19:35:25 +0000 | |||
830 | @@ -759,7 +759,7 @@ | |||
831 | 759 | #define MX_ULONG_T uint32_t | 759 | #define MX_ULONG_T uint32_t |
832 | 760 | #define MX_ULONGLONG_T uint64_t | 760 | #define MX_ULONGLONG_T uint64_t |
833 | 761 | #define MX_LONGLONG_T uint64_t | 761 | #define MX_LONGLONG_T uint64_t |
835 | 762 | #define MX_CHARSET_INFO struct charset_info_st | 762 | #define MX_CHARSET_INFO const struct charset_info_st |
836 | 763 | #define MX_CONST_CHARSET_INFO const struct charset_info_st | 763 | #define MX_CONST_CHARSET_INFO const struct charset_info_st |
837 | 764 | #define MX_CONST const | 764 | #define MX_CONST const |
838 | 765 | 765 | ||
839 | @@ -842,7 +842,7 @@ | |||
840 | 842 | #define MX_ULONGLONG_T ulonglong | 842 | #define MX_ULONGLONG_T ulonglong |
841 | 843 | #define MX_LONGLONG_T longlong | 843 | #define MX_LONGLONG_T longlong |
842 | 844 | #define MX_CHARSET_INFO CHARSET_INFO | 844 | #define MX_CHARSET_INFO CHARSET_INFO |
844 | 845 | #define MX_CONST_CHARSET_INFO struct charset_info_st | 845 | #define MX_CONST_CHARSET_INFO const struct charset_info_st |
845 | 846 | #define MX_CONST | 846 | #define MX_CONST |
846 | 847 | 847 | ||
847 | 848 | #endif // DRIZZLED | 848 | #endif // DRIZZLED |
848 | 849 | 849 | ||
849 | === modified file 'strings/conf_to_src.c' | |||
850 | --- strings/conf_to_src.c 2009-07-02 10:15:33 +0000 | |||
851 | +++ strings/conf_to_src.c 2009-11-03 19:35:25 +0000 | |||
852 | @@ -23,15 +23,15 @@ | |||
853 | 23 | #define ROW16_LEN 8 | 23 | #define ROW16_LEN 8 |
854 | 24 | #define MAX_BUF 64*1024 | 24 | #define MAX_BUF 64*1024 |
855 | 25 | 25 | ||
857 | 26 | static CHARSET_INFO all_charsets[256]; | 26 | static struct charset_info_st all_charsets[256]; |
858 | 27 | 27 | ||
859 | 28 | 28 | ||
860 | 29 | void | 29 | void |
862 | 30 | print_array(FILE *f, const char *set, const char *name, uchar *a, int n) | 30 | print_array(FILE *f, const char *set, const char *name, const uchar *a, int n) |
863 | 31 | { | 31 | { |
864 | 32 | int i; | 32 | int i; |
865 | 33 | 33 | ||
867 | 34 | fprintf(f,"uchar %s_%s[] = {\n", name, set); | 34 | fprintf(f,"static const uchar %s_%s[] = {\n", name, set); |
868 | 35 | 35 | ||
869 | 36 | for (i=0 ;i<n ; i++) | 36 | for (i=0 ;i<n ; i++) |
870 | 37 | { | 37 | { |
871 | @@ -44,11 +44,11 @@ | |||
872 | 44 | 44 | ||
873 | 45 | 45 | ||
874 | 46 | void | 46 | void |
876 | 47 | print_array16(FILE *f, const char *set, const char *name, uint16 *a, int n) | 47 | print_array16(FILE *f, const char *set, const char *name, const uint16 *a, int n) |
877 | 48 | { | 48 | { |
878 | 49 | int i; | 49 | int i; |
879 | 50 | 50 | ||
881 | 51 | fprintf(f,"uint16 %s_%s[] = {\n", name, set); | 51 | fprintf(f,"static const uint16 %s_%s[] = {\n", name, set); |
882 | 52 | 52 | ||
883 | 53 | for (i=0 ;i<n ; i++) | 53 | for (i=0 ;i<n ; i++) |
884 | 54 | { | 54 | { |
885 | @@ -80,7 +80,7 @@ | |||
886 | 80 | return dst; | 80 | return dst; |
887 | 81 | } | 81 | } |
888 | 82 | 82 | ||
890 | 83 | static void simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from) | 83 | static void simple_cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from) |
891 | 84 | { | 84 | { |
892 | 85 | to->number= from->number ? from->number : to->number; | 85 | to->number= from->number ? from->number : to->number; |
893 | 86 | to->state|= from->state; | 86 | to->state|= from->state; |
894 | @@ -122,7 +122,7 @@ | |||
895 | 122 | (cs->sort_order || (cs->state & MY_CS_BINSORT)))); | 122 | (cs->sort_order || (cs->state & MY_CS_BINSORT)))); |
896 | 123 | } | 123 | } |
897 | 124 | 124 | ||
899 | 125 | static int add_collation(CHARSET_INFO *cs) | 125 | static int add_collation(struct charset_info_st *cs) |
900 | 126 | { | 126 | { |
901 | 127 | if (cs->name && (cs->number || (cs->number=get_charset_number(cs->name)))) | 127 | if (cs->name && (cs->number || (cs->number=get_charset_number(cs->name)))) |
902 | 128 | { | 128 | { |
903 | @@ -329,7 +329,7 @@ | |||
904 | 329 | } | 329 | } |
905 | 330 | } | 330 | } |
906 | 331 | 331 | ||
908 | 332 | fprintf(f,"CHARSET_INFO compiled_charsets[] = {\n"); | 332 | fprintf(f,"struct charset_info_st compiled_charsets[] = {\n"); |
909 | 333 | for (cs=all_charsets; cs < all_charsets+256; cs++) | 333 | for (cs=all_charsets; cs < all_charsets+256; cs++) |
910 | 334 | { | 334 | { |
911 | 335 | if (simple_cs_is_full(cs)) | 335 | if (simple_cs_is_full(cs)) |
912 | 336 | 336 | ||
913 | === modified file 'strings/ctype-big5.c' | |||
914 | --- strings/ctype-big5.c 2008-04-23 06:06:26 +0000 | |||
915 | +++ strings/ctype-big5.c 2009-11-03 19:35:25 +0000 | |||
916 | @@ -26,6 +26,7 @@ | |||
917 | 26 | * .configure. mbmaxlen_big5=2 | 26 | * .configure. mbmaxlen_big5=2 |
918 | 27 | */ | 27 | */ |
919 | 28 | 28 | ||
920 | 29 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
921 | 29 | #include <my_global.h> | 30 | #include <my_global.h> |
922 | 30 | #include "m_string.h" | 31 | #include "m_string.h" |
923 | 31 | #include "m_ctype.h" | 32 | #include "m_ctype.h" |
924 | @@ -47,7 +48,7 @@ | |||
925 | 47 | #define big5head(e) ((uchar)(e>>8)) | 48 | #define big5head(e) ((uchar)(e>>8)) |
926 | 48 | #define big5tail(e) ((uchar)(e&0xff)) | 49 | #define big5tail(e) ((uchar)(e&0xff)) |
927 | 49 | 50 | ||
929 | 50 | static uchar NEAR ctype_big5[257] = | 51 | static const uchar NEAR ctype_big5[257] = |
930 | 51 | { | 52 | { |
931 | 52 | 0, /* For standard library */ | 53 | 0, /* For standard library */ |
932 | 53 | 32,32,32,32,32,32,32,32,32,40,40,40,40,40,32,32, | 54 | 32,32,32,32,32,32,32,32,32,40,40,40,40,40,32,32, |
933 | @@ -68,7 +69,7 @@ | |||
934 | 68 | 3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0, | 69 | 3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0, |
935 | 69 | }; | 70 | }; |
936 | 70 | 71 | ||
938 | 71 | static uchar NEAR to_lower_big5[]= | 72 | static const uchar NEAR to_lower_big5[]= |
939 | 72 | { | 73 | { |
940 | 73 | '\000','\001','\002','\003','\004','\005','\006','\007', | 74 | '\000','\001','\002','\003','\004','\005','\006','\007', |
941 | 74 | '\010','\011','\012','\013','\014','\015','\016','\017', | 75 | '\010','\011','\012','\013','\014','\015','\016','\017', |
942 | @@ -104,7 +105,7 @@ | |||
943 | 104 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', | 105 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', |
944 | 105 | }; | 106 | }; |
945 | 106 | 107 | ||
947 | 107 | static uchar NEAR to_upper_big5[]= | 108 | static const uchar NEAR to_upper_big5[]= |
948 | 108 | { | 109 | { |
949 | 109 | '\000','\001','\002','\003','\004','\005','\006','\007', | 110 | '\000','\001','\002','\003','\004','\005','\006','\007', |
950 | 110 | '\010','\011','\012','\013','\014','\015','\016','\017', | 111 | '\010','\011','\012','\013','\014','\015','\016','\017', |
951 | @@ -140,7 +141,7 @@ | |||
952 | 140 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', | 141 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', |
953 | 141 | }; | 142 | }; |
954 | 142 | 143 | ||
956 | 143 | static uchar NEAR sort_order_big5[]= | 144 | static const uchar NEAR sort_order_big5[]= |
957 | 144 | { | 145 | { |
958 | 145 | '\000','\001','\002','\003','\004','\005','\006','\007', | 146 | '\000','\001','\002','\003','\004','\005','\006','\007', |
959 | 146 | '\010','\011','\012','\013','\014','\015','\016','\017', | 147 | '\010','\011','\012','\013','\014','\015','\016','\017', |
960 | @@ -471,7 +472,7 @@ | |||
961 | 471 | 472 | ||
962 | 472 | 473 | ||
963 | 473 | /* page 0 0xA140-0xC7FC */ | 474 | /* page 0 0xA140-0xC7FC */ |
965 | 474 | static uint16 tab_big5_uni0[]={ | 475 | static const uint16 tab_big5_uni0[]={ |
966 | 475 | 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2022,0xFF1B,0xFF1A, | 476 | 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2022,0xFF1B,0xFF1A, |
967 | 476 | 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52, | 477 | 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52, |
968 | 477 | 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31, | 478 | 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31, |
969 | @@ -1714,7 +1715,7 @@ | |||
970 | 1714 | 0x2479,0x247A,0x247B,0x247C,0x247D}; | 1715 | 0x2479,0x247A,0x247B,0x247C,0x247D}; |
971 | 1715 | 1716 | ||
972 | 1716 | /* page 1 0xC940-0xF9DC */ | 1717 | /* page 1 0xC940-0xF9DC */ |
974 | 1717 | static uint16 tab_big5_uni1[]={ | 1718 | static const uint16 tab_big5_uni1[]={ |
975 | 1718 | 0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47, | 1719 | 0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47, |
976 | 1719 | 0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E, | 1720 | 0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E, |
977 | 1720 | 0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C, | 1721 | 0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C, |
978 | @@ -3282,7 +3283,7 @@ | |||
979 | 3282 | 3283 | ||
980 | 3283 | 3284 | ||
981 | 3284 | /* page 0 0x00A2-0x00F7 */ | 3285 | /* page 0 0x00A2-0x00F7 */ |
983 | 3285 | static uint16 tab_uni_big50[]={ | 3286 | static const uint16 tab_uni_big50[]={ |
984 | 3286 | 0xA246,0xA247, 0,0xA244, 0,0xA1B1, 0, 0, | 3287 | 0xA246,0xA247, 0,0xA244, 0,0xA1B1, 0, 0, |
985 | 3287 | 0, 0, 0, 0, 0, 0,0xA258,0xA1D3, | 3288 | 0, 0, 0, 0, 0, 0,0xA258,0xA1D3, |
986 | 3288 | 0, 0, 0, 0, 0,0xA150, 0, 0, | 3289 | 0, 0, 0, 0, 0,0xA150, 0, 0, |
987 | @@ -3296,7 +3297,7 @@ | |||
988 | 3296 | 0, 0, 0, 0, 0,0xA1D2}; | 3297 | 0, 0, 0, 0, 0,0xA1D2}; |
989 | 3297 | 3298 | ||
990 | 3298 | /* page 1 0x02C7-0x0451 */ | 3299 | /* page 1 0x02C7-0x0451 */ |
992 | 3299 | static uint16 tab_uni_big51[]={ | 3300 | static const uint16 tab_uni_big51[]={ |
993 | 3300 | 0xA3BE, 0,0xA3BC,0xA3BD,0xA3BF, 0, 0, 0, | 3301 | 0xA3BE, 0,0xA3BC,0xA3BD,0xA3BF, 0, 0, 0, |
994 | 3301 | 0, 0, 0, 0, 0, 0, 0, 0, | 3302 | 0, 0, 0, 0, 0, 0, 0, 0, |
995 | 3302 | 0, 0,0xA3BB, 0, 0, 0, 0, 0, | 3303 | 0, 0,0xA3BB, 0, 0, 0, 0, 0, |
996 | @@ -3349,7 +3350,7 @@ | |||
997 | 3349 | 0xC7E8, 0,0xC7CE}; | 3350 | 0xC7E8, 0,0xC7CE}; |
998 | 3350 | 3351 | ||
999 | 3351 | /* page 2 0x2013-0x22BF */ | 3352 | /* page 2 0x2013-0x22BF */ |
1001 | 3352 | static uint16 tab_uni_big52[]={ | 3353 | static const uint16 tab_uni_big52[]={ |
1002 | 3353 | 0xA156,0xA158, 0, 0, 0,0xA1A5,0xA1A6, 0, | 3354 | 0xA156,0xA158, 0, 0, 0,0xA1A5,0xA1A6, 0, |
1003 | 3354 | 0,0xA1A7,0xA1A8, 0, 0, 0, 0,0xA145, | 3355 | 0,0xA1A7,0xA1A8, 0, 0, 0, 0,0xA145, |
1004 | 3355 | 0, 0,0xA14C,0xA14B, 0, 0, 0, 0, | 3356 | 0, 0,0xA14C,0xA14B, 0, 0, 0, 0, |
1005 | @@ -3438,7 +3439,7 @@ | |||
1006 | 3438 | 0, 0, 0, 0,0xA1E9}; | 3439 | 0, 0, 0, 0,0xA1E9}; |
1007 | 3439 | 3440 | ||
1008 | 3440 | /* page 3 0x2460-0x2642 */ | 3441 | /* page 3 0x2460-0x2642 */ |
1010 | 3441 | static uint16 tab_uni_big53[]={ | 3442 | static const uint16 tab_uni_big53[]={ |
1011 | 3442 | 0xC7E9,0xC7EA,0xC7EB,0xC7EC,0xC7ED,0xC7EE,0xC7EF,0xC7F0, | 3443 | 0xC7E9,0xC7EA,0xC7EB,0xC7EC,0xC7ED,0xC7EE,0xC7EF,0xC7F0, |
1012 | 3443 | 0xC7F1,0xC7F2, 0, 0, 0, 0, 0, 0, | 3444 | 0xC7F1,0xC7F2, 0, 0, 0, 0, 0, 0, |
1013 | 3444 | 0, 0, 0, 0,0xC7F3,0xC7F4,0xC7F5,0xC7F6, | 3445 | 0, 0, 0, 0,0xC7F3,0xC7F4,0xC7F5,0xC7F6, |
1014 | @@ -3502,7 +3503,7 @@ | |||
1015 | 3502 | 0xA1F0,0xA1F2,0xA1F1}; | 3503 | 0xA1F0,0xA1F2,0xA1F1}; |
1016 | 3503 | 3504 | ||
1017 | 3504 | /* page 4 0x3000-0x3129 */ | 3505 | /* page 4 0x3000-0x3129 */ |
1019 | 3505 | static uint16 tab_uni_big54[]={ | 3506 | static const uint16 tab_uni_big54[]={ |
1020 | 3506 | 0xA140,0xA142,0xA143,0xA1B2, 0,0xC6A4, 0, 0, | 3507 | 0xA140,0xA142,0xA143,0xA1B2, 0,0xC6A4, 0, 0, |
1021 | 3507 | 0xA171,0xA172,0xA16D,0xA16E,0xA175,0xA176,0xA179,0xA17A, | 3508 | 0xA171,0xA172,0xA16D,0xA16E,0xA175,0xA176,0xA179,0xA17A, |
1022 | 3508 | 0xA169,0xA16A,0xA245, 0,0xA165,0xA166, 0, 0, | 3509 | 0xA169,0xA16A,0xA245, 0,0xA165,0xA166, 0, 0, |
1023 | @@ -3543,11 +3544,11 @@ | |||
1024 | 3543 | 0xA3B9,0xA3BA}; | 3544 | 0xA3B9,0xA3BA}; |
1025 | 3544 | 3545 | ||
1026 | 3545 | /* page 5 0x32A3-0x32A3 */ | 3546 | /* page 5 0x32A3-0x32A3 */ |
1028 | 3546 | static uint16 tab_uni_big55[]={ | 3547 | static const uint16 tab_uni_big55[]={ |
1029 | 3547 | 0xA1C0}; | 3548 | 0xA1C0}; |
1030 | 3548 | 3549 | ||
1031 | 3549 | /* page 6 0x338E-0x33D5 */ | 3550 | /* page 6 0x338E-0x33D5 */ |
1033 | 3550 | static uint16 tab_uni_big56[]={ | 3551 | static const uint16 tab_uni_big56[]={ |
1034 | 3551 | 0xA255,0xA256, 0, 0, 0, 0, 0, 0, | 3552 | 0xA255,0xA256, 0, 0, 0, 0, 0, 0, |
1035 | 3552 | 0, 0, 0, 0, 0, 0,0xA250,0xA251, | 3553 | 0, 0, 0, 0, 0, 0,0xA250,0xA251, |
1036 | 3553 | 0xA252, 0, 0,0xA254, 0, 0, 0, 0, | 3554 | 0xA252, 0, 0,0xA254, 0, 0, 0, 0, |
1037 | @@ -3560,7 +3561,7 @@ | |||
1038 | 3560 | }; | 3561 | }; |
1039 | 3561 | 3562 | ||
1040 | 3562 | /* page 7 0x4E00-0x9483 */ | 3563 | /* page 7 0x4E00-0x9483 */ |
1042 | 3563 | static uint16 tab_uni_big57[]={ | 3564 | static const uint16 tab_uni_big57[]={ |
1043 | 3564 | 0xA440,0xA442, 0,0xA443, 0, 0, 0,0xC945, | 3565 | 0xA440,0xA442, 0,0xA443, 0, 0, 0,0xC945, |
1044 | 3565 | 0xA456,0xA454,0xA457,0xA455,0xC946,0xA4A3,0xC94F,0xC94D, | 3566 | 0xA456,0xA454,0xA457,0xA455,0xC946,0xA4A3,0xC94F,0xC94D, |
1045 | 3566 | 0xA4A2,0xA4A1, 0, 0,0xA542,0xA541,0xA540, 0, | 3567 | 0xA4A2,0xA4A1, 0, 0,0xA542,0xA541,0xA540, 0, |
1046 | @@ -5820,7 +5821,7 @@ | |||
1047 | 5820 | 0xF9C0,0xF9C1,0xF9BF,0xF9C9}; | 5821 | 0xF9C0,0xF9C1,0xF9BF,0xF9C9}; |
1048 | 5821 | 5822 | ||
1049 | 5822 | /* page 8 0x9577-0x9FA4 */ | 5823 | /* page 8 0x9577-0x9FA4 */ |
1051 | 5823 | static uint16 tab_uni_big58[]={ | 5824 | static const uint16 tab_uni_big58[]={ |
1052 | 5824 | 0xAAF8, 0, 0,0xD844,0xDC78,0xE8A5,0xF376, 0, | 5825 | 0xAAF8, 0, 0,0xD844,0xDC78,0xE8A5,0xF376, 0, |
1053 | 5825 | 0,0xAAF9, 0,0xADAC,0xB07B, 0, 0,0xD845, | 5826 | 0,0xAAF9, 0,0xADAC,0xB07B, 0, 0,0xD845, |
1054 | 5826 | 0,0xD846,0xB3AC, 0,0xB67D,0xDC7A,0xDC79,0xB6A3, | 5827 | 0,0xD846,0xB3AC, 0,0xB67D,0xDC7A,0xDC79,0xB6A3, |
1055 | @@ -6149,11 +6150,11 @@ | |||
1056 | 6149 | 0,0xEFB6, 0,0xF7CF, 0,0xF9A1}; | 6150 | 0,0xEFB6, 0,0xF7CF, 0,0xF9A1}; |
1057 | 6150 | 6151 | ||
1058 | 6151 | /* page 9 0xFA0C-0xFA0D */ | 6152 | /* page 9 0xFA0C-0xFA0D */ |
1060 | 6152 | static uint16 tab_uni_big59[]={ | 6153 | static const uint16 tab_uni_big59[]={ |
1061 | 6153 | 0xC94A,0xDDFC}; | 6154 | 0xC94A,0xDDFC}; |
1062 | 6154 | 6155 | ||
1063 | 6155 | /* page 10 0xFE30-0xFFFD */ | 6156 | /* page 10 0xFE30-0xFFFD */ |
1065 | 6156 | static uint16 tab_uni_big510[]={ | 6157 | static const uint16 tab_uni_big510[]={ |
1066 | 6157 | 0xA14A,0xA157, 0,0xA159,0xA15B,0xA15F,0xA160,0xA163, | 6158 | 0xA14A,0xA157, 0,0xA159,0xA15B,0xA15F,0xA160,0xA163, |
1067 | 6158 | 0xA164,0xA167,0xA168,0xA16B,0xA16C,0xA16F,0xA170,0xA173, | 6159 | 0xA164,0xA167,0xA168,0xA16B,0xA16C,0xA16F,0xA170,0xA173, |
1068 | 6159 | 0xA174,0xA177,0xA178,0xA17B,0xA17C, 0, 0, 0, | 6160 | 0xA174,0xA177,0xA178,0xA17B,0xA17C, 0, 0, 0, |
1069 | @@ -6377,7 +6378,7 @@ | |||
1070 | 6377 | my_scan_8bit | 6378 | my_scan_8bit |
1071 | 6378 | }; | 6379 | }; |
1072 | 6379 | 6380 | ||
1074 | 6380 | CHARSET_INFO my_charset_big5_chinese_ci= | 6381 | struct charset_info_st my_charset_big5_chinese_ci= |
1075 | 6381 | { | 6382 | { |
1076 | 6382 | 1,0,0, /* number */ | 6383 | 1,0,0, /* number */ |
1077 | 6383 | MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ | 6384 | MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ |
1078 | @@ -6410,7 +6411,7 @@ | |||
1079 | 6410 | }; | 6411 | }; |
1080 | 6411 | 6412 | ||
1081 | 6412 | 6413 | ||
1083 | 6413 | CHARSET_INFO my_charset_big5_bin= | 6414 | struct charset_info_st my_charset_big5_bin= |
1084 | 6414 | { | 6415 | { |
1085 | 6415 | 84,0,0, /* number */ | 6416 | 84,0,0, /* number */ |
1086 | 6416 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ | 6417 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ |
1087 | 6417 | 6418 | ||
1088 | === modified file 'strings/ctype-bin.c' | |||
1089 | --- strings/ctype-bin.c 2007-06-05 22:22:35 +0000 | |||
1090 | +++ strings/ctype-bin.c 2009-11-03 19:35:25 +0000 | |||
1091 | @@ -18,11 +18,12 @@ | |||
1092 | 18 | /* This file is for binary pseudo charset, created by bar@mysql.com */ | 18 | /* This file is for binary pseudo charset, created by bar@mysql.com */ |
1093 | 19 | 19 | ||
1094 | 20 | 20 | ||
1095 | 21 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
1096 | 21 | #include <my_global.h> | 22 | #include <my_global.h> |
1097 | 22 | #include "m_string.h" | 23 | #include "m_string.h" |
1098 | 23 | #include "m_ctype.h" | 24 | #include "m_ctype.h" |
1099 | 24 | 25 | ||
1101 | 25 | static uchar ctype_bin[]= | 26 | static const uchar ctype_bin[]= |
1102 | 26 | { | 27 | { |
1103 | 27 | 0, | 28 | 0, |
1104 | 28 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, | 29 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, |
1105 | @@ -46,7 +47,7 @@ | |||
1106 | 46 | 47 | ||
1107 | 47 | /* Dummy array for toupper / tolower / sortorder */ | 48 | /* Dummy array for toupper / tolower / sortorder */ |
1108 | 48 | 49 | ||
1110 | 49 | static uchar bin_char_array[] = | 50 | static const uchar bin_char_array[] = |
1111 | 50 | { | 51 | { |
1112 | 51 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | 52 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
1113 | 52 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, | 53 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
1114 | @@ -68,7 +69,7 @@ | |||
1115 | 68 | 69 | ||
1116 | 69 | 70 | ||
1117 | 70 | static my_bool | 71 | static my_bool |
1119 | 71 | my_coll_init_8bit_bin(CHARSET_INFO *cs, | 72 | my_coll_init_8bit_bin(struct charset_info_st *cs, |
1120 | 72 | void *(*alloc)(size_t) __attribute__((unused))) | 73 | void *(*alloc)(size_t) __attribute__((unused))) |
1121 | 73 | { | 74 | { |
1122 | 74 | cs->max_sort_char=255; | 75 | cs->max_sort_char=255; |
1123 | @@ -549,7 +550,7 @@ | |||
1124 | 549 | }; | 550 | }; |
1125 | 550 | 551 | ||
1126 | 551 | 552 | ||
1128 | 552 | CHARSET_INFO my_charset_bin = | 553 | struct charset_info_st my_charset_bin = |
1129 | 553 | { | 554 | { |
1130 | 554 | 63,0,0, /* number */ | 555 | 63,0,0, /* number */ |
1131 | 555 | MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */ | 556 | MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */ |
1132 | 556 | 557 | ||
1133 | === modified file 'strings/ctype-cp932.c' | |||
1134 | --- strings/ctype-cp932.c 2009-05-05 06:55:22 +0000 | |||
1135 | +++ strings/ctype-cp932.c 2009-11-03 19:35:25 +0000 | |||
1136 | @@ -16,6 +16,7 @@ | |||
1137 | 16 | /* This file is for cp932 charaset (Windows Japanese), | 16 | /* This file is for cp932 charaset (Windows Japanese), |
1138 | 17 | and created based on ctype-sjis.c file */ | 17 | and created based on ctype-sjis.c file */ |
1139 | 18 | 18 | ||
1140 | 19 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
1141 | 19 | #include <my_global.h> | 20 | #include <my_global.h> |
1142 | 20 | #include "m_string.h" | 21 | #include "m_string.h" |
1143 | 21 | #include "m_ctype.h" | 22 | #include "m_ctype.h" |
1144 | @@ -31,7 +32,7 @@ | |||
1145 | 31 | * .configure. mbmaxlen_cp932=2 | 32 | * .configure. mbmaxlen_cp932=2 |
1146 | 32 | */ | 33 | */ |
1147 | 33 | 34 | ||
1149 | 34 | static uchar NEAR ctype_cp932[257] = | 35 | static const uchar NEAR ctype_cp932[257] = |
1150 | 35 | { | 36 | { |
1151 | 36 | 0, /* For standard library */ | 37 | 0, /* For standard library */ |
1152 | 37 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ | 38 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ |
1153 | @@ -68,7 +69,7 @@ | |||
1154 | 68 | 0020, 0020, 0020, 0020, 0020, 0000, 0000, 0000 | 69 | 0020, 0020, 0020, 0020, 0020, 0000, 0000, 0000 |
1155 | 69 | }; | 70 | }; |
1156 | 70 | 71 | ||
1158 | 71 | static uchar NEAR to_lower_cp932[]= | 72 | static const uchar NEAR to_lower_cp932[]= |
1159 | 72 | { | 73 | { |
1160 | 73 | '\000','\001','\002','\003','\004','\005','\006','\007', | 74 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1161 | 74 | '\010','\011','\012','\013','\014','\015','\016','\017', | 75 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1162 | @@ -104,7 +105,7 @@ | |||
1163 | 104 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' | 105 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' |
1164 | 105 | }; | 106 | }; |
1165 | 106 | 107 | ||
1167 | 107 | static uchar NEAR to_upper_cp932[]= | 108 | static const uchar NEAR to_upper_cp932[]= |
1168 | 108 | { | 109 | { |
1169 | 109 | '\000','\001','\002','\003','\004','\005','\006','\007', | 110 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1170 | 110 | '\010','\011','\012','\013','\014','\015','\016','\017', | 111 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1171 | @@ -140,7 +141,7 @@ | |||
1172 | 140 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' | 141 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' |
1173 | 141 | }; | 142 | }; |
1174 | 142 | 143 | ||
1176 | 143 | static uchar NEAR sort_order_cp932[]= | 144 | static const uchar NEAR sort_order_cp932[]= |
1177 | 144 | { | 145 | { |
1178 | 145 | '\000','\001','\002','\003','\004','\005','\006','\007', | 146 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1179 | 146 | '\010','\011','\012','\013','\014','\015','\016','\017', | 147 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1180 | @@ -377,7 +378,7 @@ | |||
1181 | 377 | } | 378 | } |
1182 | 378 | 379 | ||
1183 | 379 | /* page 0 0x00A1-0x00DF */ | 380 | /* page 0 0x00A1-0x00DF */ |
1185 | 380 | static uint16 tab_cp932_uni0[]={ | 381 | static const uint16 tab_cp932_uni0[]={ |
1186 | 381 | 0xFF61,0xFF62,0xFF63,0xFF64,0xFF65,0xFF66,0xFF67,0xFF68, | 382 | 0xFF61,0xFF62,0xFF63,0xFF64,0xFF65,0xFF66,0xFF67,0xFF68, |
1187 | 382 | 0xFF69,0xFF6A,0xFF6B,0xFF6C,0xFF6D,0xFF6E,0xFF6F,0xFF70, | 383 | 0xFF69,0xFF6A,0xFF6B,0xFF6C,0xFF6D,0xFF6E,0xFF6F,0xFF70, |
1188 | 383 | 0xFF71,0xFF72,0xFF73,0xFF74,0xFF75,0xFF76,0xFF77,0xFF78, | 384 | 0xFF71,0xFF72,0xFF73,0xFF74,0xFF75,0xFF76,0xFF77,0xFF78, |
1189 | @@ -388,7 +389,7 @@ | |||
1190 | 388 | 0xFF99,0xFF9A,0xFF9B,0xFF9C,0xFF9D,0xFF9E,0xFF9F}; | 389 | 0xFF99,0xFF9A,0xFF9B,0xFF9C,0xFF9D,0xFF9E,0xFF9F}; |
1191 | 389 | 390 | ||
1192 | 390 | /* page 1 0x8140-0x84BE */ | 391 | /* page 1 0x8140-0x84BE */ |
1194 | 391 | static uint16 tab_cp932_uni1[]={ | 392 | static const uint16 tab_cp932_uni1[]={ |
1195 | 392 | 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, | 393 | 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, |
1196 | 393 | 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, | 394 | 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, |
1197 | 394 | 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, | 395 | 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, |
1198 | @@ -503,7 +504,7 @@ | |||
1199 | 503 | 0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542}; | 504 | 0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542}; |
1200 | 504 | 505 | ||
1201 | 505 | /* page 2 0x8740-0x879C - NEC Row 13 */ | 506 | /* page 2 0x8740-0x879C - NEC Row 13 */ |
1203 | 506 | static uint16 tab_cp932_uni2[]={ | 507 | static const uint16 tab_cp932_uni2[]={ |
1204 | 507 | 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, | 508 | 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, |
1205 | 508 | 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, | 509 | 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, |
1206 | 509 | 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, | 510 | 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, |
1207 | @@ -518,7 +519,7 @@ | |||
1208 | 518 | 0x221F,0x22BF,0x2235,0x2229,0x222A}; | 519 | 0x221F,0x22BF,0x2235,0x2229,0x222A}; |
1209 | 519 | 520 | ||
1210 | 520 | /* page 3 0x889F-0x9FFC */ | 521 | /* page 3 0x889F-0x9FFC */ |
1212 | 521 | static uint16 tab_cp932_uni3[]={ | 522 | static const uint16 tab_cp932_uni3[]={ |
1213 | 522 | 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, | 523 | 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, |
1214 | 523 | 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, | 524 | 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, |
1215 | 524 | 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, | 525 | 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, |
1216 | @@ -1269,7 +1270,7 @@ | |||
1217 | 1269 | 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; | 1270 | 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; |
1218 | 1270 | 1271 | ||
1219 | 1271 | /* page 4 0xE040-0xEAA4 */ | 1272 | /* page 4 0xE040-0xEAA4 */ |
1221 | 1272 | static uint16 tab_cp932_uni4[]={ | 1273 | static const uint16 tab_cp932_uni4[]={ |
1222 | 1273 | 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, | 1274 | 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, |
1223 | 1274 | 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, | 1275 | 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, |
1224 | 1275 | 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, | 1276 | 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, |
1225 | @@ -1606,7 +1607,7 @@ | |||
1226 | 1606 | 1607 | ||
1227 | 1607 | /* page 5 0xED40-0xEEFC - | 1608 | /* page 5 0xED40-0xEEFC - |
1228 | 1608 | IBM Selected Kanji and Non-Kanji(NEC implementation) */ | 1609 | IBM Selected Kanji and Non-Kanji(NEC implementation) */ |
1230 | 1609 | static uint16 tab_cp932_uni5[]={ | 1610 | static const uint16 tab_cp932_uni5[]={ |
1231 | 1610 | 0x7E8A,0x891C,0x9348,0x9288,0x84DC,0x4FC9,0x70BB,0x6631, | 1611 | 0x7E8A,0x891C,0x9348,0x9288,0x84DC,0x4FC9,0x70BB,0x6631, |
1232 | 1611 | 0x68C8,0x92F9,0x66FB,0x5F45,0x4E28,0x4EE1,0x4EFC,0x4F00, | 1612 | 0x68C8,0x92F9,0x66FB,0x5F45,0x4E28,0x4EE1,0x4EFC,0x4F00, |
1233 | 1612 | 0x4F03,0x4F39,0x4F56,0x4F92,0x4F8A,0x4F9A,0x4F94,0x4FCD, | 1613 | 0x4F03,0x4F39,0x4F56,0x4F92,0x4F8A,0x4F9A,0x4F94,0x4FCD, |
1234 | @@ -1665,7 +1666,7 @@ | |||
1235 | 1665 | 0x2179,0xFFE2,0xFFE4,0xFF07,0xFF02}; | 1666 | 0x2179,0xFFE2,0xFFE4,0xFF07,0xFF02}; |
1236 | 1666 | 1667 | ||
1237 | 1667 | /* page 6 0xF040-0xF9FC - User defined characters */ | 1668 | /* page 6 0xF040-0xF9FC - User defined characters */ |
1239 | 1668 | static uint16 tab_cp932_uni6[]={ | 1669 | static const uint16 tab_cp932_uni6[]={ |
1240 | 1669 | 0xE000,0xE001,0xE002,0xE003,0xE004,0xE005,0xE006,0xE007, | 1670 | 0xE000,0xE001,0xE002,0xE003,0xE004,0xE005,0xE006,0xE007, |
1241 | 1670 | 0xE008,0xE009,0xE00A,0xE00B,0xE00C,0xE00D,0xE00E,0xE00F, | 1671 | 0xE008,0xE009,0xE00A,0xE00B,0xE00C,0xE00D,0xE00E,0xE00F, |
1242 | 1671 | 0xE010,0xE011,0xE012,0xE013,0xE014,0xE015,0xE016,0xE017, | 1672 | 0xE010,0xE011,0xE012,0xE013,0xE014,0xE015,0xE016,0xE017, |
1243 | @@ -1981,7 +1982,7 @@ | |||
1244 | 1981 | 1982 | ||
1245 | 1982 | /* page 7 0xFA40-0xFC4B - | 1983 | /* page 7 0xFA40-0xFC4B - |
1246 | 1983 | IBM Selected Kanji and Non-Kanji */ | 1984 | IBM Selected Kanji and Non-Kanji */ |
1248 | 1984 | static uint16 tab_cp932_uni7[]={ | 1985 | static const uint16 tab_cp932_uni7[]={ |
1249 | 1985 | 0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177, | 1986 | 0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177, |
1250 | 1986 | 0x2178,0x2179,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165, | 1987 | 0x2178,0x2179,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165, |
1251 | 1987 | 0x2166,0x2167,0x2168,0x2169,0xFFE2,0xFFE4,0xFF07,0xFF02, | 1988 | 0x2166,0x2167,0x2168,0x2169,0xFFE2,0xFFE4,0xFF07,0xFF02, |
1252 | @@ -2070,7 +2071,7 @@ | |||
1253 | 2070 | } | 2071 | } |
1254 | 2071 | 2072 | ||
1255 | 2072 | /* page 0 0x005C-0x00F7 */ | 2073 | /* page 0 0x005C-0x00F7 */ |
1257 | 2073 | static uint16 tab_uni_cp9320[]={ | 2074 | static const uint16 tab_uni_cp9320[]={ |
1258 | 2074 | 0, 0, 0, 0, 0, 0, 0, 0, | 2075 | 0, 0, 0, 0, 0, 0, 0, 0, |
1259 | 2075 | 0, 0, 0, 0, 0, 0, 0, 0, | 2076 | 0, 0, 0, 0, 0, 0, 0, 0, |
1260 | 2076 | 0, 0, 0, 0, 0, 0, 0, 0, | 2077 | 0, 0, 0, 0, 0, 0, 0, 0, |
1261 | @@ -2093,7 +2094,7 @@ | |||
1262 | 2093 | 0, 0, 0,0x8180}; | 2094 | 0, 0, 0,0x8180}; |
1263 | 2094 | 2095 | ||
1264 | 2095 | /* page 1 0x0391-0x0451 */ | 2096 | /* page 1 0x0391-0x0451 */ |
1266 | 2096 | static uint16 tab_uni_cp9321[]={ | 2097 | static const uint16 tab_uni_cp9321[]={ |
1267 | 2097 | 0x839F,0x83A0,0x83A1,0x83A2,0x83A3,0x83A4,0x83A5,0x83A6, | 2098 | 0x839F,0x83A0,0x83A1,0x83A2,0x83A3,0x83A4,0x83A5,0x83A6, |
1268 | 2098 | 0x83A7,0x83A8,0x83A9,0x83AA,0x83AB,0x83AC,0x83AD,0x83AE, | 2099 | 0x83A7,0x83A8,0x83A9,0x83AA,0x83AB,0x83AC,0x83AD,0x83AE, |
1269 | 2099 | 0x83AF, 0,0x83B0,0x83B1,0x83B2,0x83B3,0x83B4,0x83B5, | 2100 | 0x83AF, 0,0x83B0,0x83B1,0x83B2,0x83B3,0x83B4,0x83B5, |
1270 | @@ -2121,7 +2122,7 @@ | |||
1271 | 2121 | 0x8476}; | 2122 | 0x8476}; |
1272 | 2122 | 2123 | ||
1273 | 2123 | /* page 2 0x2010-0x2473 */ | 2124 | /* page 2 0x2010-0x2473 */ |
1275 | 2124 | static uint16 tab_uni_cp9322[]={ | 2125 | static const uint16 tab_uni_cp9322[]={ |
1276 | 2125 | 0x815D, 0, 0, 0, 0,0x815C, 0, 0, | 2126 | 0x815D, 0, 0, 0, 0,0x815C, 0, 0, |
1277 | 2126 | 0x8165,0x8166, 0, 0,0x8167,0x8168, 0, 0, | 2127 | 0x8165,0x8166, 0, 0,0x8167,0x8168, 0, 0, |
1278 | 2127 | 0x81F5,0x81F6, 0, 0, 0,0x8164,0x8163, 0, | 2128 | 0x81F5,0x81F6, 0, 0, 0,0x8164,0x8163, 0, |
1279 | @@ -2265,7 +2266,7 @@ | |||
1280 | 2265 | 0x8750,0x8751,0x8752,0x8753}; | 2266 | 0x8750,0x8751,0x8752,0x8753}; |
1281 | 2266 | 2267 | ||
1282 | 2267 | /* page 3 0x2500-0x266F */ | 2268 | /* page 3 0x2500-0x266F */ |
1284 | 2268 | static uint16 tab_uni_cp9323[]={ | 2269 | static const uint16 tab_uni_cp9323[]={ |
1285 | 2269 | 0x849F,0x84AA,0x84A0,0x84AB, 0, 0, 0, 0, | 2270 | 0x849F,0x84AA,0x84A0,0x84AB, 0, 0, 0, 0, |
1286 | 2270 | 0, 0, 0, 0,0x84A1, 0, 0,0x84AC, | 2271 | 0, 0, 0, 0,0x84A1, 0, 0,0x84AC, |
1287 | 2271 | 0x84A2, 0, 0,0x84AD,0x84A4, 0, 0,0x84AF, | 2272 | 0x84A2, 0, 0,0x84AD,0x84A4, 0, 0,0x84AF, |
1288 | @@ -2315,7 +2316,7 @@ | |||
1289 | 2315 | }; | 2316 | }; |
1290 | 2316 | 2317 | ||
1291 | 2317 | /* page 4 0x3000-0x30FE */ | 2318 | /* page 4 0x3000-0x30FE */ |
1293 | 2318 | static uint16 tab_uni_cp9324[]={ | 2319 | static const uint16 tab_uni_cp9324[]={ |
1294 | 2319 | 0x8140,0x8141,0x8142,0x8156, 0,0x8158,0x8159,0x815A, | 2320 | 0x8140,0x8141,0x8142,0x8156, 0,0x8158,0x8159,0x815A, |
1295 | 2320 | 0x8171,0x8172,0x8173,0x8174,0x8175,0x8176,0x8177,0x8178, | 2321 | 0x8171,0x8172,0x8173,0x8174,0x8175,0x8176,0x8177,0x8178, |
1296 | 2321 | 0x8179,0x817A,0x81A7,0x81AC,0x816B,0x816C, 0, 0, | 2322 | 0x8179,0x817A,0x81A7,0x81AC,0x816B,0x816C, 0, 0, |
1297 | @@ -2350,7 +2351,7 @@ | |||
1298 | 2350 | 0, 0, 0,0x8145,0x815B,0x8152,0x8153}; | 2351 | 0, 0, 0,0x8145,0x815B,0x8152,0x8153}; |
1299 | 2351 | 2352 | ||
1300 | 2352 | /* page 5 0x3230-0x33CD */ | 2353 | /* page 5 0x3230-0x33CD */ |
1302 | 2353 | static uint16 tab_uni_cp9325[]={ | 2354 | static const uint16 tab_uni_cp9325[]={ |
1303 | 2354 | 0,0x878A,0x878B, 0, 0, 0, 0, 0, | 2355 | 0,0x878A,0x878B, 0, 0, 0, 0, 0, |
1304 | 2355 | 0,0x878C, 0, 0, 0, 0, 0, 0, | 2356 | 0,0x878C, 0, 0, 0, 0, 0, 0, |
1305 | 2356 | 0, 0, 0, 0, 0, 0, 0, 0, | 2357 | 0, 0, 0, 0, 0, 0, 0, 0, |
1306 | @@ -2405,7 +2406,7 @@ | |||
1307 | 2405 | 0, 0, 0, 0, 0,0x8783}; | 2406 | 0, 0, 0, 0, 0,0x8783}; |
1308 | 2406 | 2407 | ||
1309 | 2407 | /* page 6 0x4E00-0x9481 */ | 2408 | /* page 6 0x4E00-0x9481 */ |
1311 | 2408 | static uint16 tab_uni_cp9326[]={ | 2409 | static const uint16 tab_uni_cp9326[]={ |
1312 | 2409 | 0x88EA,0x929A, 0,0x8EB5, 0, 0, 0,0x969C, | 2410 | 0x88EA,0x929A, 0,0x8EB5, 0, 0, 0,0x969C, |
1313 | 2410 | 0x8FE4,0x8E4F,0x8FE3,0x89BA, 0,0x9573,0x975E, 0, | 2411 | 0x8FE4,0x8E4F,0x8FE3,0x89BA, 0,0x9573,0x975E, 0, |
1314 | 2411 | 0x98A0,0x894E, 0, 0,0x8A8E,0x98A1,0x90A2,0x99C0, | 2412 | 0x98A0,0x894E, 0, 0,0x8A8E,0x98A1,0x90A2,0x99C0, |
1315 | @@ -4665,7 +4666,7 @@ | |||
1316 | 4665 | 0,0xE876}; | 4666 | 0,0xE876}; |
1317 | 4666 | 4667 | ||
1318 | 4667 | /* page 7 0x9577-0x9FA0 */ | 4668 | /* page 7 0x9577-0x9FA0 */ |
1320 | 4668 | static uint16 tab_uni_cp9327[]={ | 4669 | static const uint16 tab_uni_cp9327[]={ |
1321 | 4669 | 0x92B7, 0, 0, 0, 0, 0, 0, 0, | 4670 | 0x92B7, 0, 0, 0, 0, 0, 0, 0, |
1322 | 4670 | 0,0x96E5, 0,0xE878,0x914D, 0, 0, 0, | 4671 | 0,0x96E5, 0,0xE878,0x914D, 0, 0, 0, |
1323 | 4671 | 0xE879, 0,0x95C2,0xE87A,0x8A4A, 0, 0, 0, | 4672 | 0xE879, 0,0x95C2,0xE87A,0x8A4A, 0, 0, 0, |
1324 | @@ -4994,7 +4995,7 @@ | |||
1325 | 4994 | 0,0xEA9E}; | 4995 | 0,0xEA9E}; |
1326 | 4995 | 4996 | ||
1327 | 4996 | /* page 8 0xE000-0xE757 - User defined characters */ | 4997 | /* page 8 0xE000-0xE757 - User defined characters */ |
1329 | 4997 | static uint16 tab_uni_cp9328[]={ | 4998 | static const uint16 tab_uni_cp9328[]={ |
1330 | 4998 | 0xF040,0xF041,0xF042,0xF043,0xF044,0xF045,0xF046,0xF047, | 4999 | 0xF040,0xF041,0xF042,0xF043,0xF044,0xF045,0xF046,0xF047, |
1331 | 4999 | 0xF048,0xF049,0xF04A,0xF04B,0xF04C,0xF04D,0xF04E,0xF04F, | 5000 | 0xF048,0xF049,0xF04A,0xF04B,0xF04C,0xF04D,0xF04E,0xF04F, |
1332 | 5000 | 0xF050,0xF051,0xF052,0xF053,0xF054,0xF055,0xF056,0xF057, | 5001 | 0xF050,0xF051,0xF052,0xF053,0xF054,0xF055,0xF056,0xF057, |
1333 | @@ -5232,7 +5233,7 @@ | |||
1334 | 5232 | 0xF9F5,0xF9F6,0xF9F7,0xF9F8,0xF9F9,0xF9FA,0xF9FB,0xF9FC}; | 5233 | 0xF9F5,0xF9F6,0xF9F7,0xF9F8,0xF9F9,0xF9FA,0xF9FB,0xF9FC}; |
1335 | 5233 | 5234 | ||
1336 | 5234 | /* page 9 0xF920-0xFA2D */ | 5235 | /* page 9 0xF920-0xFA2D */ |
1338 | 5235 | static uint16 tab_uni_cp9329[]={ | 5236 | static const uint16 tab_uni_cp9329[]={ |
1339 | 5236 | 0, 0, 0, 0, 0, 0, 0, 0, | 5237 | 0, 0, 0, 0, 0, 0, 0, 0, |
1340 | 5237 | 0,0xFAE0, 0, 0, 0, 0, 0, 0, | 5238 | 0,0xFAE0, 0, 0, 0, 0, 0, 0, |
1341 | 5238 | 0, 0, 0, 0, 0, 0, 0, 0, | 5239 | 0, 0, 0, 0, 0, 0, 0, 0, |
1342 | @@ -5269,7 +5270,7 @@ | |||
1343 | 5269 | 0xFBDA,0xFBEA,0xFBF6,0xFBF7,0xFBF9,0xFC49}; | 5270 | 0xFBDA,0xFBEA,0xFBF6,0xFBF7,0xFBF9,0xFC49}; |
1344 | 5270 | 5271 | ||
1345 | 5271 | /* page 10 0xFF01-0xFFE5 */ | 5272 | /* page 10 0xFF01-0xFFE5 */ |
1347 | 5272 | static uint16 tab_uni_cp93210[]={ | 5273 | static const uint16 tab_uni_cp93210[]={ |
1348 | 5273 | 0x8149,0xFA57,0x8194,0x8190,0x8193,0x8195,0xFA56,0x8169, | 5274 | 0x8149,0xFA57,0x8194,0x8190,0x8193,0x8195,0xFA56,0x8169, |
1349 | 5274 | 0x816A,0x8196,0x817B,0x8143,0x817C,0x8144,0x815E,0x824F, | 5275 | 0x816A,0x8196,0x817B,0x8143,0x817C,0x8144,0x815E,0x824F, |
1350 | 5275 | 0x8250,0x8251,0x8252,0x8253,0x8254,0x8255,0x8256,0x8257, | 5276 | 0x8250,0x8251,0x8252,0x8253,0x8254,0x8255,0x8256,0x8257, |
1351 | @@ -5508,7 +5509,7 @@ | |||
1352 | 5508 | }; | 5509 | }; |
1353 | 5509 | 5510 | ||
1354 | 5510 | 5511 | ||
1356 | 5511 | CHARSET_INFO my_charset_cp932_japanese_ci= | 5512 | struct charset_info_st my_charset_cp932_japanese_ci= |
1357 | 5512 | { | 5513 | { |
1358 | 5513 | 95,0,0, /* number */ | 5514 | 95,0,0, /* number */ |
1359 | 5514 | MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ | 5515 | MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ |
1360 | @@ -5540,7 +5541,7 @@ | |||
1361 | 5540 | &my_collation_ci_handler | 5541 | &my_collation_ci_handler |
1362 | 5541 | }; | 5542 | }; |
1363 | 5542 | 5543 | ||
1365 | 5543 | CHARSET_INFO my_charset_cp932_bin= | 5544 | struct charset_info_st my_charset_cp932_bin= |
1366 | 5544 | { | 5545 | { |
1367 | 5545 | 96,0,0, /* number */ | 5546 | 96,0,0, /* number */ |
1368 | 5546 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ | 5547 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ |
1369 | 5547 | 5548 | ||
1370 | === modified file 'strings/ctype-czech.c' | |||
1371 | --- strings/ctype-czech.c 2007-05-10 09:59:39 +0000 | |||
1372 | +++ strings/ctype-czech.c 2009-11-03 19:35:25 +0000 | |||
1373 | @@ -61,6 +61,7 @@ | |||
1374 | 61 | 61 | ||
1375 | 62 | #define SKIP_TRAILING_SPACES 1 | 62 | #define SKIP_TRAILING_SPACES 1 |
1376 | 63 | 63 | ||
1377 | 64 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
1378 | 64 | #define REAL_MYSQL | 65 | #define REAL_MYSQL |
1379 | 65 | 66 | ||
1380 | 66 | #ifdef REAL_MYSQL | 67 | #ifdef REAL_MYSQL |
1381 | @@ -83,7 +84,7 @@ | |||
1382 | 83 | below for what are the "special values" | 84 | below for what are the "special values" |
1383 | 84 | */ | 85 | */ |
1384 | 85 | 86 | ||
1386 | 86 | static uchar *CZ_SORT_TABLE[] = { | 87 | static const uchar *const CZ_SORT_TABLE[] = { |
1387 | 87 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\043\044\045\046\047\050\051\052\053\054\000\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000", | 88 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\043\044\045\046\047\050\051\052\053\054\000\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000", |
1388 | 88 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\106\107\110\111\112\113\114\115\116\117\000\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000", | 89 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\106\107\110\111\112\113\114\115\116\117\000\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000", |
1389 | 89 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\212\213\214\215\216\217\220\221\222\223\000\000\000\000\000\000\000\004\020\377\032\040\052\054\056\063\071\073\075\105\107\115\127\131\133\141\151\157\171\173\175\177\203\000\000\000\000\000\000\003\017\377\031\037\051\053\055\062\070\072\074\104\106\114\126\130\132\140\150\156\170\172\174\176\202\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\016\000\103\000\101\145\000\000\143\147\153\207\000\205\211\000\015\000\102\000\100\144\000\000\142\146\152\206\000\204\210\135\006\010\014\012\077\026\030\024\042\050\046\044\065\067\034\036\113\111\117\121\125\123\000\137\163\161\167\165\201\155\000\134\005\007\013\011\076\025\027\023\041\047\045\043\064\066\033\035\112\110\116\120\124\122\000\136\162\160\166\164\200\154\000", | 90 | (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\212\213\214\215\216\217\220\221\222\223\000\000\000\000\000\000\000\004\020\377\032\040\052\054\056\063\071\073\075\105\107\115\127\131\133\141\151\157\171\173\175\177\203\000\000\000\000\000\000\003\017\377\031\037\051\053\055\062\070\072\074\104\106\114\126\130\132\140\150\156\170\172\174\176\202\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\016\000\103\000\101\145\000\000\143\147\153\207\000\205\211\000\015\000\102\000\100\144\000\000\142\146\152\206\000\204\210\135\006\010\014\012\077\026\030\024\042\050\046\044\065\067\034\036\113\111\117\121\125\123\000\137\163\161\167\165\201\155\000\134\005\007\013\011\076\025\027\023\041\047\045\043\064\066\033\035\112\110\116\120\124\122\000\136\162\160\166\164\200\154\000", |
1390 | @@ -99,14 +100,14 @@ | |||
1391 | 99 | struct wordvalue | 100 | struct wordvalue |
1392 | 100 | { | 101 | { |
1393 | 101 | const char * word; | 102 | const char * word; |
1395 | 102 | uchar *outvalue; | 103 | const uchar *outvalue; |
1396 | 103 | }; | 104 | }; |
1403 | 104 | static struct wordvalue doubles[] = { | 105 | static const struct wordvalue doubles[] = { |
1404 | 105 | { "ch", (uchar*) "\014\031\057\057" }, | 106 | { "ch", (const uchar*) "\014\031\057\057" }, |
1405 | 106 | { "Ch", (uchar*) "\014\031\060\060" }, | 107 | { "Ch", (const uchar*) "\014\031\060\060" }, |
1406 | 107 | { "CH", (uchar*) "\014\031\061\061" }, | 108 | { "CH", (const uchar*) "\014\031\061\061" }, |
1407 | 108 | { "c", (uchar*) "\005\012\021\021" }, | 109 | { "c", (const uchar*) "\005\012\021\021" }, |
1408 | 109 | { "C", (uchar*) "\005\012\022\022" }, | 110 | { "C", (const uchar*) "\005\012\022\022" }, |
1409 | 110 | }; | 111 | }; |
1410 | 111 | 112 | ||
1411 | 112 | /* | 113 | /* |
1412 | @@ -430,7 +431,7 @@ | |||
1413 | 430 | #include <my_global.h> | 431 | #include <my_global.h> |
1414 | 431 | #include "m_string.h" | 432 | #include "m_string.h" |
1415 | 432 | 433 | ||
1417 | 433 | static uchar NEAR ctype_czech[257] = { | 434 | static const uchar NEAR ctype_czech[257] = { |
1418 | 434 | 0, | 435 | 0, |
1419 | 435 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, | 436 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, |
1420 | 436 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, | 437 | 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, |
1421 | @@ -450,7 +451,7 @@ | |||
1422 | 450 | 2, 2, 2, 2, 2, 2, 2, 16, 2, 2, 2, 2, 2, 2, 2, 16, | 451 | 2, 2, 2, 2, 2, 2, 2, 16, 2, 2, 2, 2, 2, 2, 2, 16, |
1423 | 451 | }; | 452 | }; |
1424 | 452 | 453 | ||
1426 | 453 | static uchar NEAR to_lower_czech[] = { | 454 | static const uchar NEAR to_lower_czech[] = { |
1427 | 454 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | 455 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
1428 | 455 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, | 456 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
1429 | 456 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, | 457 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, |
1430 | @@ -469,7 +470,7 @@ | |||
1431 | 469 | 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, | 470 | 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, |
1432 | 470 | }; | 471 | }; |
1433 | 471 | 472 | ||
1435 | 472 | static uchar NEAR to_upper_czech[] = { | 473 | static const uchar NEAR to_upper_czech[] = { |
1436 | 473 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | 474 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
1437 | 474 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, | 475 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
1438 | 475 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, | 476 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, |
1439 | @@ -488,7 +489,7 @@ | |||
1440 | 488 | 240,209,210,211,212,213,214,247,216,217,218,219,220,221,222,255, | 489 | 240,209,210,211,212,213,214,247,216,217,218,219,220,221,222,255, |
1441 | 489 | }; | 490 | }; |
1442 | 490 | 491 | ||
1444 | 491 | static uchar NEAR sort_order_czech[] = { | 492 | static const uchar NEAR sort_order_czech[] = { |
1445 | 492 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | 493 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
1446 | 493 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, | 494 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
1447 | 494 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, | 495 | 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, |
1448 | @@ -507,7 +508,7 @@ | |||
1449 | 507 | 255, 98, 99,101,102,103,104,255,109,119,118,120,121,126,116,255, | 508 | 255, 98, 99,101,102,103,104,255,109,119,118,120,121,126,116,255, |
1450 | 508 | }; | 509 | }; |
1451 | 509 | 510 | ||
1453 | 510 | static uint16 tab_8859_2_uni[256]={ | 511 | static const uint16 tab_8859_2_uni[256]={ |
1454 | 511 | 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 512 | 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
1455 | 512 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 513 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
1456 | 513 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 514 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
1457 | @@ -544,7 +545,7 @@ | |||
1458 | 544 | 545 | ||
1459 | 545 | 546 | ||
1460 | 546 | /* 0000-00FD , 254 chars */ | 547 | /* 0000-00FD , 254 chars */ |
1462 | 547 | static uchar tab_uni_8859_2_plane00[]={ | 548 | static const uchar tab_uni_8859_2_plane00[]={ |
1463 | 548 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 549 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
1464 | 549 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 550 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
1465 | 550 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 551 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
1466 | @@ -563,7 +564,7 @@ | |||
1467 | 563 | 0x00,0x00,0x00,0xF3,0xF4,0x00,0xF6,0xF7,0x00,0x00,0xFA,0x00,0xFC,0xFD}; | 564 | 0x00,0x00,0x00,0xF3,0xF4,0x00,0xF6,0xF7,0x00,0x00,0xFA,0x00,0xFC,0xFD}; |
1468 | 564 | 565 | ||
1469 | 565 | /* 0102-017E , 125 chars */ | 566 | /* 0102-017E , 125 chars */ |
1471 | 566 | static uchar tab_uni_8859_2_plane01[]={ | 567 | static const uchar tab_uni_8859_2_plane01[]={ |
1472 | 567 | 0xC3,0xE3,0xA1,0xB1,0xC6,0xE6,0x00,0x00,0x00,0x00,0xC8,0xE8,0xCF,0xEF,0xD0,0xF0, | 568 | 0xC3,0xE3,0xA1,0xB1,0xC6,0xE6,0x00,0x00,0x00,0x00,0xC8,0xE8,0xCF,0xEF,0xD0,0xF0, |
1473 | 568 | 0x00,0x00,0x00,0x00,0x00,0x00,0xCA,0xEA,0xCC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00, | 569 | 0x00,0x00,0x00,0x00,0x00,0x00,0xCA,0xEA,0xCC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00, |
1474 | 569 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | 570 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, |
1475 | @@ -574,7 +575,7 @@ | |||
1476 | 574 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xAC,0xBC,0xAF,0xBF,0xAE,0xBE}; | 575 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xAC,0xBC,0xAF,0xBF,0xAE,0xBE}; |
1477 | 575 | 576 | ||
1478 | 576 | /* 02C7-02DD , 23 chars */ | 577 | /* 02C7-02DD , 23 chars */ |
1480 | 577 | static uchar tab_uni_8859_2_plane02[]={ | 578 | static const uchar tab_uni_8859_2_plane02[]={ |
1481 | 578 | 0xB7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | 579 | 0xB7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, |
1482 | 579 | 0x00,0xA2,0xFF,0x00,0xB2,0x00,0xBD}; | 580 | 0x00,0xA2,0xFF,0x00,0xB2,0x00,0xBD}; |
1483 | 580 | 581 | ||
1484 | @@ -601,7 +602,7 @@ | |||
1485 | 601 | my_propagate_simple | 602 | my_propagate_simple |
1486 | 602 | }; | 603 | }; |
1487 | 603 | 604 | ||
1489 | 604 | CHARSET_INFO my_charset_latin2_czech_ci = | 605 | struct charset_info_st my_charset_latin2_czech_ci = |
1490 | 605 | { | 606 | { |
1491 | 606 | 2,0,0, /* number */ | 607 | 2,0,0, /* number */ |
1492 | 607 | MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_CSSORT, /* state */ | 608 | MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_CSSORT, /* state */ |
1493 | 608 | 609 | ||
1494 | === modified file 'strings/ctype-euc_kr.c' | |||
1495 | --- strings/ctype-euc_kr.c 2009-07-24 06:27:23 +0000 | |||
1496 | +++ strings/ctype-euc_kr.c 2009-11-03 19:35:25 +0000 | |||
1497 | @@ -25,6 +25,7 @@ | |||
1498 | 25 | * .configure. mbmaxlen_euc_kr=2 | 25 | * .configure. mbmaxlen_euc_kr=2 |
1499 | 26 | */ | 26 | */ |
1500 | 27 | 27 | ||
1501 | 28 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
1502 | 28 | #include <my_global.h> | 29 | #include <my_global.h> |
1503 | 29 | #include "m_string.h" | 30 | #include "m_string.h" |
1504 | 30 | #include "m_ctype.h" | 31 | #include "m_ctype.h" |
1505 | @@ -32,7 +33,7 @@ | |||
1506 | 32 | #ifdef HAVE_CHARSET_euckr | 33 | #ifdef HAVE_CHARSET_euckr |
1507 | 33 | 34 | ||
1508 | 34 | 35 | ||
1510 | 35 | static uchar NEAR ctype_euc_kr[257] = | 36 | static const uchar NEAR ctype_euc_kr[257] = |
1511 | 36 | { | 37 | { |
1512 | 37 | 0, /* For standard library */ | 38 | 0, /* For standard library */ |
1513 | 38 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ | 39 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ |
1514 | @@ -69,7 +70,7 @@ | |||
1515 | 69 | 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, | 70 | 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, |
1516 | 70 | }; | 71 | }; |
1517 | 71 | 72 | ||
1519 | 72 | static uchar NEAR to_lower_euc_kr[]= | 73 | static const uchar NEAR to_lower_euc_kr[]= |
1520 | 73 | { | 74 | { |
1521 | 74 | '\000','\001','\002','\003','\004','\005','\006','\007', | 75 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1522 | 75 | '\010','\011','\012','\013','\014','\015','\016','\017', | 76 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1523 | @@ -105,7 +106,7 @@ | |||
1524 | 105 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', | 106 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', |
1525 | 106 | }; | 107 | }; |
1526 | 107 | 108 | ||
1528 | 108 | static uchar NEAR to_upper_euc_kr[]= | 109 | static const uchar NEAR to_upper_euc_kr[]= |
1529 | 109 | { | 110 | { |
1530 | 110 | '\000','\001','\002','\003','\004','\005','\006','\007', | 111 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1531 | 111 | '\010','\011','\012','\013','\014','\015','\016','\017', | 112 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1532 | @@ -141,7 +142,7 @@ | |||
1533 | 141 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', | 142 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', |
1534 | 142 | }; | 143 | }; |
1535 | 143 | 144 | ||
1537 | 144 | static uchar NEAR sort_order_euc_kr[]= | 145 | static const uchar NEAR sort_order_euc_kr[]= |
1538 | 145 | { | 146 | { |
1539 | 146 | '\000','\001','\002','\003','\004','\005','\006','\007', | 147 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1540 | 147 | '\010','\011','\012','\013','\014','\015','\016','\017', | 148 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1541 | @@ -217,7 +218,7 @@ | |||
1542 | 217 | 218 | ||
1543 | 218 | 219 | ||
1544 | 219 | /* page 0 0x8141-0xC8FE */ | 220 | /* page 0 0x8141-0xC8FE */ |
1546 | 220 | static uint16 tab_ksc5601_uni0[]={ | 221 | static const uint16 tab_ksc5601_uni0[]={ |
1547 | 221 | 0xAC02,0xAC03,0xAC05,0xAC06,0xAC0B,0xAC0C,0xAC0D,0xAC0E, | 222 | 0xAC02,0xAC03,0xAC05,0xAC06,0xAC0B,0xAC0C,0xAC0D,0xAC0E, |
1548 | 222 | 0xAC0F,0xAC18,0xAC1E,0xAC1F,0xAC21,0xAC22,0xAC23,0xAC25, | 223 | 0xAC0F,0xAC18,0xAC1E,0xAC1F,0xAC21,0xAC22,0xAC23,0xAC25, |
1549 | 223 | 0xAC26,0xAC27,0xAC28,0xAC29,0xAC2A,0xAC2B,0xAC2E,0xAC32, | 224 | 0xAC26,0xAC27,0xAC28,0xAC29,0xAC2A,0xAC2B,0xAC2E,0xAC32, |
1550 | @@ -2516,7 +2517,7 @@ | |||
1551 | 2516 | 0xD78C,0xD790,0xD798,0xD799,0xD79B,0xD79D}; | 2517 | 0xD78C,0xD790,0xD798,0xD799,0xD79B,0xD79D}; |
1552 | 2517 | 2518 | ||
1553 | 2518 | /* page 1 0xCAA1-0xFDFE */ | 2519 | /* page 1 0xCAA1-0xFDFE */ |
1555 | 2519 | static uint16 tab_ksc5601_uni1[]={ | 2520 | static const uint16 tab_ksc5601_uni1[]={ |
1556 | 2520 | 0x4F3D,0x4F73,0x5047,0x50F9,0x52A0,0x53EF,0x5475,0x54E5, | 2521 | 0x4F3D,0x4F73,0x5047,0x50F9,0x52A0,0x53EF,0x5475,0x54E5, |
1557 | 2521 | 0x5609,0x5AC1,0x5BB6,0x6687,0x67B6,0x67B7,0x67EF,0x6B4C, | 2522 | 0x5609,0x5AC1,0x5BB6,0x6687,0x67B6,0x67B7,0x67EF,0x6B4C, |
1558 | 2522 | 0x73C2,0x75C2,0x7A3C,0x82DB,0x8304,0x8857,0x8888,0x8A36, | 2523 | 0x73C2,0x75C2,0x7A3C,0x82DB,0x8304,0x8857,0x8888,0x8A36, |
1559 | @@ -4170,7 +4171,7 @@ | |||
1560 | 4170 | return(0); | 4171 | return(0); |
1561 | 4171 | } | 4172 | } |
1562 | 4172 | /* page 0 0x00A1-0x0167 */ | 4173 | /* page 0 0x00A1-0x0167 */ |
1564 | 4173 | static uint16 tab_uni_ksc56010[]={ | 4174 | static const uint16 tab_uni_ksc56010[]={ |
1565 | 4174 | 0xA2AE, 0, 0,0xA2B4, 0, 0,0xA1D7,0xA1A7, | 4175 | 0xA2AE, 0, 0,0xA2B4, 0, 0,0xA1D7,0xA1A7, |
1566 | 4175 | 0,0xA8A3, 0, 0,0xA1A9,0xA2E7, 0,0xA1C6, | 4176 | 0,0xA8A3, 0, 0,0xA1A9,0xA2E7, 0,0xA1C6, |
1567 | 4176 | 0xA1BE,0xA9F7,0xA9F8,0xA2A5, 0,0xA2D2,0xA1A4,0xA2AC, | 4177 | 0xA1BE,0xA9F7,0xA9F8,0xA2A5, 0,0xA2D2,0xA1A4,0xA2AC, |
1568 | @@ -4198,7 +4199,7 @@ | |||
1569 | 4198 | 0, 0, 0, 0, 0,0xA8AE,0xA9AE}; | 4199 | 0, 0, 0, 0, 0,0xA8AE,0xA9AE}; |
1570 | 4199 | 4200 | ||
1571 | 4200 | /* page 1 0x02C7-0x0451 */ | 4201 | /* page 1 0x02C7-0x0451 */ |
1573 | 4201 | static uint16 tab_uni_ksc56011[]={ | 4202 | static const uint16 tab_uni_ksc56011[]={ |
1574 | 4202 | 0xA2A7, 0, 0, 0, 0, 0, 0, 0, | 4203 | 0xA2A7, 0, 0, 0, 0, 0, 0, 0, |
1575 | 4203 | 0,0xA2B0, 0, 0, 0, 0, 0, 0, | 4204 | 0,0xA2B0, 0, 0, 0, 0, 0, 0, |
1576 | 4204 | 0,0xA2A8,0xA2AB,0xA2AA,0xA2AD, 0,0xA2A9, 0, | 4205 | 0,0xA2A8,0xA2AB,0xA2AA,0xA2AD, 0,0xA2A9, 0, |
1577 | @@ -4251,7 +4252,7 @@ | |||
1578 | 4251 | 0xACF1, 0,0xACD7}; | 4252 | 0xACF1, 0,0xACD7}; |
1579 | 4252 | 4253 | ||
1580 | 4253 | /* page 2 0x2015-0x2312 */ | 4254 | /* page 2 0x2015-0x2312 */ |
1582 | 4254 | static uint16 tab_uni_ksc56012[]={ | 4255 | static const uint16 tab_uni_ksc56012[]={ |
1583 | 4255 | 0xA1AA, 0, 0,0xA1AE,0xA1AF, 0, 0,0xA1B0, | 4256 | 0xA1AA, 0, 0,0xA1AE,0xA1AF, 0, 0,0xA1B0, |
1584 | 4256 | 0xA1B1, 0, 0,0xA2D3,0xA2D4, 0, 0, 0, | 4257 | 0xA1B1, 0, 0,0xA2D3,0xA2D4, 0, 0, 0, |
1585 | 4257 | 0xA1A5,0xA1A6, 0, 0, 0, 0, 0, 0, | 4258 | 0xA1A5,0xA1A6, 0, 0, 0, 0, 0, 0, |
1586 | @@ -4350,7 +4351,7 @@ | |||
1587 | 4350 | 0, 0, 0, 0, 0,0xA1D2}; | 4351 | 0, 0, 0, 0, 0,0xA1D2}; |
1588 | 4351 | 4352 | ||
1589 | 4352 | /* page 3 0x2460-0x266D */ | 4353 | /* page 3 0x2460-0x266D */ |
1591 | 4353 | static uint16 tab_uni_ksc56013[]={ | 4354 | static const uint16 tab_uni_ksc56013[]={ |
1592 | 4354 | 0xA8E7,0xA8E8,0xA8E9,0xA8EA,0xA8EB,0xA8EC,0xA8ED,0xA8EE, | 4355 | 0xA8E7,0xA8E8,0xA8E9,0xA8EA,0xA8EB,0xA8EC,0xA8ED,0xA8EE, |
1593 | 4355 | 0xA8EF,0xA8F0,0xA8F1,0xA8F2,0xA8F3,0xA8F4,0xA8F5, 0, | 4356 | 0xA8EF,0xA8F0,0xA8F1,0xA8F2,0xA8F3,0xA8F4,0xA8F5, 0, |
1594 | 4356 | 0, 0, 0, 0,0xA9E7,0xA9E8,0xA9E9,0xA9EA, | 4357 | 0, 0, 0, 0,0xA9E7,0xA9E8,0xA9E9,0xA9EA, |
1595 | @@ -4419,7 +4420,7 @@ | |||
1596 | 4419 | 0xA2CD,0xA2DB,0xA2DC, 0,0xA2DD,0xA2DA}; | 4420 | 0xA2CD,0xA2DB,0xA2DC, 0,0xA2DD,0xA2DA}; |
1597 | 4420 | 4421 | ||
1598 | 4421 | /* page 4 0x3000-0x327F */ | 4422 | /* page 4 0x3000-0x327F */ |
1600 | 4422 | static uint16 tab_uni_ksc56014[]={ | 4423 | static const uint16 tab_uni_ksc56014[]={ |
1601 | 4423 | 0xA1A1,0xA1A2,0xA1A3,0xA1A8, 0, 0, 0, 0, | 4424 | 0xA1A1,0xA1A2,0xA1A3,0xA1A8, 0, 0, 0, 0, |
1602 | 4424 | 0xA1B4,0xA1B5,0xA1B6,0xA1B7,0xA1B8,0xA1B9,0xA1BA,0xA1BB, | 4425 | 0xA1B4,0xA1B5,0xA1B6,0xA1B7,0xA1B8,0xA1B9,0xA1BA,0xA1BB, |
1603 | 4425 | 0xA1BC,0xA1BD, 0,0xA1EB,0xA1B2,0xA1B3, 0, 0, | 4426 | 0xA1BC,0xA1BD, 0,0xA1EB,0xA1B2,0xA1B3, 0, 0, |
1604 | @@ -4503,7 +4504,7 @@ | |||
1605 | 4503 | }; | 4504 | }; |
1606 | 4504 | 4505 | ||
1607 | 4505 | /* page 5 0x3380-0x33DD */ | 4506 | /* page 5 0x3380-0x33DD */ |
1609 | 4506 | static uint16 tab_uni_ksc56015[]={ | 4507 | static const uint16 tab_uni_ksc56015[]={ |
1610 | 4507 | 0xA7C9,0xA7CA,0xA7CB,0xA7CC,0xA7CD, 0, 0, 0, | 4508 | 0xA7C9,0xA7CA,0xA7CB,0xA7CC,0xA7CD, 0, 0, 0, |
1611 | 4508 | 0xA7BA,0xA7BB,0xA7DC,0xA7DD,0xA7DE,0xA7B6,0xA7B7,0xA7B8, | 4509 | 0xA7BA,0xA7BB,0xA7DC,0xA7DD,0xA7DE,0xA7B6,0xA7B7,0xA7B8, |
1612 | 4509 | 0xA7D4,0xA7D5,0xA7D6,0xA7D7,0xA7D8,0xA7A1,0xA7A2,0xA7A3, | 4510 | 0xA7D4,0xA7D5,0xA7D6,0xA7D7,0xA7D8,0xA7A1,0xA7A2,0xA7A3, |
1613 | @@ -4518,7 +4519,7 @@ | |||
1614 | 4518 | 0xA2E4, 0, 0,0xA7E4,0xA7EE,0xA7E9}; | 4519 | 0xA2E4, 0, 0,0xA7E4,0xA7EE,0xA7E9}; |
1615 | 4519 | 4520 | ||
1616 | 4520 | /* page 6 0x4E00-0x947F */ | 4521 | /* page 6 0x4E00-0x947F */ |
1618 | 4521 | static uint16 tab_uni_ksc56016[]={ | 4522 | static const uint16 tab_uni_ksc56016[]={ |
1619 | 4522 | 0xECE9,0xEFCB, 0,0xF6D2, 0, 0, 0,0xD8B2, | 4523 | 0xECE9,0xEFCB, 0,0xF6D2, 0, 0, 0,0xD8B2, |
1620 | 4523 | 0xEDDB,0xDFB2,0xDFBE,0xF9BB, 0,0xDCF4, 0, 0, | 4524 | 0xEDDB,0xDFB2,0xDFBE,0xF9BB, 0,0xDCF4, 0, 0, |
1621 | 4524 | 0,0xF5E4, 0, 0,0xF3A6,0xDDE0,0xE1A6, 0, | 4525 | 0,0xF5E4, 0, 0,0xF3A6,0xDDE0,0xE1A6, 0, |
1622 | @@ -6778,7 +6779,7 @@ | |||
1623 | 6778 | }; | 6779 | }; |
1624 | 6779 | 6780 | ||
1625 | 6780 | /* page 7 0x9577-0x9F9C */ | 6781 | /* page 7 0x9577-0x9F9C */ |
1627 | 6781 | static uint16 tab_uni_ksc56017[]={ | 6782 | static const uint16 tab_uni_ksc56017[]={ |
1628 | 6782 | 0xEDFE, 0, 0, 0, 0, 0, 0, 0, | 6783 | 0xEDFE, 0, 0, 0, 0, 0, 0, 0, |
1629 | 6783 | 0,0xDAA6, 0, 0,0xE0EC, 0, 0, 0, | 6784 | 0,0xDAA6, 0, 0,0xE0EC, 0, 0, 0, |
1630 | 6784 | 0, 0,0xF8CD, 0,0xCBD2, 0, 0, 0, | 6785 | 0, 0,0xF8CD, 0,0xCBD2, 0, 0, 0, |
1631 | @@ -7106,7 +7107,7 @@ | |||
1632 | 7106 | 0, 0, 0, 0, 0,0xCFCF}; | 7107 | 0, 0, 0, 0, 0,0xCFCF}; |
1633 | 7107 | 7108 | ||
1634 | 7108 | /* page 8 0xAC00-0xD7A3 */ | 7109 | /* page 8 0xAC00-0xD7A3 */ |
1636 | 7109 | static uint16 tab_uni_ksc56018[]={ | 7110 | static const uint16 tab_uni_ksc56018[]={ |
1637 | 7110 | 0xB0A1,0xB0A2,0x8141,0x8142,0xB0A3,0x8143,0x8144,0xB0A4, | 7111 | 0xB0A1,0xB0A2,0x8141,0x8142,0xB0A3,0x8143,0x8144,0xB0A4, |
1638 | 7111 | 0xB0A5,0xB0A6,0xB0A7,0x8145,0x8146,0x8147,0x8148,0x8149, | 7112 | 0xB0A5,0xB0A6,0xB0A7,0x8145,0x8146,0x8147,0x8148,0x8149, |
1639 | 7112 | 0xB0A8,0xB0A9,0xB0AA,0xB0AB,0xB0AC,0xB0AD,0xB0AE,0xB0AF, | 7113 | 0xB0A8,0xB0A9,0xB0AA,0xB0AB,0xB0AC,0xB0AD,0xB0AE,0xB0AF, |
1640 | @@ -8506,7 +8507,7 @@ | |||
1641 | 8506 | 0xC64F,0xC650,0xC651,0xC652}; | 8507 | 0xC64F,0xC650,0xC651,0xC652}; |
1642 | 8507 | 8508 | ||
1643 | 8508 | /* page 9 0xF900-0xFA0B */ | 8509 | /* page 9 0xF900-0xFA0B */ |
1645 | 8509 | static uint16 tab_uni_ksc56019[]={ | 8510 | static const uint16 tab_uni_ksc56019[]={ |
1646 | 8510 | 0xCBD0,0xCBD6,0xCBE7,0xCDCF,0xCDE8,0xCEAD,0xCFFB,0xD0A2, | 8511 | 0xCBD0,0xCBD6,0xCBE7,0xCDCF,0xCDE8,0xCEAD,0xCFFB,0xD0A2, |
1647 | 8511 | 0xD0B8,0xD0D0,0xD0DD,0xD1D4,0xD1D5,0xD1D8,0xD1DB,0xD1DC, | 8512 | 0xD0B8,0xD0D0,0xD0DD,0xD1D4,0xD1D5,0xD1D8,0xD1DB,0xD1DC, |
1648 | 8512 | 0xD1DD,0xD1DE,0xD1DF,0xD1E0,0xD1E2,0xD1E3,0xD1E4,0xD1E5, | 8513 | 0xD1DD,0xD1DE,0xD1DF,0xD1E0,0xD1E2,0xD1E3,0xD1E4,0xD1E5, |
1649 | @@ -8543,7 +8544,7 @@ | |||
1650 | 8543 | 0xFAA1,0xFAA2,0xFAE6,0xFCA9}; | 8544 | 0xFAA1,0xFAA2,0xFAE6,0xFCA9}; |
1651 | 8544 | 8545 | ||
1652 | 8545 | /* page 10 0xFF01-0xFFE6 */ | 8546 | /* page 10 0xFF01-0xFFE6 */ |
1654 | 8546 | static uint16 tab_uni_ksc560110[]={ | 8547 | static const uint16 tab_uni_ksc560110[]={ |
1655 | 8547 | 0xA3A1,0xA3A2,0xA3A3,0xA3A4,0xA3A5,0xA3A6,0xA3A7,0xA3A8, | 8548 | 0xA3A1,0xA3A2,0xA3A3,0xA3A4,0xA3A5,0xA3A6,0xA3A7,0xA3A8, |
1656 | 8548 | 0xA3A9,0xA3AA,0xA3AB,0xA3AC,0xA3AD,0xA3AE,0xA3AF,0xA3B0, | 8549 | 0xA3A9,0xA3AA,0xA3AB,0xA3AC,0xA3AD,0xA3AE,0xA3AF,0xA3B0, |
1657 | 8549 | 0xA3B1,0xA3B2,0xA3B3,0xA3B4,0xA3B5,0xA3B6,0xA3B7,0xA3B8, | 8550 | 0xA3B1,0xA3B2,0xA3B3,0xA3B4,0xA3B5,0xA3B6,0xA3B7,0xA3B8, |
1658 | @@ -8737,7 +8738,7 @@ | |||
1659 | 8737 | }; | 8738 | }; |
1660 | 8738 | 8739 | ||
1661 | 8739 | 8740 | ||
1663 | 8740 | CHARSET_INFO my_charset_euckr_korean_ci= | 8741 | struct charset_info_st my_charset_euckr_korean_ci= |
1664 | 8741 | { | 8742 | { |
1665 | 8742 | 19,0,0, /* number */ | 8743 | 19,0,0, /* number */ |
1666 | 8743 | MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ | 8744 | MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ |
1667 | @@ -8770,7 +8771,7 @@ | |||
1668 | 8770 | }; | 8771 | }; |
1669 | 8771 | 8772 | ||
1670 | 8772 | 8773 | ||
1672 | 8773 | CHARSET_INFO my_charset_euckr_bin= | 8774 | struct charset_info_st my_charset_euckr_bin= |
1673 | 8774 | { | 8775 | { |
1674 | 8775 | 85,0,0, /* number */ | 8776 | 85,0,0, /* number */ |
1675 | 8776 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ | 8777 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ |
1676 | 8777 | 8778 | ||
1677 | === modified file 'strings/ctype-eucjpms.c' | |||
1678 | --- strings/ctype-eucjpms.c 2008-02-20 18:49:26 +0000 | |||
1679 | +++ strings/ctype-eucjpms.c 2009-11-03 19:35:25 +0000 | |||
1680 | @@ -26,6 +26,7 @@ | |||
1681 | 26 | * .configure. mbmaxlen_eucjpms=3 | 26 | * .configure. mbmaxlen_eucjpms=3 |
1682 | 27 | */ | 27 | */ |
1683 | 28 | 28 | ||
1684 | 29 | #define CHARSET_EXTERN MYSQL_PLUGIN_IMPORT struct charset_info_st | ||
1685 | 29 | #include <my_global.h> | 30 | #include <my_global.h> |
1686 | 30 | #include "m_string.h" | 31 | #include "m_string.h" |
1687 | 31 | #include "m_ctype.h" | 32 | #include "m_ctype.h" |
1688 | @@ -33,7 +34,7 @@ | |||
1689 | 33 | #ifdef HAVE_CHARSET_eucjpms | 34 | #ifdef HAVE_CHARSET_eucjpms |
1690 | 34 | 35 | ||
1691 | 35 | 36 | ||
1693 | 36 | static uchar NEAR ctype_eucjpms[257] = | 37 | static const uchar NEAR ctype_eucjpms[257] = |
1694 | 37 | { | 38 | { |
1695 | 38 | 0, /* For standard library */ | 39 | 0, /* For standard library */ |
1696 | 39 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ | 40 | 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ |
1697 | @@ -70,7 +71,7 @@ | |||
1698 | 70 | 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, | 71 | 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, |
1699 | 71 | }; | 72 | }; |
1700 | 72 | 73 | ||
1702 | 73 | static uchar NEAR to_lower_eucjpms[]= | 74 | static const uchar NEAR to_lower_eucjpms[]= |
1703 | 74 | { | 75 | { |
1704 | 75 | '\000','\001','\002','\003','\004','\005','\006','\007', | 76 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1705 | 76 | '\010','\011','\012','\013','\014','\015','\016','\017', | 77 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1706 | @@ -106,7 +107,7 @@ | |||
1707 | 106 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' | 107 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' |
1708 | 107 | }; | 108 | }; |
1709 | 108 | 109 | ||
1711 | 109 | static uchar NEAR to_upper_eucjpms[]= | 110 | static const uchar NEAR to_upper_eucjpms[]= |
1712 | 110 | { | 111 | { |
1713 | 111 | '\000','\001','\002','\003','\004','\005','\006','\007', | 112 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1714 | 112 | '\010','\011','\012','\013','\014','\015','\016','\017', | 113 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1715 | @@ -142,7 +143,7 @@ | |||
1716 | 142 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' | 143 | (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' |
1717 | 143 | }; | 144 | }; |
1718 | 144 | 145 | ||
1720 | 145 | static uchar NEAR sort_order_eucjpms[]= | 146 | static const uchar NEAR sort_order_eucjpms[]= |
1721 | 146 | { | 147 | { |
1722 | 147 | '\000','\001','\002','\003','\004','\005','\006','\007', | 148 | '\000','\001','\002','\003','\004','\005','\006','\007', |
1723 | 148 | '\010','\011','\012','\013','\014','\015','\016','\017', | 149 | '\010','\011','\012','\013','\014','\015','\016','\017', |
1724 | @@ -201,7 +202,7 @@ | |||
1725 | 201 | } | 202 | } |
1726 | 202 | 203 | ||
1727 | 203 | 204 | ||
1729 | 204 | static uint16 tab_jisx0201_uni[256]={ | 205 | static const uint16 tab_jisx0201_uni[256]={ |
1730 | 205 | 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 206 | 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
1731 | 206 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 207 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
1732 | 207 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 208 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
1733 | @@ -270,7 +271,7 @@ | |||
1734 | 270 | 271 | ||
1735 | 271 | 272 | ||
1736 | 272 | /* page 0 0x2121-0x217E */ | 273 | /* page 0 0x2121-0x217E */ |
1738 | 273 | static uint16 tab_jisx0208_uni0[]={ | 274 | static const uint16 tab_jisx0208_uni0[]={ |
1739 | 274 | 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, | 275 | 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, |
1740 | 275 | 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, | 276 | 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, |
1741 | 276 | 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, | 277 | 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, |
1742 | @@ -285,7 +286,7 @@ | |||
1743 | 285 | 0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7}; | 286 | 0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7}; |
1744 | 286 | 287 | ||
1745 | 287 | /* page 1 0x2221-0x227E */ | 288 | /* page 1 0x2221-0x227E */ |
1747 | 288 | static uint16 tab_jisx0208_uni1[]={ | 289 | static const uint16 tab_jisx0208_uni1[]={ |
1748 | 289 | 0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x203B, | 290 | 0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x203B, |
1749 | 290 | 0x3012,0x2192,0x2190,0x2191,0x2193,0x3013, 0, 0, | 291 | 0x3012,0x2192,0x2190,0x2191,0x2193,0x3013, 0, 0, |
1750 | 291 | 0, 0, 0, 0, 0, 0, 0, 0, | 292 | 0, 0, 0, 0, 0, 0, 0, 0, |
1751 | @@ -300,7 +301,7 @@ | |||
1752 | 300 | 0x00B6, 0, 0, 0, 0,0x25EF}; | 301 | 0x00B6, 0, 0, 0, 0,0x25EF}; |
1753 | 301 | 302 | ||
1754 | 302 | /* page 2 0x2330-0x237A */ | 303 | /* page 2 0x2330-0x237A */ |
1756 | 303 | static uint16 tab_jisx0208_uni2[]={ | 304 | static const uint16 tab_jisx0208_uni2[]={ |
1757 | 304 | 0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17, | 305 | 0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17, |
1758 | 305 | 0xFF18,0xFF19, 0, 0, 0, 0, 0, 0, | 306 | 0xFF18,0xFF19, 0, 0, 0, 0, 0, 0, |
1759 | 306 | 0,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27, | 307 | 0,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27, |
1760 | @@ -313,7 +314,7 @@ | |||
1761 | 313 | 0xFF58,0xFF59,0xFF5A}; | 314 | 0xFF58,0xFF59,0xFF5A}; |
1762 | 314 | 315 | ||
1763 | 315 | /* page 3 0x2421-0x2473 */ | 316 | /* page 3 0x2421-0x2473 */ |
1765 | 316 | static uint16 tab_jisx0208_uni3[]={ | 317 | static const uint16 tab_jisx0208_uni3[]={ |
1766 | 317 | 0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048, | 318 | 0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048, |
1767 | 318 | 0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050, | 319 | 0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050, |
1768 | 319 | 0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058, | 320 | 0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058, |
1769 | @@ -327,7 +328,7 @@ | |||
1770 | 327 | 0x3091,0x3092,0x3093}; | 328 | 0x3091,0x3092,0x3093}; |
1771 | 328 | 329 | ||
1772 | 329 | /* page 4 0x2521-0x2576 */ | 330 | /* page 4 0x2521-0x2576 */ |
1774 | 330 | static uint16 tab_jisx0208_uni4[]={ | 331 | static const uint16 tab_jisx0208_uni4[]={ |
1775 | 331 | 0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8, | 332 | 0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8, |
1776 | 332 | 0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0, | 333 | 0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0, |
1777 | 333 | 0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8, | 334 | 0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8, |
1778 | @@ -341,7 +342,7 @@ | |||
1779 | 341 | 0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6}; | 342 | 0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6}; |
1780 | 342 | 343 | ||
1781 | 343 | /* page 5 0x2621-0x2658 */ | 344 | /* page 5 0x2621-0x2658 */ |
1783 | 344 | static uint16 tab_jisx0208_uni5[]={ | 345 | static const uint16 tab_jisx0208_uni5[]={ |
1784 | 345 | 0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398, | 346 | 0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398, |
1785 | 346 | 0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0, | 347 | 0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0, |
1786 | 347 | 0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9, | 348 | 0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9, |
1787 | @@ -352,7 +353,7 @@ | |||
1788 | 352 | }; | 353 | }; |
1789 | 353 | 354 | ||
1790 | 354 | /* page 6 0x2721-0x2771 */ | 355 | /* page 6 0x2721-0x2771 */ |
1792 | 355 | static uint16 tab_jisx0208_uni6[]={ | 356 | static const uint16 tab_jisx0208_uni6[]={ |
1793 | 356 | 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416, | 357 | 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416, |
1794 | 357 | 0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E, | 358 | 0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E, |
1795 | 358 | 0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426, | 359 | 0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426, |
1796 | @@ -366,7 +367,7 @@ | |||
1797 | 366 | 0x044F}; | 367 | 0x044F}; |
1798 | 367 | 368 | ||
1799 | 368 | /* page 7 0x2821-0x2840 */ | 369 | /* page 7 0x2821-0x2840 */ |
1801 | 369 | static uint16 tab_jisx0208_uni7[]={ | 370 | static const uint16 tab_jisx0208_uni7[]={ |
1802 | 370 | 0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C, | 371 | 0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C, |
1803 | 371 | 0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B, | 372 | 0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B, |
1804 | 372 | 0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F, | 373 | 0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F, |
1805 | @@ -374,7 +375,7 @@ | |||
1806 | 374 | }; | 375 | }; |
1807 | 375 | 376 | ||
1808 | 376 | /* page 8 0x3021-0x307E */ | 377 | /* page 8 0x3021-0x307E */ |
1810 | 377 | static uint16 tab_jisx0208_uni8[]={ | 378 | static const uint16 tab_jisx0208_uni8[]={ |
1811 | 378 | 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, | 379 | 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, |
1812 | 379 | 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, | 380 | 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, |
1813 | 380 | 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, | 381 | 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, |
1814 | @@ -389,7 +390,7 @@ | |||
1815 | 389 | 0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D}; | 390 | 0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D}; |
1816 | 390 | 391 | ||
1817 | 391 | /* page 9 0x3121-0x317E */ | 392 | /* page 9 0x3121-0x317E */ |
1819 | 392 | static uint16 tab_jisx0208_uni9[]={ | 393 | static const uint16 tab_jisx0208_uni9[]={ |
1820 | 393 | 0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,0x70CF, | 394 | 0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,0x70CF, |
1821 | 394 | 0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,0x7893, | 395 | 0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,0x7893, |
1822 | 395 | 0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,0x59E5, | 396 | 0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,0x59E5, |
1823 | @@ -404,7 +405,7 @@ | |||
1824 | 404 | 0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC}; | 405 | 0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC}; |
1825 | 405 | 406 | ||
1826 | 406 | /* page 10 0x3221-0x327E */ | 407 | /* page 10 0x3221-0x327E */ |
1828 | 407 | static uint16 tab_jisx0208_uni10[]={ | 408 | static const uint16 tab_jisx0208_uni10[]={ |
1829 | 408 | 0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,0x8956, | 409 | 0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,0x8956, |
1830 | 409 | 0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,0x5C4B, | 410 | 0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,0x5C4B, |
1831 | 410 | 0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,0x6069, | 411 | 0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,0x6069, |
1832 | @@ -419,7 +420,7 @@ | |||
1833 | 419 | 0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539}; | 420 | 0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539}; |
1834 | 420 | 421 | ||
1835 | 421 | /* page 11 0x3321-0x337E */ | 422 | /* page 11 0x3321-0x337E */ |
1837 | 422 | static uint16 tab_jisx0208_uni11[]={ | 423 | static const uint16 tab_jisx0208_uni11[]={ |
1838 | 423 | 0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,0x7D75, | 424 | 0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,0x7D75, |
1839 | 424 | 0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,0x5916, | 425 | 0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,0x5916, |
1840 | 425 | 0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,0x84CB, | 426 | 0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,0x84CB, |
1841 | @@ -434,7 +435,7 @@ | |||
1842 | 434 | 0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431}; | 435 | 0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431}; |
1843 | 435 | 436 | ||
1844 | 436 | /* page 12 0x3421-0x347E */ | 437 | /* page 12 0x3421-0x347E */ |
1846 | 437 | static uint16 tab_jisx0208_uni12[]={ | 438 | static const uint16 tab_jisx0208_uni12[]={ |
1847 | 438 | 0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,0x5BD2, | 439 | 0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,0x5BD2, |
1848 | 439 | 0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,0x5B8C, | 440 | 0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,0x5B8C, |
1849 | 440 | 0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,0x61BE, | 441 | 0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,0x61BE, |
1850 | @@ -449,7 +450,7 @@ | |||
1851 | 449 | 0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4}; | 450 | 0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4}; |
1852 | 450 | 451 | ||
1853 | 451 | /* page 13 0x3521-0x357E */ | 452 | /* page 13 0x3521-0x357E */ |
1855 | 452 | static uint16 tab_jisx0208_uni13[]={ | 453 | static const uint16 tab_jisx0208_uni13[]={ |
1856 | 453 | 0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,0x5B63, | 454 | 0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,0x5B63, |
1857 | 454 | 0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,0x8ECC, | 455 | 0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,0x8ECC, |
1858 | 455 | 0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,0x5993, | 456 | 0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,0x5993, |
1859 | @@ -464,7 +465,7 @@ | |||
1860 | 464 | 0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC}; | 465 | 0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC}; |
1861 | 465 | 466 | ||
1862 | 466 | /* page 14 0x3621-0x367E */ | 467 | /* page 14 0x3621-0x367E */ |
1864 | 467 | static uint16 tab_jisx0208_uni14[]={ | 468 | static const uint16 tab_jisx0208_uni14[]={ |
1865 | 468 | 0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,0x5354, | 469 | 0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,0x5354, |
1866 | 469 | 0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,0x5F4A, | 470 | 0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,0x5F4A, |
1867 | 470 | 0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,0x72C2, | 471 | 0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,0x72C2, |
1868 | @@ -479,7 +480,7 @@ | |||
1869 | 479 | 0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48}; | 480 | 0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48}; |
1870 | 480 | 481 | ||
1871 | 481 | /* page 15 0x3721-0x377E */ | 482 | /* page 15 0x3721-0x377E */ |
1873 | 482 | static uint16 tab_jisx0208_uni15[]={ | 483 | static const uint16 tab_jisx0208_uni15[]={ |
1874 | 483 | 0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,0x9688, | 484 | 0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,0x9688, |
1875 | 484 | 0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,0x85AB, | 485 | 0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,0x85AB, |
1876 | 485 | 0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,0x4FC2, | 486 | 0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,0x4FC2, |
1877 | @@ -494,7 +495,7 @@ | |||
1878 | 494 | 0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372}; | 495 | 0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372}; |
1879 | 495 | 496 | ||
1880 | 496 | /* page 16 0x3821-0x387E */ | 497 | /* page 16 0x3821-0x387E */ |
1882 | 497 | static uint16 tab_jisx0208_uni16[]={ | 498 | static const uint16 tab_jisx0208_uni16[]={ |
1883 | 498 | 0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,0x7D79, | 499 | 0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,0x7D79, |
1884 | 499 | 0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,0x9375, | 500 | 0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,0x9375, |
1885 | 500 | 0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,0x5E7B, | 501 | 0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,0x5E7B, |
1886 | @@ -509,7 +510,7 @@ | |||
1887 | 509 | 0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411}; | 510 | 0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411}; |
1888 | 510 | 511 | ||
1889 | 511 | /* page 17 0x3921-0x397E */ | 512 | /* page 17 0x3921-0x397E */ |
1891 | 512 | static uint16 tab_jisx0208_uni17[]={ | 513 | static const uint16 tab_jisx0208_uni17[]={ |
1892 | 513 | 0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,0x5B8F, | 514 | 0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,0x5B8F, |
1893 | 514 | 0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,0x5F18, | 515 | 0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,0x5F18, |
1894 | 515 | 0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,0x6643, | 516 | 0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,0x6643, |
1895 | @@ -524,7 +525,7 @@ | |||
1896 | 524 | 0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC}; | 525 | 0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC}; |
1897 | 525 | 526 | ||
1898 | 526 | /* page 18 0x3A21-0x3A7E */ | 527 | /* page 18 0x3A21-0x3A7E */ |
1900 | 527 | static uint16 tab_jisx0208_uni18[]={ | 528 | static const uint16 tab_jisx0208_uni18[]={ |
1901 | 528 | 0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,0x6068, | 529 | 0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,0x6068, |
1902 | 529 | 0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,0x7D3A, | 530 | 0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,0x7D3A, |
1903 | 530 | 0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,0x5DE6, | 531 | 0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,0x5DE6, |
1904 | @@ -539,7 +540,7 @@ | |||
1905 | 539 | 0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237}; | 540 | 0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237}; |
1906 | 540 | 541 | ||
1907 | 541 | /* page 19 0x3B21-0x3B7E */ | 542 | /* page 19 0x3B21-0x3B7E */ |
1909 | 542 | static uint16 tab_jisx0208_uni19[]={ | 543 | static const uint16 tab_jisx0208_uni19[]={ |
1910 | 543 | 0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,0x96D1, | 544 | 0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,0x96D1, |
1911 | 544 | 0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,0x4E09, | 545 | 0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,0x4E09, |
1912 | 545 | 0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,0x71E6, | 546 | 0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,0x71E6, |
1913 | @@ -554,7 +555,7 @@ | |||
1914 | 554 | 0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642}; | 555 | 0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642}; |
1915 | 555 | 556 | ||
1916 | 556 | /* page 20 0x3C21-0x3C7E */ | 557 | /* page 20 0x3C21-0x3C7E */ |
1918 | 557 | static uint16 tab_jisx0208_uni20[]={ | 558 | static const uint16 tab_jisx0208_uni20[]={ |
1919 | 558 | 0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,0x793A, | 559 | 0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,0x793A, |
1920 | 559 | 0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,0x5F0F, | 560 | 0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,0x5F0F, |
1921 | 560 | 0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,0x53F1, | 561 | 0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,0x53F1, |
1922 | @@ -569,7 +570,7 @@ | |||
1923 | 569 | 0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468}; | 570 | 0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468}; |
1924 | 570 | 571 | ||
1925 | 571 | /* page 21 0x3D21-0x3D7E */ | 572 | /* page 21 0x3D21-0x3D7E */ |
1927 | 572 | static uint16 tab_jisx0208_uni21[]={ | 573 | static const uint16 tab_jisx0208_uni21[]={ |
1928 | 573 | 0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,0x79C0, | 574 | 0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,0x79C0, |
1929 | 574 | 0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,0x8846, | 575 | 0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,0x8846, |
1930 | 575 | 0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,0x96C6, | 576 | 0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,0x96C6, |
1931 | @@ -584,7 +585,7 @@ | |||
1932 | 584 | 0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F}; | 585 | 0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F}; |
1933 | 585 | 586 | ||
1934 | 586 | /* page 22 0x3E21-0x3E7E */ | 587 | /* page 22 0x3E21-0x3E7E */ |
1936 | 587 | static uint16 tab_jisx0208_uni22[]={ | 588 | static const uint16 tab_jisx0208_uni22[]={ |
1937 | 588 | 0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,0x5617, | 589 | 0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,0x5617, |
1938 | 589 | 0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,0x5C1A, | 590 | 0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,0x5C1A, |
1939 | 590 | 0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,0x638C, | 591 | 0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,0x638C, |
1940 | @@ -599,7 +600,7 @@ | |||
1941 | 599 | 0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE}; | 600 | 0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE}; |
1942 | 600 | 601 | ||
1943 | 601 | /* page 23 0x3F21-0x3F7E */ | 602 | /* page 23 0x3F21-0x3F7E */ |
1945 | 602 | static uint16 tab_jisx0208_uni23[]={ | 603 | static const uint16 tab_jisx0208_uni23[]={ |
1946 | 603 | 0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,0x89E6, | 604 | 0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,0x89E6, |
1947 | 604 | 0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,0x5507, | 605 | 0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,0x5507, |
1948 | 605 | 0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,0x664B, | 606 | 0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,0x664B, |
1949 | @@ -614,7 +615,7 @@ | |||
1950 | 614 | 0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE}; | 615 | 0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE}; |
1951 | 615 | 616 | ||
1952 | 616 | /* page 24 0x4021-0x407E */ | 617 | /* page 24 0x4021-0x407E */ |
1954 | 617 | static uint16 tab_jisx0208_uni24[]={ | 618 | static const uint16 tab_jisx0208_uni24[]={ |
1955 | 618 | 0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,0x51C4, | 619 | 0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,0x51C4, |
1956 | 619 | 0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,0x6574, | 620 | 0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,0x6574, |
1957 | 620 | 0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,0x751F, | 621 | 0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,0x751F, |
1958 | @@ -629,7 +630,7 @@ | |||
1959 | 629 | 0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA}; | 630 | 0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA}; |
1960 | 630 | 631 | ||
1961 | 631 | /* page 25 0x4121-0x417E */ | 632 | /* page 25 0x4121-0x417E */ |
1963 | 632 | static uint16 tab_jisx0208_uni25[]={ | 633 | static const uint16 tab_jisx0208_uni25[]={ |
1964 | 633 | 0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,0x8CCE, | 634 | 0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,0x8CCE, |
1965 | 634 | 0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,0x524D, | 635 | 0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,0x524D, |
1966 | 635 | 0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,0x7CCE, | 636 | 0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,0x7CCE, |
1967 | @@ -644,7 +645,7 @@ | |||
1968 | 644 | 0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E}; | 645 | 0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E}; |
1969 | 645 | 646 | ||
1970 | 646 | /* page 26 0x4221-0x427E */ | 647 | /* page 26 0x4221-0x427E */ |
1972 | 647 | static uint16 tab_jisx0208_uni26[]={ | 648 | static const uint16 tab_jisx0208_uni26[]={ |
1973 | 648 | 0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,0x5373, | 649 | 0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,0x5373, |
1974 | 649 | 0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,0x5C5E, | 650 | 0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,0x5C5E, |
1975 | 650 | 0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,0x5B58, | 651 | 0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,0x5B58, |
1976 | @@ -659,7 +660,7 @@ | |||
1977 | 659 | 0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA}; | 660 | 0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA}; |
1978 | 660 | 661 | ||
1979 | 661 | /* page 27 0x4321-0x437E */ | 662 | /* page 27 0x4321-0x437E */ |
1981 | 662 | static uint16 tab_jisx0208_uni27[]={ | 663 | static const uint16 tab_jisx0208_uni27[]={ |
1982 | 663 | 0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,0x7AEA, | 664 | 0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,0x7AEA, |
1983 | 664 | 0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,0x4E39, | 665 | 0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,0x4E39, |
1984 | 665 | 0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,0x6DE1, | 666 | 0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,0x6DE1, |
1985 | @@ -674,7 +675,7 @@ | |||
1986 | 674 | 0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5}; | 675 | 0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5}; |
1987 | 675 | 676 | ||
1988 | 676 | /* page 28 0x4421-0x447E */ | 677 | /* page 28 0x4421-0x447E */ |
1990 | 677 | static uint16 tab_jisx0208_uni28[]={ | 678 | static const uint16 tab_jisx0208_uni28[]={ |
1991 | 678 | 0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,0x61F2, | 679 | 0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,0x61F2, |
1992 | 679 | 0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,0x8074, | 680 | 0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,0x8074, |
1993 | 680 | 0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,0x929A, | 681 | 0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,0x929A, |
1994 | @@ -689,7 +690,7 @@ | |||
1995 | 689 | 0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013}; | 690 | 0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013}; |
1996 | 690 | 691 | ||
1997 | 691 | /* page 29 0x4521-0x457E */ | 692 | /* page 29 0x4521-0x457E */ |
1999 | 692 | static uint16 tab_jisx0208_uni29[]={ | 693 | static const uint16 tab_jisx0208_uni29[]={ |
2000 | 693 | 0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,0x6575, | 694 | 0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,0x6575, |
2001 | 694 | 0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,0x5FB9, | 695 | 0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,0x5FB9, |
2002 | 695 | 0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,0x5C55, | 696 | 0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,0x5C55, |
2003 | @@ -704,7 +705,7 @@ | |||
2004 | 704 | 0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230}; | 705 | 0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230}; |
2005 | 705 | 706 | ||
2006 | 706 | /* page 30 0x4621-0x467E */ | 707 | /* page 30 0x4621-0x467E */ |
2008 | 707 | static uint16 tab_jisx0208_uni30[]={ | 708 | static const uint16 tab_jisx0208_uni30[]={ |
2009 | 708 | 0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,0x9003, | 709 | 0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,0x9003, |
2010 | 709 | 0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,0x52D5, | 710 | 0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,0x52D5, |
2011 | 710 | 0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,0x7AE5, | 711 | 0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,0x7AE5, |
2012 | @@ -719,7 +720,7 @@ | |||
2013 | 719 | 0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165}; | 720 | 0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165}; |
2014 | 720 | 721 | ||
2015 | 721 | /* page 31 0x4721-0x477E */ | 722 | /* page 31 0x4721-0x477E */ |
2017 | 722 | static uint16 tab_jisx0208_uni31[]={ | 723 | static const uint16 tab_jisx0208_uni31[]={ |
2018 | 723 | 0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,0x6FE1, | 724 | 0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,0x6FE1, |
2019 | 724 | 0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,0x5FF5, | 725 | 0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,0x5FF5, |
2020 | 725 | 0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,0x57DC, | 726 | 0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,0x57DC, |
2021 | @@ -734,7 +735,7 @@ | |||
2022 | 734 | 0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6}; | 735 | 0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6}; |
2023 | 735 | 736 | ||
2024 | 736 | /* page 32 0x4821-0x487E */ | 737 | /* page 32 0x4821-0x487E */ |
2026 | 737 | static uint16 tab_jisx0208_uni32[]={ | 738 | static const uint16 tab_jisx0208_uni32[]={ |
2027 | 738 | 0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,0x5E61, | 739 | 0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,0x5E61, |
2028 | 739 | 0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,0x9197, | 740 | 0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,0x9197, |
2029 | 740 | 0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,0x567A, | 741 | 0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,0x567A, |
2030 | @@ -749,7 +750,7 @@ | |||
2031 | 749 | 0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E}; | 750 | 0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E}; |
2032 | 750 | 751 | ||
2033 | 751 | /* page 33 0x4921-0x497E */ | 752 | /* page 33 0x4921-0x497E */ |
2035 | 752 | static uint16 tab_jisx0208_uni33[]={ | 753 | static const uint16 tab_jisx0208_uni33[]={ |
2036 | 753 | 0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,0x819D, | 754 | 0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,0x819D, |
2037 | 754 | 0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,0x6867, | 755 | 0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,0x6867, |
2038 | 755 | 0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,0x6A19, | 756 | 0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,0x6A19, |
2039 | @@ -764,7 +765,7 @@ | |||
2040 | 764 | 0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D}; | 765 | 0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D}; |
2041 | 765 | 766 | ||
2042 | 766 | /* page 34 0x4A21-0x4A7E */ | 767 | /* page 34 0x4A21-0x4A7E */ |
2044 | 767 | static uint16 tab_jisx0208_uni34[]={ | 768 | static const uint16 tab_jisx0208_uni34[]={ |
2045 | 768 | 0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,0x6CB8, | 769 | 0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,0x6CB8, |
2046 | 769 | 0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,0x61A4, | 770 | 0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,0x61A4, |
2047 | 770 | 0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,0x6587, | 771 | 0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,0x6587, |
2048 | @@ -779,7 +780,7 @@ | |||
2049 | 779 | 0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B}; | 780 | 0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B}; |
2050 | 780 | 781 | ||
2051 | 781 | /* page 35 0x4B21-0x4B7E */ | 782 | /* page 35 0x4B21-0x4B7E */ |
2053 | 782 | static uint16 tab_jisx0208_uni35[]={ | 783 | static const uint16 tab_jisx0208_uni35[]={ |
2054 | 783 | 0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,0x840C, | 784 | 0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,0x840C, |
2055 | 784 | 0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,0x98FD, | 785 | 0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,0x98FD, |
2056 | 785 | 0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,0x59A8, | 786 | 0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,0x59A8, |
2057 | @@ -794,7 +795,7 @@ | |||
2058 | 794 | 0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80}; | 795 | 0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80}; |
2059 | 795 | 796 | ||
2060 | 796 | /* page 36 0x4C21-0x4C7E */ | 797 | /* page 36 0x4C21-0x4C7E */ |
2062 | 797 | static uint16 tab_jisx0208_uni36[]={ | 798 | static const uint16 tab_jisx0208_uni36[]={ |
2063 | 798 | 0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,0x5CAC, | 799 | 0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,0x5CAC, |
2064 | 799 | 0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,0x7C8D, | 800 | 0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,0x7C8D, |
2065 | 800 | 0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,0x9727, | 801 | 0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,0x9727, |
2066 | @@ -809,7 +810,7 @@ | |||
2067 | 809 | 0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652}; | 810 | 0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652}; |
2068 | 810 | 811 | ||
2069 | 811 | /* page 37 0x4D21-0x4D7E */ | 812 | /* page 37 0x4D21-0x4D7E */ |
2071 | 812 | static uint16 tab_jisx0208_uni37[]={ | 813 | static const uint16 tab_jisx0208_uni37[]={ |
2072 | 813 | 0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,0x5BA5, | 814 | 0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,0x5BA5, |
2073 | 814 | 0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,0x6D8C, | 815 | 0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,0x6D8C, |
2074 | 815 | 0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,0x9091, | 816 | 0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,0x9091, |
2075 | @@ -824,7 +825,7 @@ | |||
2076 | 824 | 0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483}; | 825 | 0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483}; |
2077 | 825 | 826 | ||
2078 | 826 | /* page 38 0x4E21-0x4E7E */ | 827 | /* page 38 0x4E21-0x4E7E */ |
2080 | 827 | static uint16 tab_jisx0208_uni38[]={ | 828 | static const uint16 tab_jisx0208_uni38[]={ |
2081 | 828 | 0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,0x7387, | 829 | 0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,0x7387, |
2082 | 829 | 0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,0x7409, | 830 | 0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,0x7409, |
2083 | 830 | 0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,0x616E, | 831 | 0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,0x616E, |
2084 | @@ -839,7 +840,7 @@ | |||
2085 | 839 | 0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F}; | 840 | 0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F}; |
2086 | 840 | 841 | ||
2087 | 841 | /* page 39 0x4F21-0x4F53 */ | 842 | /* page 39 0x4F21-0x4F53 */ |
2089 | 842 | static uint16 tab_jisx0208_uni39[]={ | 843 | static const uint16 tab_jisx0208_uni39[]={ |
2090 | 843 | 0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,0x8CC2, | 844 | 0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,0x8CC2, |
2091 | 844 | 0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,0x697C, | 845 | 0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,0x697C, |
2092 | 845 | 0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,0x807E, | 846 | 0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,0x807E, |
2093 | @@ -849,7 +850,7 @@ | |||
2094 | 849 | 0x6E7E,0x7897,0x8155}; | 850 | 0x6E7E,0x7897,0x8155}; |
2095 | 850 | 851 | ||
2096 | 851 | /* page 40 0x5021-0x507E */ | 852 | /* page 40 0x5021-0x507E */ |
2098 | 852 | static uint16 tab_jisx0208_uni40[]={ | 853 | static const uint16 tab_jisx0208_uni40[]={ |
2099 | 853 | 0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,0x4E3F, | 854 | 0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,0x4E3F, |
2100 | 854 | 0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,0x8212, | 855 | 0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,0x8212, |
2101 | 855 | 0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,0x4EB3, | 856 | 0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,0x4EB3, |
2102 | @@ -864,7 +865,7 @@ | |||
2103 | 864 | 0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2}; | 865 | 0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2}; |
2104 | 865 | 866 | ||
2105 | 866 | /* page 41 0x5121-0x517E */ | 867 | /* page 41 0x5121-0x517E */ |
2107 | 867 | static uint16 tab_jisx0208_uni41[]={ | 868 | static const uint16 tab_jisx0208_uni41[]={ |
2108 | 868 | 0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,0x50ED, | 869 | 0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,0x50ED, |
2109 | 869 | 0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,0x5116, | 870 | 0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,0x5116, |
2110 | 870 | 0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,0x513B, | 871 | 0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,0x513B, |
2111 | @@ -879,7 +880,7 @@ | |||
2112 | 879 | 0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8}; | 880 | 0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8}; |
2113 | 880 | 881 | ||
2114 | 881 | /* page 42 0x5221-0x527E */ | 882 | /* page 42 0x5221-0x527E */ |
2116 | 882 | static uint16 tab_jisx0208_uni42[]={ | 883 | static const uint16 tab_jisx0208_uni42[]={ |
2117 | 883 | 0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,0x52D7, | 884 | 0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,0x52D7, |
2118 | 884 | 0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,0x52F8, | 885 | 0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,0x52F8, |
2119 | 885 | 0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,0x5315, | 886 | 0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,0x5315, |
2120 | @@ -894,7 +895,7 @@ | |||
2121 | 894 | 0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8}; | 895 | 0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8}; |
2122 | 895 | 896 | ||
2123 | 896 | /* page 43 0x5321-0x537E */ | 897 | /* page 43 0x5321-0x537E */ |
2125 | 897 | static uint16 tab_jisx0208_uni43[]={ | 898 | static const uint16 tab_jisx0208_uni43[]={ |
2126 | 898 | 0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,0x54E6, | 899 | 0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,0x54E6, |
2127 | 899 | 0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,0x5539, | 900 | 0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,0x5539, |
2128 | 900 | 0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,0x5557, | 901 | 0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,0x5557, |
2129 | @@ -909,7 +910,7 @@ | |||
2130 | 909 | 0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709}; | 910 | 0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709}; |
2131 | 910 | 911 | ||
2132 | 911 | /* page 44 0x5421-0x547E */ | 912 | /* page 44 0x5421-0x547E */ |
2134 | 912 | static uint16 tab_jisx0208_uni44[]={ | 913 | static const uint16 tab_jisx0208_uni44[]={ |
2135 | 913 | 0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,0x571C, | 914 | 0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,0x571C, |
2136 | 914 | 0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,0x5769, | 915 | 0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,0x5769, |
2137 | 915 | 0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,0x57B3, | 916 | 0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,0x57B3, |
2138 | @@ -924,7 +925,7 @@ | |||
2139 | 924 | 0x5958,0x5962,0x5960,0x5967,0x596C,0x5969}; | 925 | 0x5958,0x5962,0x5960,0x5967,0x596C,0x5969}; |
2140 | 925 | 926 | ||
2141 | 926 | /* page 45 0x5521-0x557E */ | 927 | /* page 45 0x5521-0x557E */ |
2143 | 927 | static uint16 tab_jisx0208_uni45[]={ | 928 | static const uint16 tab_jisx0208_uni45[]={ |
2144 | 928 | 0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,0x59C6, | 929 | 0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,0x59C6, |
2145 | 929 | 0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,0x5A11, | 930 | 0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,0x5A11, |
2146 | 930 | 0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,0x5A36, | 931 | 0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,0x5A36, |
2147 | @@ -939,7 +940,7 @@ | |||
2148 | 939 | 0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53}; | 940 | 0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53}; |
2149 | 940 | 941 | ||
2150 | 941 | /* page 46 0x5621-0x567E */ | 942 | /* page 46 0x5621-0x567E */ |
2152 | 942 | static uint16 tab_jisx0208_uni46[]={ | 943 | static const uint16 tab_jisx0208_uni46[]={ |
2153 | 943 | 0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,0x5C79, | 944 | 0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,0x5C79, |
2154 | 944 | 0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,0x5CBC, | 945 | 0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,0x5CBC, |
2155 | 945 | 0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,0x5CFA, | 946 | 0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,0x5CFA, |
2156 | @@ -954,7 +955,7 @@ | |||
2157 | 954 | 0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF}; | 955 | 0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF}; |
2158 | 955 | 956 | ||
2159 | 956 | /* page 47 0x5721-0x577E */ | 957 | /* page 47 0x5721-0x577E */ |
2161 | 957 | static uint16 tab_jisx0208_uni47[]={ | 958 | static const uint16 tab_jisx0208_uni47[]={ |
2162 | 958 | 0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,0x5EE8, | 959 | 0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,0x5EE8, |
2163 | 959 | 0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,0x5EFE, | 960 | 0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,0x5EFE, |
2164 | 960 | 0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,0x5F29, | 961 | 0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,0x5F29, |
2165 | @@ -969,7 +970,7 @@ | |||
2166 | 969 | 0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A}; | 970 | 0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A}; |
2167 | 970 | 971 | ||
2168 | 971 | /* page 48 0x5821-0x587E */ | 972 | /* page 48 0x5821-0x587E */ |
2170 | 972 | static uint16 tab_jisx0208_uni48[]={ | 973 | static const uint16 tab_jisx0208_uni48[]={ |
2171 | 973 | 0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,0x60E1, | 974 | 0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,0x60E1, |
2172 | 974 | 0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,0x60B5, | 975 | 0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,0x60B5, |
2173 | 975 | 0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,0x60F4, | 976 | 0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,0x60F4, |
2174 | @@ -984,7 +985,7 @@ | |||
2175 | 984 | 0x6208,0x6209,0x620D,0x620C,0x6214,0x621B}; | 985 | 0x6208,0x6209,0x620D,0x620C,0x6214,0x621B}; |
2176 | 985 | 986 | ||
2177 | 986 | /* page 49 0x5921-0x597E */ | 987 | /* page 49 0x5921-0x597E */ |
2179 | 987 | static uint16 tab_jisx0208_uni49[]={ | 988 | static const uint16 tab_jisx0208_uni49[]={ |
2180 | 988 | 0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,0x6241, | 989 | 0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,0x6241, |
2181 | 989 | 0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,0x6282, | 990 | 0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,0x6282, |
2182 | 990 | 0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,0x6294, | 991 | 0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,0x6294, |
2183 | @@ -999,7 +1000,7 @@ | |||
2184 | 999 | 0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC}; | 1000 | 0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC}; |
2185 | 1000 | 1001 | ||
2186 | 1001 | /* page 50 0x5A21-0x5A7E */ | 1002 | /* page 50 0x5A21-0x5A7E */ |
2188 | 1002 | static uint16 tab_jisx0208_uni50[]={ | 1003 | static const uint16 tab_jisx0208_uni50[]={ |
2189 | 1003 | 0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,0x64F1, | 1004 | 0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,0x64F1, |
2190 | 1004 | 0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,0x652C, | 1005 | 0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,0x652C, |
2191 | 1005 | 0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,0x651C, | 1006 | 0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,0x651C, |
2192 | @@ -1014,7 +1015,7 @@ | |||
2193 | 1014 | 0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC}; | 1015 | 0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC}; |
2194 | 1015 | 1016 | ||
2195 | 1016 | /* page 51 0x5B21-0x5B7E */ | 1017 | /* page 51 0x5B21-0x5B7E */ |
2197 | 1017 | static uint16 tab_jisx0208_uni51[]={ | 1018 | static const uint16 tab_jisx0208_uni51[]={ |
2198 | 1018 | 0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,0x66E9, | 1019 | 0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,0x66E9, |
2199 | 1019 | 0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,0x6727, | 1020 | 0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,0x6727, |
2200 | 1020 | 0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,0x6746, | 1021 | 0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,0x6746, |
2201 | @@ -1029,7 +1030,7 @@ | |||
2202 | 1029 | 0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD}; | 1030 | 0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD}; |
2203 | 1030 | 1031 | ||
2204 | 1031 | /* page 52 0x5C21-0x5C7E */ | 1032 | /* page 52 0x5C21-0x5C7E */ |
2206 | 1032 | static uint16 tab_jisx0208_uni52[]={ | 1033 | static const uint16 tab_jisx0208_uni52[]={ |
2207 | 1033 | 0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,0x68E3, | 1034 | 0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,0x68E3, |
2208 | 1034 | 0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,0x6923, | 1035 | 0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,0x6923, |
2209 | 1035 | 0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,0x6954, | 1036 | 0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,0x6954, |
2210 | @@ -1044,7 +1045,7 @@ | |||
2211 | 1044 | 0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3}; | 1045 | 0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3}; |
2212 | 1045 | 1046 | ||
2213 | 1046 | /* page 53 0x5D21-0x5D7E */ | 1047 | /* page 53 0x5D21-0x5D7E */ |
2215 | 1047 | static uint16 tab_jisx0208_uni53[]={ | 1048 | static const uint16 tab_jisx0208_uni53[]={ |
2216 | 1048 | 0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,0x6AAC, | 1049 | 0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,0x6AAC, |
2217 | 1049 | 0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,0x6B05, | 1050 | 0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,0x6B05, |
2218 | 1050 | 0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,0x6B37, | 1051 | 0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,0x6B37, |
2219 | @@ -1059,7 +1060,7 @@ | |||
2220 | 1059 | 0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE}; | 1060 | 0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE}; |
2221 | 1060 | 1061 | ||
2222 | 1061 | /* page 54 0x5E21-0x5E7E */ | 1062 | /* page 54 0x5E21-0x5E7E */ |
2224 | 1062 | static uint16 tab_jisx0208_uni54[]={ | 1063 | static const uint16 tab_jisx0208_uni54[]={ |
2225 | 1063 | 0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,0x6D36, | 1064 | 0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,0x6D36, |
2226 | 1064 | 0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,0x6D0C, | 1065 | 0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,0x6D0C, |
2227 | 1065 | 0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,0x6D95, | 1066 | 0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,0x6D95, |
2228 | @@ -1074,7 +1075,7 @@ | |||
2229 | 1074 | 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; | 1075 | 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; |
2230 | 1075 | 1076 | ||
2231 | 1076 | /* page 55 0x5F21-0x5F7E */ | 1077 | /* page 55 0x5F21-0x5F7E */ |
2233 | 1077 | static uint16 tab_jisx0208_uni55[]={ | 1078 | static const uint16 tab_jisx0208_uni55[]={ |
2234 | 1078 | 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, | 1079 | 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, |
2235 | 1079 | 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, | 1080 | 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, |
2236 | 1080 | 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, | 1081 | 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, |
2237 | @@ -1089,7 +1090,7 @@ | |||
2238 | 1089 | 0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC}; | 1090 | 0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC}; |
2239 | 1090 | 1091 | ||
2240 | 1091 | /* page 56 0x6021-0x607E */ | 1092 | /* page 56 0x6021-0x607E */ |
2242 | 1092 | static uint16 tab_jisx0208_uni56[]={ | 1093 | static const uint16 tab_jisx0208_uni56[]={ |
2243 | 1093 | 0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,0x722C, | 1094 | 0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,0x722C, |
2244 | 1094 | 0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,0x724B, | 1095 | 0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,0x724B, |
2245 | 1095 | 0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,0x7296, | 1096 | 0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,0x7296, |
2246 | @@ -1104,7 +1105,7 @@ | |||
2247 | 1104 | 0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1}; | 1105 | 0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1}; |
2248 | 1105 | 1106 | ||
2249 | 1106 | /* page 57 0x6121-0x617E */ | 1107 | /* page 57 0x6121-0x617E */ |
2251 | 1107 | static uint16 tab_jisx0208_uni57[]={ | 1108 | static const uint16 tab_jisx0208_uni57[]={ |
2252 | 1108 | 0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,0x74F1, | 1109 | 0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,0x74F1, |
2253 | 1109 | 0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,0x750D, | 1110 | 0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,0x750D, |
2254 | 1110 | 0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,0x754D, | 1111 | 0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,0x754D, |
2255 | @@ -1119,7 +1120,7 @@ | |||
2256 | 1119 | 0x7668,0x7669,0x766A,0x7667,0x766C,0x7670}; | 1120 | 0x7668,0x7669,0x766A,0x7667,0x766C,0x7670}; |
2257 | 1120 | 1121 | ||
2258 | 1121 | /* page 58 0x6221-0x627E */ | 1122 | /* page 58 0x6221-0x627E */ |
2260 | 1122 | static uint16 tab_jisx0208_uni58[]={ | 1123 | static const uint16 tab_jisx0208_uni58[]={ |
2261 | 1123 | 0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,0x768B, | 1124 | 0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,0x768B, |
2262 | 1124 | 0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,0x76B8, | 1125 | 0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,0x76B8, |
2263 | 1125 | 0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,0x76E1, | 1126 | 0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,0x76E1, |
2264 | @@ -1134,7 +1135,7 @@ | |||
2265 | 1134 | 0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC}; | 1135 | 0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC}; |
2266 | 1135 | 1136 | ||
2267 | 1136 | /* page 59 0x6321-0x637E */ | 1137 | /* page 59 0x6321-0x637E */ |
2269 | 1137 | static uint16 tab_jisx0208_uni59[]={ | 1138 | static const uint16 tab_jisx0208_uni59[]={ |
2270 | 1138 | 0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,0x7919, | 1139 | 0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,0x7919, |
2271 | 1139 | 0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,0x7955, | 1140 | 0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,0x7955, |
2272 | 1140 | 0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,0x79AA, | 1141 | 0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,0x79AA, |
2273 | @@ -1149,7 +1150,7 @@ | |||
2274 | 1149 | 0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50}; | 1150 | 0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50}; |
2275 | 1150 | 1151 | ||
2276 | 1151 | /* page 60 0x6421-0x647E */ | 1152 | /* page 60 0x6421-0x647E */ |
2278 | 1152 | static uint16 tab_jisx0208_uni60[]={ | 1153 | static const uint16 tab_jisx0208_uni60[]={ |
2279 | 1153 | 0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,0x7B65, | 1154 | 0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,0x7B65, |
2280 | 1154 | 0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,0x7B98, | 1155 | 0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,0x7B98, |
2281 | 1155 | 0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,0x7B5D, | 1156 | 0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,0x7B5D, |
2282 | @@ -1164,7 +1165,7 @@ | |||
2283 | 1164 | 0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06}; | 1165 | 0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06}; |
2284 | 1165 | 1166 | ||
2285 | 1166 | /* page 61 0x6521-0x657E */ | 1167 | /* page 61 0x6521-0x657E */ |
2287 | 1167 | static uint16 tab_jisx0208_uni61[]={ | 1168 | static const uint16 tab_jisx0208_uni61[]={ |
2288 | 1168 | 0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,0x7D32, | 1169 | 0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,0x7D32, |
2289 | 1169 | 0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,0x7D68, | 1170 | 0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,0x7D68, |
2290 | 1170 | 0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,0x7D7D, | 1171 | 0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,0x7D7D, |
2291 | @@ -1179,7 +1180,7 @@ | |||
2292 | 1179 | 0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A}; | 1180 | 0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A}; |
2293 | 1180 | 1181 | ||
2294 | 1181 | /* page 62 0x6621-0x667E */ | 1182 | /* page 62 0x6621-0x667E */ |
2296 | 1182 | static uint16 tab_jisx0208_uni62[]={ | 1183 | static const uint16 tab_jisx0208_uni62[]={ |
2297 | 1183 | 0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,0x7F54, | 1184 | 0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,0x7F54, |
2298 | 1184 | 0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,0x7F82, | 1185 | 0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,0x7F82, |
2299 | 1185 | 0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,0x7F9D, | 1186 | 0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,0x7F9D, |
2300 | @@ -1194,7 +1195,7 @@ | |||
2301 | 1194 | 0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B}; | 1195 | 0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B}; |
2302 | 1195 | 1196 | ||
2303 | 1196 | /* page 63 0x6721-0x677E */ | 1197 | /* page 63 0x6721-0x677E */ |
2305 | 1197 | static uint16 tab_jisx0208_uni63[]={ | 1198 | static const uint16 tab_jisx0208_uni63[]={ |
2306 | 1198 | 0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,0x816E, | 1199 | 0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,0x816E, |
2307 | 1199 | 0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,0x8182, | 1200 | 0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,0x8182, |
2308 | 1200 | 0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,0x81B0, | 1201 | 0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,0x81B0, |
2309 | @@ -1209,7 +1210,7 @@ | |||
2310 | 1209 | 0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9}; | 1210 | 0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9}; |
2311 | 1210 | 1211 | ||
2312 | 1211 | /* page 64 0x6821-0x687E */ | 1212 | /* page 64 0x6821-0x687E */ |
2314 | 1212 | static uint16 tab_jisx0208_uni64[]={ | 1213 | static const uint16 tab_jisx0208_uni64[]={ |
2315 | 1213 | 0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,0x8350, | 1214 | 0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,0x8350, |
2316 | 1214 | 0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,0x83AA, | 1215 | 0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,0x83AA, |
2317 | 1215 | 0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,0x837C, | 1216 | 0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,0x837C, |
2318 | @@ -1224,7 +1225,7 @@ | |||
2319 | 1224 | 0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548}; | 1225 | 0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548}; |
2320 | 1225 | 1226 | ||
2321 | 1226 | /* page 65 0x6921-0x697E */ | 1227 | /* page 65 0x6921-0x697E */ |
2323 | 1227 | static uint16 tab_jisx0208_uni65[]={ | 1228 | static const uint16 tab_jisx0208_uni65[]={ |
2324 | 1228 | 0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,0x8591, | 1229 | 0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,0x8591, |
2325 | 1229 | 0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,0x859C, | 1230 | 0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,0x859C, |
2326 | 1230 | 0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,0x85D0, | 1231 | 0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,0x85D0, |
2327 | @@ -1239,7 +1240,7 @@ | |||
2328 | 1239 | 0x874E,0x8774,0x8757,0x8768,0x876E,0x8759}; | 1240 | 0x874E,0x8774,0x8757,0x8768,0x876E,0x8759}; |
2329 | 1240 | 1241 | ||
2330 | 1241 | /* page 66 0x6A21-0x6A7E */ | 1242 | /* page 66 0x6A21-0x6A7E */ |
2332 | 1242 | static uint16 tab_jisx0208_uni66[]={ | 1243 | static const uint16 tab_jisx0208_uni66[]={ |
2333 | 1243 | 0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,0x87AF, | 1244 | 0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,0x87AF, |
2334 | 1244 | 0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,0x87B3, | 1245 | 0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,0x87B3, |
2335 | 1245 | 0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,0x880D, | 1246 | 0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,0x880D, |
2336 | @@ -1254,7 +1255,7 @@ | |||
2337 | 1254 | 0x8936,0x8938,0x894C,0x891D,0x8960,0x895E}; | 1255 | 0x8936,0x8938,0x894C,0x891D,0x8960,0x895E}; |
2338 | 1255 | 1256 | ||
2339 | 1256 | /* page 67 0x6B21-0x6B7E */ | 1257 | /* page 67 0x6B21-0x6B7E */ |
2341 | 1257 | static uint16 tab_jisx0208_uni67[]={ | 1258 | static const uint16 tab_jisx0208_uni67[]={ |
2342 | 1258 | 0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,0x897E, | 1259 | 0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,0x897E, |
2343 | 1259 | 0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,0x89A6, | 1260 | 0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,0x89A6, |
2344 | 1260 | 0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,0x89DA, | 1261 | 0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,0x89DA, |
2345 | @@ -1269,7 +1270,7 @@ | |||
2346 | 1269 | 0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B}; | 1270 | 0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B}; |
2347 | 1270 | 1271 | ||
2348 | 1271 | /* page 68 0x6C21-0x6C7E */ | 1272 | /* page 68 0x6C21-0x6C7E */ |
2350 | 1272 | static uint16 tab_jisx0208_uni68[]={ | 1273 | static const uint16 tab_jisx0208_uni68[]={ |
2351 | 1273 | 0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,0x8B8E, | 1274 | 0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,0x8B8E, |
2352 | 1274 | 0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,0x8C3F, | 1275 | 0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,0x8C3F, |
2353 | 1275 | 0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,0x8C78, | 1276 | 0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,0x8C78, |
2354 | @@ -1284,7 +1285,7 @@ | |||
2355 | 1284 | 0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A}; | 1285 | 0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A}; |
2356 | 1285 | 1286 | ||
2357 | 1286 | /* page 69 0x6D21-0x6D7E */ | 1287 | /* page 69 0x6D21-0x6D7E */ |
2359 | 1287 | static uint16 tab_jisx0208_uni69[]={ | 1288 | static const uint16 tab_jisx0208_uni69[]={ |
2360 | 1288 | 0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,0x8E60, | 1289 | 0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,0x8E60, |
2361 | 1289 | 0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,0x8E87, | 1290 | 0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,0x8E87, |
2362 | 1290 | 0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,0x8E99, | 1291 | 0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,0x8E99, |
2363 | @@ -1299,7 +1300,7 @@ | |||
2364 | 1299 | 0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8}; | 1300 | 0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8}; |
2365 | 1300 | 1301 | ||
2366 | 1301 | /* page 70 0x6E21-0x6E7E */ | 1302 | /* page 70 0x6E21-0x6E7E */ |
2368 | 1302 | static uint16 tab_jisx0208_uni70[]={ | 1303 | static const uint16 tab_jisx0208_uni70[]={ |
2369 | 1303 | 0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,0x9056, | 1304 | 0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,0x9056, |
2370 | 1304 | 0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,0x9082, | 1305 | 0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,0x9082, |
2371 | 1305 | 0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,0x90AF, | 1306 | 0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,0x90AF, |
2372 | @@ -1314,7 +1315,7 @@ | |||
2373 | 1314 | 0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E}; | 1315 | 0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E}; |
2374 | 1315 | 1316 | ||
2375 | 1316 | /* page 71 0x6F21-0x6F7E */ | 1317 | /* page 71 0x6F21-0x6F7E */ |
2377 | 1317 | static uint16 tab_jisx0208_uni71[]={ | 1318 | static const uint16 tab_jisx0208_uni71[]={ |
2378 | 1318 | 0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,0x935C, | 1319 | 0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,0x935C, |
2379 | 1319 | 0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,0x9394, | 1320 | 0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,0x9394, |
2380 | 1320 | 0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,0x93DD, | 1321 | 0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,0x93DD, |
2381 | @@ -1329,7 +1330,7 @@ | |||
2382 | 1329 | 0x964C,0x964F,0x964B,0x9677,0x965C,0x965E}; | 1330 | 0x964C,0x964F,0x964B,0x9677,0x965C,0x965E}; |
2383 | 1330 | 1331 | ||
2384 | 1331 | /* page 72 0x7021-0x707E */ | 1332 | /* page 72 0x7021-0x707E */ |
2386 | 1332 | static uint16 tab_jisx0208_uni72[]={ | 1333 | static const uint16 tab_jisx0208_uni72[]={ |
2387 | 1333 | 0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,0x9695, | 1334 | 0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,0x9695, |
2388 | 1334 | 0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,0x96B6, | 1335 | 0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,0x96B6, |
2389 | 1335 | 0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,0x96DC, | 1336 | 0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,0x96DC, |
2390 | @@ -1344,7 +1345,7 @@ | |||
2391 | 1344 | 0x9846,0x984F,0x984B,0x986B,0x986F,0x9870}; | 1345 | 0x9846,0x984F,0x984B,0x986B,0x986F,0x9870}; |
2392 | 1345 | 1346 | ||
2393 | 1346 | /* page 73 0x7121-0x717E */ | 1347 | /* page 73 0x7121-0x717E */ |
2395 | 1347 | static uint16 tab_jisx0208_uni73[]={ | 1348 | static const uint16 tab_jisx0208_uni73[]={ |
2396 | 1348 | 0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,0x98C4, | 1349 | 0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,0x98C4, |
2397 | 1349 | 0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,0x9914, | 1350 | 0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,0x9914, |
2398 | 1350 | 0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,0x992E, | 1351 | 0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,0x992E, |
2399 | @@ -1359,7 +1360,7 @@ | |||
2400 | 1359 | 0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7}; | 1360 | 0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7}; |
2401 | 1360 | 1361 | ||
2402 | 1361 | /* page 74 0x7221-0x727E */ | 1362 | /* page 74 0x7221-0x727E */ |
2404 | 1362 | static uint16 tab_jisx0208_uni74[]={ | 1363 | static const uint16 tab_jisx0208_uni74[]={ |
2405 | 1363 | 0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,0x9B25, | 1364 | 0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,0x9B25, |
2406 | 1364 | 0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,0x9B44, | 1365 | 0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,0x9B44, |
2407 | 1365 | 0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,0x9B93, | 1366 | 0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,0x9B93, |
2408 | @@ -1374,7 +1375,7 @@ | |||
2409 | 1374 | 0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48}; | 1375 | 0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48}; |
2410 | 1375 | 1376 | ||
2411 | 1376 | /* page 75 0x7321-0x737E */ | 1377 | /* page 75 0x7321-0x737E */ |
2413 | 1377 | static uint16 tab_jisx0208_uni75[]={ | 1378 | static const uint16 tab_jisx0208_uni75[]={ |
2414 | 1378 | 0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,0x9D89, | 1379 | 0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,0x9D89, |
2415 | 1379 | 0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,0x9DB2, | 1380 | 0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,0x9DB2, |
2416 | 1380 | 0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,0x9DC2, | 1381 | 0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,0x9DC2, |
2417 | @@ -1389,11 +1390,11 @@ | |||
2418 | 1389 | 0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0}; | 1390 | 0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0}; |
2419 | 1390 | 1391 | ||
2420 | 1391 | /* page 76 0x7421-0x7426 */ | 1392 | /* page 76 0x7421-0x7426 */ |
2422 | 1392 | static uint16 tab_jisx0208_uni76[]={ | 1393 | static const uint16 tab_jisx0208_uni76[]={ |
2423 | 1393 | 0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199}; | 1394 | 0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199}; |
2424 | 1394 | 1395 | ||
2425 | 1395 | /* page 77 0x2D21 - 0x2D7C */ | 1396 | /* page 77 0x2D21 - 0x2D7C */ |
2427 | 1396 | static uint16 tab_nec13_uni0[]={ | 1397 | static const uint16 tab_nec13_uni0[]={ |
2428 | 1397 | 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, | 1398 | 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, |
2429 | 1398 | 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, | 1399 | 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, |
2430 | 1399 | 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, | 1400 | 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, |
2431 | @@ -1569,25 +1570,25 @@ | |||
2432 | 1569 | } | 1570 | } |
2433 | 1570 | 1571 | ||
2434 | 1571 | /* page 0 0x005C-0x005C */ | 1572 | /* page 0 0x005C-0x005C */ |
2436 | 1572 | static uint16 tab_uni_jisx02080[]={ | 1573 | static const uint16 tab_uni_jisx02080[]={ |
2437 | 1573 | 0x5C}; | 1574 | 0x5C}; |
2438 | 1574 | 1575 | ||
2439 | 1575 | /* page 1 0x00A2-0x00B6 */ | 1576 | /* page 1 0x00A2-0x00B6 */ |
2441 | 1576 | static uint16 tab_uni_jisx02081[]={ | 1577 | static const uint16 tab_uni_jisx02081[]={ |
2442 | 1577 | 0, 0, 0, 0, 0,0x2178,0x212F, 0, | 1578 | 0, 0, 0, 0, 0,0x2178,0x212F, 0, |
2443 | 1578 | 0, 0, 0, 0, 0, 0,0x216B,0x215E, | 1579 | 0, 0, 0, 0, 0, 0,0x216B,0x215E, |
2444 | 1579 | 0, 0,0x212D, 0,0x2279}; | 1580 | 0, 0,0x212D, 0,0x2279}; |
2445 | 1580 | 1581 | ||
2446 | 1581 | /* page 2 0x00D7-0x00D7 */ | 1582 | /* page 2 0x00D7-0x00D7 */ |
2448 | 1582 | static uint16 tab_uni_jisx02082[]={ | 1583 | static const uint16 tab_uni_jisx02082[]={ |
2449 | 1583 | 0x215F}; | 1584 | 0x215F}; |
2450 | 1584 | 1585 | ||
2451 | 1585 | /* page 3 0x00F7-0x00F7 */ | 1586 | /* page 3 0x00F7-0x00F7 */ |
2453 | 1586 | static uint16 tab_uni_jisx02083[]={ | 1587 | static const uint16 tab_uni_jisx02083[]={ |
2454 | 1587 | 0x2160}; | 1588 | 0x2160}; |
2455 | 1588 | 1589 | ||
2456 | 1589 | /* page 4 0x0391-0x03C9 */ | 1590 | /* page 4 0x0391-0x03C9 */ |
2458 | 1590 | static uint16 tab_uni_jisx02084[]={ | 1591 | static const uint16 tab_uni_jisx02084[]={ |
2459 | 1591 | 0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628, | 1592 | 0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628, |
2460 | 1592 | 0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,0x2630, | 1593 | 0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,0x2630, |
2461 | 1593 | 0x2631, 0,0x2632,0x2633,0x2634,0x2635,0x2636,0x2637, | 1594 | 0x2631, 0,0x2632,0x2633,0x2634,0x2635,0x2636,0x2637, |
2462 | @@ -1598,7 +1599,7 @@ | |||
2463 | 1598 | 0x2658}; | 1599 | 0x2658}; |
2464 | 1599 | 1600 | ||
2465 | 1600 | /* page 5 0x0401-0x0451 */ | 1601 | /* page 5 0x0401-0x0451 */ |
2467 | 1601 | static uint16 tab_uni_jisx02085[]={ | 1602 | static const uint16 tab_uni_jisx02085[]={ |
2468 | 1602 | 0x2727, 0, 0, 0, 0, 0, 0, 0, | 1603 | 0x2727, 0, 0, 0, 0, 0, 0, 0, |
2469 | 1603 | 0, 0, 0, 0, 0, 0, 0,0x2721, | 1604 | 0, 0, 0, 0, 0, 0, 0,0x2721, |
2470 | 1604 | 0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,0x272A, | 1605 | 0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,0x272A, |
2471 | @@ -1612,7 +1613,7 @@ | |||
2472 | 1612 | 0x2757}; | 1613 | 0x2757}; |
2473 | 1613 | 1614 | ||
2474 | 1614 | /* page 6 0x2010-0x203B */ | 1615 | /* page 6 0x2010-0x203B */ |
2476 | 1615 | static uint16 tab_uni_jisx02086[]={ | 1616 | static const uint16 tab_uni_jisx02086[]={ |
2477 | 1616 | 0x213E, 0, 0, 0, 0,0x213D, 0, 0, | 1617 | 0x213E, 0, 0, 0, 0,0x213D, 0, 0, |
2478 | 1617 | 0x2146,0x2147, 0, 0,0x2148,0x2149, 0, 0, | 1618 | 0x2146,0x2147, 0, 0,0x2148,0x2149, 0, 0, |
2479 | 1618 | 0x2277,0x2278, 0, 0, 0,0x2145,0x2144, 0, | 1619 | 0x2277,0x2278, 0, 0, 0,0x2145,0x2144, 0, |
2480 | @@ -1621,31 +1622,31 @@ | |||
2481 | 1621 | 0, 0, 0,0x2228}; | 1622 | 0, 0, 0,0x2228}; |
2482 | 1622 | 1623 | ||
2483 | 1623 | /* page 7 0x2100-0x2116 */ | 1624 | /* page 7 0x2100-0x2116 */ |
2485 | 1624 | static uint16 tab_uni_jisx02087[]={ | 1625 | static const uint16 tab_uni_jisx02087[]={ |
2486 | 1625 | 0, 0, 0,0x216E, 0, 0, 0, 0, | 1626 | 0, 0, 0,0x216E, 0, 0, 0, 0, |
2487 | 1626 | 0, 0, 0, 0, 0, 0, 0, 0, | 1627 | 0, 0, 0, 0, 0, 0, 0, 0, |
2488 | 1627 | 0, 0, 0, 0, 0, 0,0x2D62}; | 1628 | 0, 0, 0, 0, 0, 0,0x2D62}; |
2489 | 1628 | 1629 | ||
2490 | 1629 | /* page 8 0x2120-0x212B */ | 1630 | /* page 8 0x2120-0x212B */ |
2492 | 1630 | static uint16 tab_uni_jisx02088[]={ | 1631 | static const uint16 tab_uni_jisx02088[]={ |
2493 | 1631 | 0,0x2D64, 0, 0, 0, 0, 0, 0, | 1632 | 0,0x2D64, 0, 0, 0, 0, 0, 0, |
2494 | 1632 | 0, 0, 0,0x2272}; | 1633 | 0, 0, 0,0x2272}; |
2495 | 1633 | 1634 | ||
2496 | 1634 | /* page 9 0x2160-0x2169 */ | 1635 | /* page 9 0x2160-0x2169 */ |
2498 | 1635 | static uint16 tab_uni_jisx02089[]={ | 1636 | static const uint16 tab_uni_jisx02089[]={ |
2499 | 1636 | 0x2D35,0x2D36,0x2D37,0x2D38,0x2D39,0x2D3A,0x2D3B,0x2D3C, | 1637 | 0x2D35,0x2D36,0x2D37,0x2D38,0x2D39,0x2D3A,0x2D3B,0x2D3C, |
2500 | 1637 | 0x2D3D,0x2D3E}; | 1638 | 0x2D3D,0x2D3E}; |
2501 | 1638 | 1639 | ||
2502 | 1639 | /* page 10 0x2190-0x2193 */ | 1640 | /* page 10 0x2190-0x2193 */ |
2504 | 1640 | static uint16 tab_uni_jisx020810[]={ | 1641 | static const uint16 tab_uni_jisx020810[]={ |
2505 | 1641 | 0x222B,0x222C,0x222A,0x222D}; | 1642 | 0x222B,0x222C,0x222A,0x222D}; |
2506 | 1642 | 1643 | ||
2507 | 1643 | /* page 11 0x21D2-0x21D4 */ | 1644 | /* page 11 0x21D2-0x21D4 */ |
2509 | 1644 | static uint16 tab_uni_jisx020811[]={ | 1645 | static const uint16 tab_uni_jisx020811[]={ |
2510 | 1645 | 0x224D, 0,0x224E}; | 1646 | 0x224D, 0,0x224E}; |
2511 | 1646 | 1647 | ||
2512 | 1647 | /* page 12 0x2200-0x223D */ | 1648 | /* page 12 0x2200-0x223D */ |
2514 | 1648 | static uint16 tab_uni_jisx020812[]={ | 1649 | static const uint16 tab_uni_jisx020812[]={ |
2515 | 1649 | 0x224F, 0,0x225F,0x2250, 0, 0, 0,0x2260, | 1650 | 0x224F, 0,0x225F,0x2250, 0, 0, 0,0x2260, |
2516 | 1650 | 0x223A, 0, 0,0x223B, 0, 0, 0, 0, | 1651 | 0x223A, 0, 0,0x223B, 0, 0, 0, 0, |
2517 | 1651 | 0,0x2D74, 0, 0, 0, 0, 0, 0, | 1652 | 0,0x2D74, 0, 0, 0, 0, 0, 0, |
2518 | @@ -1656,35 +1657,35 @@ | |||
2519 | 1656 | 0, 0, 0, 0, 0,0x2266}; | 1657 | 0, 0, 0, 0, 0,0x2266}; |
2520 | 1657 | 1658 | ||
2521 | 1658 | /* page 13 0x2252-0x226B */ | 1659 | /* page 13 0x2252-0x226B */ |
2523 | 1659 | static uint16 tab_uni_jisx020813[]={ | 1660 | static const uint16 tab_uni_jisx020813[]={ |
2524 | 1660 | 0x2262, 0, 0, 0, 0, 0, 0, 0, | 1661 | 0x2262, 0, 0, 0, 0, 0, 0, 0, |
2525 | 1661 | 0, 0, 0, 0, 0, 0,0x2162,0x2261, | 1662 | 0, 0, 0, 0, 0, 0,0x2162,0x2261, |
2526 | 1662 | 0, 0, 0, 0,0x2165,0x2166, 0, 0, | 1663 | 0, 0, 0, 0,0x2165,0x2166, 0, 0, |
2527 | 1663 | 0x2263,0x2264}; | 1664 | 0x2263,0x2264}; |
2528 | 1664 | 1665 | ||
2529 | 1665 | /* page 14 0x2282-0x2287 */ | 1666 | /* page 14 0x2282-0x2287 */ |
2531 | 1666 | static uint16 tab_uni_jisx020814[]={ | 1667 | static const uint16 tab_uni_jisx020814[]={ |
2532 | 1667 | 0x223E,0x223F, 0, 0,0x223C,0x223D}; | 1668 | 0x223E,0x223F, 0, 0,0x223C,0x223D}; |
2533 | 1668 | 1669 | ||
2534 | 1669 | /* page 15 0x22A0-0x22BF */ | 1670 | /* page 15 0x22A0-0x22BF */ |
2536 | 1670 | static uint16 tab_uni_jisx020815[]={ | 1671 | static const uint16 tab_uni_jisx020815[]={ |
2537 | 1671 | 0, 0, 0, 0, 0,0x225D, 0, 0, | 1672 | 0, 0, 0, 0, 0,0x225D, 0, 0, |
2538 | 1672 | 0, 0, 0, 0, 0, 0, 0, 0, | 1673 | 0, 0, 0, 0, 0, 0, 0, 0, |
2539 | 1673 | 0, 0, 0, 0, 0, 0, 0, 0, | 1674 | 0, 0, 0, 0, 0, 0, 0, 0, |
2540 | 1674 | 0, 0, 0, 0, 0, 0, 0,0x2D79}; | 1675 | 0, 0, 0, 0, 0, 0, 0,0x2D79}; |
2541 | 1675 | 1676 | ||
2542 | 1676 | /* page 16 0x2312-0x2312 */ | 1677 | /* page 16 0x2312-0x2312 */ |
2544 | 1677 | static uint16 tab_uni_jisx020816[]={ | 1678 | static const uint16 tab_uni_jisx020816[]={ |
2545 | 1678 | 0x225E}; | 1679 | 0x225E}; |
2546 | 1679 | 1680 | ||
2547 | 1680 | /* page 17 0x2460-0x2473 */ | 1681 | /* page 17 0x2460-0x2473 */ |
2549 | 1681 | static uint16 tab_uni_jisx020817[]={ | 1682 | static const uint16 tab_uni_jisx020817[]={ |
2550 | 1682 | 0x2D21,0x2D22,0x2D23,0x2D24,0x2D25,0x2D26,0x2D27,0x2D28, | 1683 | 0x2D21,0x2D22,0x2D23,0x2D24,0x2D25,0x2D26,0x2D27,0x2D28, |
2551 | 1683 | 0x2D29,0x2D2A,0x2D2B,0x2D2C,0x2D2D,0x2D2E,0x2D2F,0x2D30, | 1684 | 0x2D29,0x2D2A,0x2D2B,0x2D2C,0x2D2D,0x2D2E,0x2D2F,0x2D30, |
2552 | 1684 | 0x2D31,0x2D32,0x2D33,0x2D34}; | 1685 | 0x2D31,0x2D32,0x2D33,0x2D34}; |
2553 | 1685 | 1686 | ||
2554 | 1686 | /* page 18 0x2500-0x254B */ | 1687 | /* page 18 0x2500-0x254B */ |
2556 | 1687 | static uint16 tab_uni_jisx020818[]={ | 1688 | static const uint16 tab_uni_jisx020818[]={ |
2557 | 1688 | 0x2821,0x282C,0x2822,0x282D, 0, 0, 0, 0, | 1689 | 0x2821,0x282C,0x2822,0x282D, 0, 0, 0, 0, |
2558 | 1689 | 0, 0, 0, 0,0x2823, 0, 0,0x282E, | 1690 | 0, 0, 0, 0,0x2823, 0, 0,0x282E, |
2559 | 1690 | 0x2824, 0, 0,0x282F,0x2826, 0, 0,0x2831, | 1691 | 0x2824, 0, 0,0x282F,0x2826, 0, 0,0x2831, |
2560 | @@ -1697,7 +1698,7 @@ | |||
2561 | 1697 | 0, 0, 0,0x2836}; | 1698 | 0, 0, 0,0x2836}; |
2562 | 1698 | 1699 | ||
2563 | 1699 | /* page 19 0x25A0-0x25CF */ | 1700 | /* page 19 0x25A0-0x25CF */ |
2565 | 1700 | static uint16 tab_uni_jisx020819[]={ | 1701 | static const uint16 tab_uni_jisx020819[]={ |
2566 | 1701 | 0x2223,0x2222, 0, 0, 0, 0, 0, 0, | 1702 | 0x2223,0x2222, 0, 0, 0, 0, 0, 0, |
2567 | 1702 | 0, 0, 0, 0, 0, 0, 0, 0, | 1703 | 0, 0, 0, 0, 0, 0, 0, 0, |
2568 | 1703 | 0, 0,0x2225,0x2224, 0, 0, 0, 0, | 1704 | 0, 0,0x2225,0x2224, 0, 0, 0, 0, |
2569 | @@ -1707,30 +1708,30 @@ | |||
2570 | 1707 | }; | 1708 | }; |
2571 | 1708 | 1709 | ||
2572 | 1709 | /* page 20 0x25EF-0x25EF */ | 1710 | /* page 20 0x25EF-0x25EF */ |
2574 | 1710 | static uint16 tab_uni_jisx020820[]={ | 1711 | static const uint16 tab_uni_jisx020820[]={ |
2575 | 1711 | 0x227E}; | 1712 | 0x227E}; |
2576 | 1712 | 1713 | ||
2577 | 1713 | /* page 21 0x2605-0x2606 */ | 1714 | /* page 21 0x2605-0x2606 */ |
2579 | 1714 | static uint16 tab_uni_jisx020821[]={ | 1715 | static const uint16 tab_uni_jisx020821[]={ |
2580 | 1715 | 0x217A,0x2179}; | 1716 | 0x217A,0x2179}; |
2581 | 1716 | 1717 | ||
2582 | 1717 | /* page 22 0x2640-0x2642 */ | 1718 | /* page 22 0x2640-0x2642 */ |
2584 | 1718 | static uint16 tab_uni_jisx020822[]={ | 1719 | static const uint16 tab_uni_jisx020822[]={ |
2585 | 1719 | 0x216A, 0,0x2169}; | 1720 | 0x216A, 0,0x2169}; |
2586 | 1720 | 1721 | ||
2587 | 1721 | /* page 23 0x266A-0x266F */ | 1722 | /* page 23 0x266A-0x266F */ |
2589 | 1722 | static uint16 tab_uni_jisx020823[]={ | 1723 | static const uint16 tab_uni_jisx020823[]={ |
2590 | 1723 | 0x2276, 0, 0,0x2275, 0,0x2274}; | 1724 | 0x2276, 0, 0,0x2275, 0,0x2274}; |
2591 | 1724 | 1725 | ||
2592 | 1725 | /* page 24 0x3000-0x301F */ | 1726 | /* page 24 0x3000-0x301F */ |
2594 | 1726 | static uint16 tab_uni_jisx020824[]={ | 1727 | static const uint16 tab_uni_jisx020824[]={ |
2595 | 1727 | 0x2121,0x2122,0x2123,0x2137, 0,0x2139,0x213A,0x213B, | 1728 | 0x2121,0x2122,0x2123,0x2137, 0,0x2139,0x213A,0x213B, |
2596 | 1728 | 0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159, | 1729 | 0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159, |
2597 | 1729 | 0x215A,0x215B,0x2229,0x222E,0x214C,0x214D, 0, 0, | 1730 | 0x215A,0x215B,0x2229,0x222E,0x214C,0x214D, 0, 0, |
2598 | 1730 | 0, 0, 0, 0, 0,0x2D60, 0,0x2D61}; | 1731 | 0, 0, 0, 0, 0,0x2D60, 0,0x2D61}; |
2599 | 1731 | 1732 | ||
2600 | 1732 | /* page 25 0x3041-0x30FE */ | 1733 | /* page 25 0x3041-0x30FE */ |
2602 | 1733 | static uint16 tab_uni_jisx020825[]={ | 1734 | static const uint16 tab_uni_jisx020825[]={ |
2603 | 1734 | 0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428, | 1735 | 0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428, |
2604 | 1735 | 0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430, | 1736 | 0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430, |
2605 | 1736 | 0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438, | 1737 | 0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438, |
2606 | @@ -1757,17 +1758,17 @@ | |||
2607 | 1757 | 0, 0,0x2126,0x213C,0x2133,0x2134}; | 1758 | 0, 0,0x2126,0x213C,0x2133,0x2134}; |
2608 | 1758 | 1759 | ||
2609 | 1759 | /* page 26 0x3230-0x3239 */ | 1760 | /* page 26 0x3230-0x3239 */ |
2611 | 1760 | static uint16 tab_uni_jisx020826[]={ | 1761 | static const uint16 tab_uni_jisx020826[]={ |
2612 | 1761 | 0,0x2D6A,0x2D6B, 0, 0, 0, 0, 0, | 1762 | 0,0x2D6A,0x2D6B, 0, 0, 0, 0, 0, |
2613 | 1762 | 0,0x2D6C}; | 1763 | 0,0x2D6C}; |
2614 | 1763 | 1764 | ||
2615 | 1764 | /* page 27 0x32A0-0x32A8 */ | 1765 | /* page 27 0x32A0-0x32A8 */ |
2617 | 1765 | static uint16 tab_uni_jisx020827[]={ | 1766 | static const uint16 tab_uni_jisx020827[]={ |
2618 | 1766 | 0, 0, 0, 0,0x2D65,0x2D66,0x2D67,0x2D68, | 1767 | 0, 0, 0, 0,0x2D65,0x2D66,0x2D67,0x2D68, |
2619 | 1767 | 0x2D69}; | 1768 | 0x2D69}; |
2620 | 1768 | 1769 | ||
2621 | 1769 | /* page 28 0x3300-0x33CD */ | 1770 | /* page 28 0x3300-0x33CD */ |
2623 | 1770 | static uint16 tab_uni_jisx020828[]={ | 1771 | static const uint16 tab_uni_jisx020828[]={ |
2624 | 1771 | 0, 0, 0,0x2D46, 0, 0, 0, 0, | 1772 | 0, 0, 0,0x2D46, 0, 0, 0, 0, |
2625 | 1772 | 0, 0, 0, 0, 0,0x2D4A, 0, 0, | 1773 | 0, 0, 0, 0, 0,0x2D4A, 0, 0, |
2626 | 1773 | 0, 0, 0, 0,0x2D41, 0, 0, 0, | 1774 | 0, 0, 0, 0,0x2D41, 0, 0, 0, |
2627 | @@ -1796,7 +1797,7 @@ | |||
2628 | 1796 | 0, 0, 0, 0, 0,0x2D63}; | 1797 | 0, 0, 0, 0, 0,0x2D63}; |
2629 | 1797 | 1798 | ||
2630 | 1798 | /* page 29 0x4E00-0x5516 */ | 1799 | /* page 29 0x4E00-0x5516 */ |
2632 | 1799 | static uint16 tab_uni_jisx020829[]={ | 1800 | static const uint16 tab_uni_jisx020829[]={ |
2633 | 1800 | 0x306C,0x437A, 0,0x3C37, 0, 0, 0,0x4B7C, | 1801 | 0x306C,0x437A, 0,0x3C37, 0, 0, 0,0x4B7C, |
2634 | 1801 | 0x3E66,0x3B30,0x3E65,0x323C, 0,0x4954,0x4D3F, 0, | 1802 | 0x3E66,0x3B30,0x3E65,0x323C, 0,0x4954,0x4D3F, 0, |
2635 | 1802 | 0x5022,0x312F, 0, 0,0x336E,0x5023,0x4024,0x5242, | 1803 | 0x5022,0x312F, 0, 0,0x336E,0x5023,0x4024,0x5242, |
2636 | @@ -2026,7 +2027,7 @@ | |||
2637 | 2026 | 0x4562, 0, 0, 0,0x532A, 0,0x3022}; | 2027 | 0x4562, 0, 0, 0,0x532A, 0,0x3022}; |
2638 | 2027 | 2028 | ||
2639 | 2028 | /* page 30 0x552E-0x5563 */ | 2029 | /* page 30 0x552E-0x5563 */ |
2641 | 2029 | static uint16 tab_uni_jisx020830[]={ | 2030 | static const uint16 tab_uni_jisx020830[]={ |
2642 | 2030 | 0x5334,0x4D23, 0,0x3E27, 0,0x533A, 0, 0, | 2031 | 0x5334,0x4D23, 0,0x3E27, 0,0x533A, 0, 0, |
2643 | 2031 | 0, 0,0x5339,0x5330, 0, 0, 0, 0, | 2032 | 0, 0,0x5339,0x5330, 0, 0, 0, 0, |
2644 | 2032 | 0x4243, 0,0x5331, 0, 0, 0,0x426F,0x5336, | 2033 | 0x4243, 0,0x5331, 0, 0, 0,0x426F,0x5336, |
2645 | @@ -2036,7 +2037,7 @@ | |||
2646 | 2036 | 0, 0, 0, 0, 0,0x5332}; | 2037 | 0, 0, 0, 0, 0,0x5332}; |
2647 | 2037 | 2038 | ||
2648 | 2038 | /* page 31 0x557B-0x576A */ | 2039 | /* page 31 0x557B-0x576A */ |
2650 | 2039 | static uint16 tab_uni_jisx020831[]={ | 2040 | static const uint16 tab_uni_jisx020831[]={ |
2651 | 2040 | 0x5341,0x5346, 0,0x5342, 0,0x533D, 0, 0, | 2041 | 0x5341,0x5346, 0,0x5342, 0,0x533D, 0, 0, |
2652 | 2041 | 0x5347,0x4131, 0, 0,0x5349, 0,0x3922,0x533F, | 2042 | 0x5347,0x4131, 0, 0,0x5349, 0,0x3922,0x533F, |
2653 | 2042 | 0x437D, 0, 0, 0, 0, 0, 0, 0, | 2043 | 0x437D, 0, 0, 0, 0, 0, 0, 0, |
2654 | @@ -2102,7 +2103,7 @@ | |||
2655 | 2102 | }; | 2103 | }; |
2656 | 2103 | 2104 | ||
2657 | 2104 | /* page 32 0x577F-0x5A9B */ | 2105 | /* page 32 0x577F-0x5A9B */ |
2659 | 2105 | static uint16 tab_uni_jisx020832[]={ | 2106 | static const uint16 tab_uni_jisx020832[]={ |
2660 | 2106 | 0x5434, 0, 0,0x3F62, 0, 0, 0, 0, | 2107 | 0x5434, 0, 0,0x3F62, 0, 0, 0, 0, |
2661 | 2107 | 0,0x5432,0x5435, 0,0x373F, 0, 0, 0, | 2108 | 0,0x5432,0x5435, 0,0x373F, 0, 0, 0, |
2662 | 2108 | 0, 0, 0, 0,0x5436, 0, 0, 0, | 2109 | 0, 0, 0, 0,0x5436, 0, 0, 0, |
2663 | @@ -2205,7 +2206,7 @@ | |||
2664 | 2205 | 0, 0, 0,0x553B,0x4932}; | 2206 | 0, 0, 0,0x553B,0x4932}; |
2665 | 2206 | 2207 | ||
2666 | 2207 | /* page 33 0x5ABC-0x5D29 */ | 2208 | /* page 33 0x5ABC-0x5D29 */ |
2668 | 2208 | static uint16 tab_uni_jisx020833[]={ | 2209 | static const uint16 tab_uni_jisx020833[]={ |
2669 | 2209 | 0x553C,0x5540,0x553D, 0, 0,0x3247,0x553F, 0, | 2210 | 0x553C,0x5540,0x553D, 0, 0,0x3247,0x553F, 0, |
2670 | 2210 | 0, 0, 0, 0, 0,0x3C3B, 0,0x553E, | 2211 | 0, 0, 0, 0, 0,0x3C3B, 0,0x553E, |
2671 | 2211 | 0x3779, 0, 0, 0,0x554C, 0, 0, 0, | 2212 | 0x3779, 0, 0, 0,0x554C, 0, 0, 0, |
2672 | @@ -2286,7 +2287,7 @@ | |||
2673 | 2286 | 0, 0, 0, 0, 0,0x4A78}; | 2287 | 0, 0, 0, 0, 0,0x4A78}; |
2674 | 2287 | 2288 | ||
2675 | 2288 | /* page 34 0x5D4B-0x6BF3 */ | 2289 | /* page 34 0x5D4B-0x6BF3 */ |
2677 | 2289 | static uint16 tab_uni_jisx020834[]={ | 2290 | static const uint16 tab_uni_jisx020834[]={ |
2678 | 2290 | 0x564B,0x5648, 0,0x564A, 0,0x4D72, 0,0x5649, | 2291 | 0x564B,0x5648, 0,0x564A, 0,0x4D72, 0,0x5649, |
2679 | 2291 | 0, 0, 0, 0, 0, 0, 0, 0, | 2292 | 0, 0, 0, 0, 0, 0, 0, 0, |
2680 | 2292 | 0,0x563F, 0, 0, 0, 0, 0, 0, | 2293 | 0,0x563F, 0, 0, 0, 0, 0, 0, |
2681 | @@ -2759,7 +2760,7 @@ | |||
2682 | 2759 | 0x5D5E}; | 2760 | 0x5D5E}; |
2683 | 2760 | 2761 | ||
2684 | 2761 | /* page 35 0x6C08-0x6CF3 */ | 2762 | /* page 35 0x6C08-0x6CF3 */ |
2686 | 2762 | static uint16 tab_uni_jisx020835[]={ | 2763 | static const uint16 tab_uni_jisx020835[]={ |
2687 | 2763 | 0x5D61, 0, 0, 0, 0, 0, 0,0x3B61, | 2764 | 0x5D61, 0, 0, 0, 0, 0, 0,0x3B61, |
2688 | 2764 | 0,0x4C31, 0,0x5D62,0x5D63, 0, 0,0x3524, | 2765 | 0,0x4C31, 0,0x5D62,0x5D63, 0, 0,0x3524, |
2689 | 2765 | 0, 0, 0,0x5D64, 0, 0, 0, 0, | 2766 | 0, 0, 0,0x5D64, 0, 0, 0, 0, |
2690 | @@ -2792,7 +2793,7 @@ | |||
2691 | 2792 | 0x4259,0x5D76, 0,0x314B}; | 2793 | 0x4259,0x5D76, 0,0x314B}; |
2692 | 2793 | 2794 | ||
2693 | 2794 | /* page 36 0x6D0B-0x7409 */ | 2795 | /* page 36 0x6D0B-0x7409 */ |
2695 | 2795 | static uint16 tab_uni_jisx020836[]={ | 2796 | static const uint16 tab_uni_jisx020836[]={ |
2696 | 2796 | 0x4D4E,0x5E30, 0, 0, 0, 0, 0,0x5E2F, | 2797 | 0x4D4E,0x5E30, 0, 0, 0, 0, 0,0x5E2F, |
2697 | 2797 | 0, 0, 0, 0,0x4076, 0,0x5E2C, 0, | 2798 | 0, 0, 0, 0,0x4076, 0,0x5E2C, 0, |
2698 | 2798 | 0x4D6C, 0, 0,0x4636,0x5E26, 0, 0, 0, | 2799 | 0x4D6C, 0, 0,0x4636,0x5E26, 0, 0, 0, |
2699 | @@ -3019,7 +3020,7 @@ | |||
2700 | 3019 | 0x3565, 0,0x6066,0x4D7D, 0, 0,0x4E30}; | 3020 | 0x3565, 0,0x6066,0x4D7D, 0, 0,0x4E30}; |
2701 | 3020 | 3021 | ||
2702 | 3021 | /* page 37 0x7422-0x7845 */ | 3022 | /* page 37 0x7422-0x7845 */ |
2704 | 3022 | static uint16 tab_uni_jisx020837[]={ | 3023 | static const uint16 tab_uni_jisx020837[]={ |
2705 | 3023 | 0x4276, 0, 0,0x6068, 0, 0, 0, 0, | 3024 | 0x4276, 0, 0,0x6068, 0, 0, 0, 0, |
2706 | 3024 | 0, 0, 0, 0, 0, 0, 0, 0, | 3025 | 0, 0, 0, 0, 0, 0, 0, 0, |
2707 | 3025 | 0x606A,0x4E56,0x3657,0x487C,0x474A, 0, 0, 0, | 3026 | 0x606A,0x4E56,0x3657,0x487C,0x474A, 0, 0, 0, |
2708 | @@ -3155,7 +3156,7 @@ | |||
2709 | 3155 | 0, 0, 0,0x626B}; | 3156 | 0, 0, 0,0x626B}; |
2710 | 3156 | 3157 | ||
2711 | 3157 | /* page 38 0x785D-0x7E9C */ | 3158 | /* page 38 0x785D-0x7E9C */ |
2713 | 3158 | static uint16 tab_uni_jisx020838[]={ | 3159 | static const uint16 tab_uni_jisx020838[]={ |
2714 | 3159 | 0x3E4B, 0, 0, 0, 0, 0, 0, 0, | 3160 | 0x3E4B, 0, 0, 0, 0, 0, 0, 0, |
2715 | 3160 | 0, 0, 0, 0, 0, 0,0x4E32,0x3945, | 3161 | 0, 0, 0, 0, 0, 0,0x4E32,0x3945, |
2716 | 3161 | 0, 0,0x3827, 0, 0,0x4823, 0,0x626D, | 3162 | 0, 0,0x3827, 0, 0,0x4823, 0,0x626D, |
2717 | @@ -3359,7 +3360,7 @@ | |||
2718 | 3359 | }; | 3360 | }; |
2719 | 3360 | 3361 | ||
2720 | 3361 | /* page 39 0x7F36-0x8358 */ | 3362 | /* page 39 0x7F36-0x8358 */ |
2722 | 3362 | static uint16 tab_uni_jisx020839[]={ | 3363 | static const uint16 tab_uni_jisx020839[]={ |
2723 | 3363 | 0x344C, 0,0x657D, 0,0x657E, 0, 0, 0, | 3364 | 0x344C, 0,0x657D, 0,0x657E, 0, 0, 0, |
2724 | 3364 | 0, 0, 0, 0, 0, 0, 0,0x6621, | 3365 | 0, 0, 0, 0, 0, 0, 0,0x6621, |
2725 | 3365 | 0, 0, 0, 0, 0, 0,0x6622,0x6623, | 3366 | 0, 0, 0, 0, 0, 0,0x6622,0x6623, |
2726 | @@ -3495,7 +3496,7 @@ | |||
2727 | 3495 | 0, 0,0x4171}; | 3496 | 0, 0,0x4171}; |
2728 | 3496 | 3497 | ||
2729 | 3497 | /* page 40 0x8373-0x8B9A */ | 3498 | /* page 40 0x8373-0x8B9A */ |
2731 | 3498 | static uint16 tab_uni_jisx020840[]={ | 3499 | static const uint16 tab_uni_jisx020840[]={ |
2732 | 3499 | 0x683A, 0,0x683B, 0,0x3259, 0, 0, 0, | 3500 | 0x683A, 0,0x683B, 0,0x3259, 0, 0, 0, |
2733 | 3500 | 0x322E,0x6838, 0, 0, 0, 0, 0, 0, | 3501 | 0x322E,0x6838, 0, 0, 0, 0, 0, 0, |
2734 | 3501 | 0, 0,0x682E, 0,0x6836, 0,0x683D,0x6837, | 3502 | 0, 0,0x682E, 0,0x6836, 0,0x683D,0x6837, |
2735 | @@ -3760,7 +3761,7 @@ | |||
2736 | 3760 | }; | 3761 | }; |
2737 | 3761 | 3762 | ||
2738 | 3762 | /* page 41 0x8C37-0x8D16 */ | 3763 | /* page 41 0x8C37-0x8D16 */ |
2740 | 3763 | static uint16 tab_uni_jisx020841[]={ | 3764 | static const uint16 tab_uni_jisx020841[]={ |
2741 | 3764 | 0x432B, 0, 0,0x6C2E, 0, 0, 0, 0, | 3765 | 0x432B, 0, 0,0x6C2E, 0, 0, 0, 0, |
2742 | 3765 | 0x6C30, 0,0x6C2F, 0, 0, 0, 0,0x4626, | 3766 | 0x6C30, 0,0x6C2F, 0, 0, 0, 0,0x4626, |
2743 | 3766 | 0,0x6C31, 0,0x4B2D, 0,0x6C32, 0,0x6C33, | 3767 | 0,0x6C31, 0,0x4B2D, 0,0x6C32, 0,0x6C33, |
2744 | @@ -3792,7 +3793,7 @@ | |||
2745 | 3792 | }; | 3793 | }; |
2746 | 3793 | 3794 | ||
2747 | 3794 | /* page 42 0x8D64-0x8F64 */ | 3795 | /* page 42 0x8D64-0x8F64 */ |
2749 | 3795 | static uint16 tab_uni_jisx020842[]={ | 3796 | static const uint16 tab_uni_jisx020842[]={ |
2750 | 3796 | 0x4056, 0,0x3C4F,0x6C5F, 0, 0, 0,0x3352, | 3797 | 0x4056, 0,0x3C4F,0x6C5F, 0, 0, 0,0x3352, |
2751 | 3797 | 0,0x6C60, 0, 0,0x4176,0x6C61, 0,0x6C62, | 3798 | 0,0x6C60, 0, 0,0x4176,0x6C61, 0,0x6C62, |
2752 | 3798 | 0x496B, 0, 0,0x352F, 0, 0, 0, 0, | 3799 | 0x496B, 0, 0,0x352F, 0, 0, 0, 0, |
2753 | @@ -3860,7 +3861,7 @@ | |||
2754 | 3860 | 0x6D62}; | 3861 | 0x6D62}; |
2755 | 3861 | 3862 | ||
2756 | 3862 | /* page 43 0x8F9B-0x9132 */ | 3863 | /* page 43 0x8F9B-0x9132 */ |
2758 | 3863 | static uint16 tab_uni_jisx020843[]={ | 3864 | static const uint16 tab_uni_jisx020843[]={ |
2759 | 3864 | 0x3F49,0x6D63, 0,0x3C2D,0x6D64, 0, 0, 0, | 3865 | 0x3F49,0x6D63, 0,0x3C2D,0x6D64, 0, 0, 0, |
2760 | 3865 | 0x6D65, 0, 0, 0,0x5221,0x517E, 0, 0, | 3866 | 0x6D65, 0, 0, 0,0x5221,0x517E, 0, 0, |
2761 | 3866 | 0, 0,0x6D66,0x6570,0x6D67,0x4324,0x3F2B,0x4740, | 3867 | 0, 0,0x6D66,0x6570,0x6D67,0x4324,0x3F2B,0x4740, |
2762 | @@ -3915,7 +3916,7 @@ | |||
2763 | 3915 | }; | 3916 | }; |
2764 | 3916 | 3917 | ||
2765 | 3917 | /* page 44 0x9149-0x92B9 */ | 3918 | /* page 44 0x9149-0x92B9 */ |
2767 | 3918 | static uint16 tab_uni_jisx020844[]={ | 3919 | static const uint16 tab_uni_jisx020844[]={ |
2768 | 3919 | 0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371, 0, 0, | 3920 | 0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371, 0, 0, |
2769 | 3920 | 0,0x3C72, 0,0x3F6C, 0,0x6E45, 0,0x6E46, | 3921 | 0,0x3C72, 0,0x3F6C, 0,0x6E45, 0,0x6E46, |
2770 | 3921 | 0, 0, 0, 0, 0, 0, 0, 0, | 3922 | 0, 0, 0, 0, 0, 0, 0, 0, |
2771 | @@ -3965,7 +3966,7 @@ | |||
2772 | 3965 | 0x6E78}; | 3966 | 0x6E78}; |
2773 | 3966 | 3967 | ||
2774 | 3967 | /* page 45 0x92CF-0x93E8 */ | 3968 | /* page 45 0x92CF-0x93E8 */ |
2776 | 3968 | static uint16 tab_uni_jisx020845[]={ | 3969 | static const uint16 tab_uni_jisx020845[]={ |
2777 | 3969 | 0x6E77, 0, 0,0x4B2F, 0, 0, 0, 0, | 3970 | 0x6E77, 0, 0,0x4B2F, 0, 0, 0, 0, |
2778 | 3970 | 0, 0, 0, 0, 0, 0, 0, 0, | 3971 | 0, 0, 0, 0, 0, 0, 0, 0, |
2779 | 3971 | 0, 0, 0, 0, 0,0x3D7B, 0, 0, | 3972 | 0, 0, 0, 0, 0,0x3D7B, 0, 0, |
2780 | @@ -4004,7 +4005,7 @@ | |||
2781 | 4004 | 0,0x6F34}; | 4005 | 0,0x6F34}; |
2782 | 4005 | 4006 | ||
2783 | 4006 | /* page 46 0x9403-0x9481 */ | 4007 | /* page 46 0x9403-0x9481 */ |
2785 | 4007 | static uint16 tab_uni_jisx020846[]={ | 4008 | static const uint16 tab_uni_jisx020846[]={ |
2786 | 4008 | 0x6F3F, 0, 0, 0,0x6F40, 0, 0, 0, | 4009 | 0x6F3F, 0, 0, 0,0x6F40, 0, 0, 0, |
2787 | 4009 | 0, 0, 0, 0, 0,0x6F41, 0, 0, | 4010 | 0, 0, 0, 0, 0,0x6F41, 0, 0, |
2788 | 4010 | 0x6F3E,0x6F3D, 0, 0, 0,0x3E62,0x462A,0x6F3C, | 4011 | 0x6F3E,0x6F3D, 0, 0, 0,0x3E62,0x462A,0x6F3C, |
2789 | @@ -4023,7 +4024,7 @@ | |||
2790 | 4023 | 0,0x6F55,0x6F53,0x6F56,0x6F58, 0,0x6F57}; | 4024 | 0,0x6F55,0x6F53,0x6F56,0x6F58, 0,0x6F57}; |
2791 | 4024 | 4025 | ||
2792 | 4025 | /* page 47 0x9577-0x95E5 */ | 4026 | /* page 47 0x9577-0x95E5 */ |
2794 | 4026 | static uint16 tab_uni_jisx020847[]={ | 4027 | static const uint16 tab_uni_jisx020847[]={ |
2795 | 4027 | 0x4439, 0, 0, 0, 0, 0, 0, 0, | 4028 | 0x4439, 0, 0, 0, 0, 0, 0, 0, |
2796 | 4028 | 0,0x4C67, 0,0x6F59,0x412E, 0, 0, 0, | 4029 | 0,0x4C67, 0,0x6F59,0x412E, 0, 0, 0, |
2797 | 4029 | 0x6F5A, 0,0x4A44,0x6F5B,0x332B, 0, 0, 0, | 4030 | 0x6F5A, 0,0x4A44,0x6F5B,0x332B, 0, 0, 0, |
2798 | @@ -4040,7 +4041,7 @@ | |||
2799 | 4040 | 0, 0,0x6F71,0x6F73, 0, 0,0x6F72}; | 4041 | 0, 0,0x6F71,0x6F73, 0, 0,0x6F72}; |
2800 | 4041 | 4042 | ||
2801 | 4042 | /* page 48 0x961C-0x9874 */ | 4043 | /* page 48 0x961C-0x9874 */ |
2803 | 4043 | static uint16 tab_uni_jisx020848[]={ | 4044 | static const uint16 tab_uni_jisx020848[]={ |
2804 | 4044 | 0x496C, 0, 0, 0, 0,0x6F74, 0, 0, | 4045 | 0x496C, 0, 0, 0, 0,0x6F74, 0, 0, |
2805 | 4045 | 0, 0, 0, 0,0x6F75, 0,0x3A65, 0, | 4046 | 0, 0, 0, 0,0x6F75, 0,0x3A65, 0, |
2806 | 4046 | 0, 0,0x6F76,0x6F77, 0, 0,0x4B49, 0, | 4047 | 0, 0,0x6F76,0x6F77, 0, 0,0x4B49, 0, |
2807 | @@ -4119,14 +4120,14 @@ | |||
2808 | 4119 | 0x7122}; | 4120 | 0x7122}; |
2809 | 4120 | 4121 | ||
2810 | 4121 | /* page 49 0x98A8-0x98C6 */ | 4122 | /* page 49 0x98A8-0x98C6 */ |
2812 | 4122 | static uint16 tab_uni_jisx020849[]={ | 4123 | static const uint16 tab_uni_jisx020849[]={ |
2813 | 4123 | 0x4977, 0,0x7124, 0, 0, 0, 0,0x7125, | 4124 | 0x4977, 0,0x7124, 0, 0, 0, 0,0x7125, |
2814 | 4124 | 0,0x7126, 0, 0, 0, 0,0x7127, 0, | 4125 | 0,0x7126, 0, 0, 0, 0,0x7127, 0, |
2815 | 4125 | 0, 0, 0, 0, 0, 0, 0, 0, | 4126 | 0, 0, 0, 0, 0, 0, 0, 0, |
2816 | 4126 | 0, 0, 0,0x7129,0x7128, 0,0x712A}; | 4127 | 0, 0, 0,0x7129,0x7128, 0,0x712A}; |
2817 | 4127 | 4128 | ||
2818 | 4128 | /* page 50 0x98DB-0x9957 */ | 4129 | /* page 50 0x98DB-0x9957 */ |
2820 | 4129 | static uint16 tab_uni_jisx020850[]={ | 4130 | static const uint16 tab_uni_jisx020850[]={ |
2821 | 4130 | 0x4874,0x664C, 0, 0,0x3F29, 0, 0,0x3532, | 4131 | 0x4874,0x664C, 0, 0,0x3F29, 0, 0,0x3532, |
2822 | 4131 | 0, 0, 0, 0, 0, 0,0x712B, 0, | 4132 | 0, 0, 0, 0, 0, 0,0x712B, 0, |
2823 | 4132 | 0x712C, 0,0x522C,0x5D3B,0x4853, 0, 0,0x307B, | 4133 | 0x712C, 0,0x522C,0x5D3B,0x4853, 0, 0,0x307B, |
2824 | @@ -4145,7 +4146,7 @@ | |||
2825 | 4145 | 0, 0,0x7143, 0,0x3642}; | 4146 | 0, 0,0x7143, 0,0x3642}; |
2826 | 4146 | 4147 | ||
2827 | 4147 | /* page 51 0x9996-0x9A6B */ | 4148 | /* page 51 0x9996-0x9A6B */ |
2829 | 4148 | static uint16 tab_uni_jisx020851[]={ | 4149 | static const uint16 tab_uni_jisx020851[]={ |
2830 | 4149 | 0x3C73,0x7144,0x7145,0x3961, 0, 0, 0, 0, | 4150 | 0x3C73,0x7144,0x7145,0x3961, 0, 0, 0, 0, |
2831 | 4150 | 0, 0, 0, 0, 0, 0, 0,0x7146, | 4151 | 0, 0, 0, 0, 0, 0, 0,0x7146, |
2832 | 4151 | 0, 0,0x333E, 0, 0, 0,0x474F,0x7147, | 4152 | 0, 0,0x333E, 0, 0, 0,0x474F,0x7147, |
2833 | @@ -4175,7 +4176,7 @@ | |||
2834 | 4175 | 0, 0, 0,0x7169,0x716B,0x716A}; | 4176 | 0, 0, 0,0x7169,0x716B,0x716A}; |
2835 | 4176 | 4177 | ||
2836 | 4177 | /* page 52 0x9AA8-0x9B5A */ | 4178 | /* page 52 0x9AA8-0x9B5A */ |
2838 | 4178 | static uint16 tab_uni_jisx020852[]={ | 4179 | static const uint16 tab_uni_jisx020852[]={ |
2839 | 4179 | 0x397C, 0, 0, 0, 0,0x716C, 0, 0, | 4180 | 0x397C, 0, 0, 0, 0,0x716C, 0, 0, |
2840 | 4180 | 0x716D, 0, 0, 0, 0, 0, 0, 0, | 4181 | 0x716D, 0, 0, 0, 0, 0, 0, 0, |
2841 | 4181 | 0x333C, 0, 0, 0,0x716E, 0, 0, 0, | 4182 | 0x333C, 0, 0, 0,0x716E, 0, 0, 0, |
2842 | @@ -4201,7 +4202,7 @@ | |||
2843 | 4201 | 0x7236, 0,0x357B}; | 4202 | 0x7236, 0,0x357B}; |
2844 | 4202 | 4203 | ||
2845 | 4203 | /* page 53 0x9B6F-0x9C78 */ | 4204 | /* page 53 0x9B6F-0x9C78 */ |
2847 | 4204 | static uint16 tab_uni_jisx020853[]={ | 4205 | static const uint16 tab_uni_jisx020853[]={ |
2848 | 4205 | 0x4F25, 0, 0, 0, 0,0x7237, 0, 0, | 4206 | 0x4F25, 0, 0, 0, 0,0x7237, 0, 0, |
2849 | 4206 | 0, 0, 0, 0, 0, 0, 0, 0, | 4207 | 0, 0, 0, 0, 0, 0, 0, 0, |
2850 | 4207 | 0, 0, 0, 0,0x7239, 0, 0, 0, | 4208 | 0, 0, 0, 0,0x7239, 0, 0, 0, |
2851 | @@ -4238,7 +4239,7 @@ | |||
2852 | 4238 | 0,0x7269}; | 4239 | 0,0x7269}; |
2853 | 4239 | 4240 | ||
2854 | 4240 | /* page 54 0x9CE5-0x9DFD */ | 4241 | /* page 54 0x9CE5-0x9DFD */ |
2856 | 4241 | static uint16 tab_uni_jisx020854[]={ | 4242 | static const uint16 tab_uni_jisx020854[]={ |
2857 | 4242 | 0x443B, 0,0x726A, 0,0x4837, 0,0x726F,0x726B, | 4243 | 0x443B, 0,0x726A, 0,0x4837, 0,0x726F,0x726B, |
2858 | 4243 | 0, 0, 0,0x726C, 0, 0,0x4B31,0x4C44, | 4244 | 0, 0, 0,0x726C, 0, 0,0x4B31,0x4C44, |
2859 | 4244 | 0,0x4650, 0, 0, 0, 0, 0, 0, | 4245 | 0,0x4650, 0, 0, 0, 0, 0, 0, |
2860 | @@ -4277,11 +4278,11 @@ | |||
2861 | 4277 | 0x733F}; | 4278 | 0x733F}; |
2862 | 4278 | 4279 | ||
2863 | 4279 | /* page 55 0x9E1A-0x9E1E */ | 4280 | /* page 55 0x9E1A-0x9E1E */ |
2865 | 4280 | static uint16 tab_uni_jisx020855[]={ | 4281 | static const uint16 tab_uni_jisx020855[]={ |
2866 | 4281 | 0x7340,0x7341, 0, 0,0x7342}; | 4282 | 0x7340,0x7341, 0, 0,0x7342}; |
2867 | 4282 | 4283 | ||
2868 | 4283 | /* page 56 0x9E75-0x9F77 */ | 4284 | /* page 56 0x9E75-0x9F77 */ |
2870 | 4284 | static uint16 tab_uni_jisx020856[]={ | 4285 | static const uint16 tab_uni_jisx020856[]={ |
2871 | 4285 | 0x7343, 0, 0,0x3834,0x7344, 0, 0, 0, | 4286 | 0x7343, 0, 0,0x3834,0x7344, 0, 0, 0, |
2872 | 4286 | 0x7345, 0,0x3C2F, 0,0x7346, 0, 0, 0, | 4287 | 0x7345, 0,0x3C2F, 0,0x7346, 0, 0, 0, |
2873 | 4287 | 0, 0, 0,0x7347, 0, 0,0x7348,0x7349, | 4288 | 0, 0, 0,0x7347, 0, 0,0x7348,0x7349, |
2874 | @@ -4317,13 +4318,13 @@ | |||
2875 | 4317 | 0,0x737B,0x7379}; | 4318 | 0,0x737B,0x7379}; |
2876 | 4318 | 4319 | ||
2877 | 4319 | /* page 57 0x9F8D-0x9FA0 */ | 4320 | /* page 57 0x9F8D-0x9FA0 */ |
2879 | 4320 | static uint16 tab_uni_jisx020857[]={ | 4321 | static const uint16 tab_uni_jisx020857[]={ |
2880 | 4321 | 0x4E36, 0, 0, 0, 0, 0, 0, 0, | 4322 | 0x4E36, 0, 0, 0, 0, 0, 0, 0, |
2881 | 4322 | 0x737C, 0, 0, 0, 0, 0, 0,0x737D, | 4323 | 0x737C, 0, 0, 0, 0, 0, 0,0x737D, |
2882 | 4323 | 0x6354, 0, 0,0x737E}; | 4324 | 0x6354, 0, 0,0x737E}; |
2883 | 4324 | 4325 | ||
2884 | 4325 | /* page 58 0xFF01-0xFF5E */ | 4326 | /* page 58 0xFF01-0xFF5E */ |
2886 | 4326 | static uint16 tab_uni_jisx020858[]={ | 4327 | static const uint16 tab_uni_jisx020858[]={ |
2887 | 4327 | 0x212A, 0,0x2174,0x2170,0x2173,0x2175, 0,0x214A, | 4328 | 0x212A, 0,0x2174,0x2170,0x2173,0x2175, 0,0x214A, |
2888 | 4328 | 0x214B,0x2176,0x215C,0x2124,0x215D,0x2125,0x213F,0x2330, | 4329 | 0x214B,0x2176,0x215C,0x2124,0x215D,0x2125,0x213F,0x2330, |
2889 | 4329 | 0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338, | 4330 | 0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338, |
2890 | @@ -4338,7 +4339,7 @@ | |||
2891 | 4338 | 0x2379,0x237A,0x2150,0x2143,0x2151,0x2141}; | 4339 | 0x2379,0x237A,0x2150,0x2143,0x2151,0x2141}; |
2892 | 4339 | 4340 | ||
2893 | 4340 | /* page 59 0xFFE0-0xFFE5 */ | 4341 | /* page 59 0xFFE0-0xFFE5 */ |
2895 | 4341 | static uint16 tab_uni_jisx020859[]={ | 4342 | static const uint16 tab_uni_jisx020859[]={ |
2896 | 4342 | 0x2171,0x2172,0x224C,0x2131, 0,0x216F}; | 4343 | 0x2171,0x2172,0x224C,0x2131, 0,0x216F}; |
2897 | 4343 | 4344 | ||
2898 | 4344 | static int | 4345 | static int |
2899 | @@ -4468,11 +4469,11 @@ | |||
2900 | 4468 | 4469 | ||
2901 | 4469 | 4470 | ||
2902 | 4470 | /* page 0 0x007E-0x007E */ | 4471 | /* page 0 0x007E-0x007E */ |
2904 | 4471 | static uint16 tab_uni_jisx02120[]={ | 4472 | static const uint16 tab_uni_jisx02120[]={ |
2905 | 4472 | 0}; | 4473 | 0}; |
2906 | 4473 | 4474 | ||
2907 | 4474 | /* page 1 0x00A1-0x017E */ | 4475 | /* page 1 0x00A1-0x017E */ |
2909 | 4475 | static uint16 tab_uni_jisx02121[]={ | 4476 | static const uint16 tab_uni_jisx02121[]={ |
2910 | 4476 | 0x2242, 0, 0,0x2270, 0, 0, 0, 0, | 4477 | 0x2242, 0, 0,0x2270, 0, 0, 0, 0, |
2911 | 4477 | 0x226D,0x226C, 0, 0, 0,0x226E,0x2234, 0, | 4478 | 0x226D,0x226C, 0, 0, 0,0x226E,0x2234, 0, |
2912 | 4478 | 0, 0, 0, 0, 0, 0, 0,0x2231, | 4479 | 0, 0, 0, 0, 0, 0, 0,0x2231, |
2913 | @@ -4503,28 +4504,28 @@ | |||
2914 | 4503 | 0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76}; | 4504 | 0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76}; |
2915 | 4504 | 4505 | ||
2916 | 4505 | /* page 2 0x01CD-0x01DC */ | 4506 | /* page 2 0x01CD-0x01DC */ |
2918 | 4506 | static uint16 tab_uni_jisx02122[]={ | 4507 | static const uint16 tab_uni_jisx02122[]={ |
2919 | 4507 | 0x2A26,0x2B26,0x2A43,0x2B43,0x2A55,0x2B55,0x2A67,0x2B67, | 4508 | 0x2A26,0x2B26,0x2A43,0x2B43,0x2A55,0x2B55,0x2A67,0x2B67, |
2920 | 4508 | 0x2A70,0x2B70,0x2A6D,0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E | 4509 | 0x2A70,0x2B70,0x2A6D,0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E |
2921 | 4509 | }; | 4510 | }; |
2922 | 4510 | 4511 | ||
2923 | 4511 | /* page 3 0x01F5-0x01F5 */ | 4512 | /* page 3 0x01F5-0x01F5 */ |
2925 | 4512 | static uint16 tab_uni_jisx02123[]={ | 4513 | static const uint16 tab_uni_jisx02123[]={ |
2926 | 4513 | 0x2B39}; | 4514 | 0x2B39}; |
2927 | 4514 | 4515 | ||
2928 | 4515 | /* page 4 0x02C7-0x02DD */ | 4516 | /* page 4 0x02C7-0x02DD */ |
2930 | 4516 | static uint16 tab_uni_jisx02124[]={ | 4517 | static const uint16 tab_uni_jisx02124[]={ |
2931 | 4517 | 0x2230, 0, 0, 0, 0, 0, 0, 0, | 4518 | 0x2230, 0, 0, 0, 0, 0, 0, 0, |
2932 | 4518 | 0, 0, 0, 0, 0, 0, 0, 0, | 4519 | 0, 0, 0, 0, 0, 0, 0, 0, |
2933 | 4519 | 0,0x222F,0x2232,0x2236,0x2235, 0,0x2233}; | 4520 | 0,0x222F,0x2232,0x2236,0x2235, 0,0x2233}; |
2934 | 4520 | 4521 | ||
2935 | 4521 | /* page 5 0x0384-0x0390 */ | 4522 | /* page 5 0x0384-0x0390 */ |
2937 | 4522 | static uint16 tab_uni_jisx02125[]={ | 4523 | static const uint16 tab_uni_jisx02125[]={ |
2938 | 4523 | 0x2238,0x2239,0x2661, 0,0x2662,0x2663,0x2664, 0, | 4524 | 0x2238,0x2239,0x2661, 0,0x2662,0x2663,0x2664, 0, |
2939 | 4524 | 0x2667, 0,0x2669,0x266C,0x2676}; | 4525 | 0x2667, 0,0x2669,0x266C,0x2676}; |
2940 | 4525 | 4526 | ||
2941 | 4526 | /* page 6 0x03AA-0x03CE */ | 4527 | /* page 6 0x03AA-0x03CE */ |
2943 | 4527 | static uint16 tab_uni_jisx02126[]={ | 4528 | static const uint16 tab_uni_jisx02126[]={ |
2944 | 4528 | 0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,0x267B, 0, | 4529 | 0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,0x267B, 0, |
2945 | 4529 | 0, 0, 0, 0, 0, 0, 0, 0, | 4530 | 0, 0, 0, 0, 0, 0, 0, 0, |
2946 | 4530 | 0, 0, 0, 0, 0, 0, 0, 0, | 4531 | 0, 0, 0, 0, 0, 0, 0, 0, |
2947 | @@ -4532,26 +4533,26 @@ | |||
2948 | 4532 | 0x2675,0x267A,0x2677,0x2679,0x267C}; | 4533 | 0x2675,0x267A,0x2677,0x2679,0x267C}; |
2949 | 4533 | 4534 | ||
2950 | 4534 | /* page 7 0x0402-0x040F */ | 4535 | /* page 7 0x0402-0x040F */ |
2952 | 4535 | static uint16 tab_uni_jisx02127[]={ | 4536 | static const uint16 tab_uni_jisx02127[]={ |
2953 | 4536 | 0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,0x2748,0x2749, | 4537 | 0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,0x2748,0x2749, |
2954 | 4537 | 0x274A,0x274B,0x274C, 0,0x274D,0x274E}; | 4538 | 0x274A,0x274B,0x274C, 0,0x274D,0x274E}; |
2955 | 4538 | 4539 | ||
2956 | 4539 | /* page 8 0x0452-0x045F */ | 4540 | /* page 8 0x0452-0x045F */ |
2958 | 4540 | static uint16 tab_uni_jisx02128[]={ | 4541 | static const uint16 tab_uni_jisx02128[]={ |
2959 | 4541 | 0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,0x2778,0x2779, | 4542 | 0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,0x2778,0x2779, |
2960 | 4542 | 0x277A,0x277B,0x277C, 0,0x277D,0x277E}; | 4543 | 0x277A,0x277B,0x277C, 0,0x277D,0x277E}; |
2961 | 4543 | 4544 | ||
2962 | 4544 | /* page 9 0x2122-0x2122 */ | 4545 | /* page 9 0x2122-0x2122 */ |
2964 | 4545 | static uint16 tab_uni_jisx02129[]={ | 4546 | static const uint16 tab_uni_jisx02129[]={ |
2965 | 4546 | 0x226F}; | 4547 | 0x226F}; |
2966 | 4547 | 4548 | ||
2967 | 4548 | /* page 10 0x2170-0x2179 */ | 4549 | /* page 10 0x2170-0x2179 */ |
2969 | 4549 | static uint16 tab_uni_jisx021210[]={ | 4550 | static const uint16 tab_uni_jisx021210[]={ |
2970 | 4550 | 0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,0x737A, | 4551 | 0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,0x737A, |
2971 | 4551 | 0x737B,0x737C}; | 4552 | 0x737B,0x737C}; |
2972 | 4552 | 4553 | ||
2973 | 4553 | /* page 11 0x4E02-0x4F19 */ | 4554 | /* page 11 0x4E02-0x4F19 */ |
2975 | 4554 | static uint16 tab_uni_jisx021211[]={ | 4555 | static const uint16 tab_uni_jisx021211[]={ |
2976 | 4555 | 0x3021, 0,0x3022,0x3023, 0, 0, 0, 0, | 4556 | 0x3021, 0,0x3022,0x3023, 0, 0, 0, 0, |
2977 | 4556 | 0, 0,0x3024, 0, 0, 0, 0, 0, | 4557 | 0, 0,0x3024, 0, 0, 0, 0, 0, |
2978 | 4557 | 0x3025, 0, 0, 0, 0, 0, 0, 0, | 4558 | 0x3025, 0, 0, 0, 0, 0, 0, 0, |
2979 | @@ -4590,7 +4591,7 @@ | |||
2980 | 4590 | }; | 4591 | }; |
2981 | 4591 | 4592 | ||
2982 | 4592 | /* page 12 0x4F2E-0x5166 */ | 4593 | /* page 12 0x4F2E-0x5166 */ |
2984 | 4593 | static uint16 tab_uni_jisx021212[]={ | 4594 | static const uint16 tab_uni_jisx021212[]={ |
2985 | 4594 | 0x305D, 0, 0,0x305E, 0,0x3060, 0,0x3061, | 4595 | 0x305D, 0, 0,0x305E, 0,0x3060, 0,0x3061, |
2986 | 4595 | 0,0x3062, 0,0x3063, 0,0x3064, 0, 0, | 4596 | 0,0x3062, 0,0x3063, 0,0x3064, 0, 0, |
2987 | 4596 | 0x3065, 0,0x3066, 0,0x3067, 0, 0, 0, | 4597 | 0x3065, 0,0x3066, 0,0x3067, 0, 0, 0, |
2988 | @@ -4665,7 +4666,7 @@ | |||
2989 | 4665 | 0x326E}; | 4666 | 0x326E}; |
2990 | 4666 | 4667 | ||
2991 | 4667 | /* page 13 0x517E-0x5515 */ | 4668 | /* page 13 0x517E-0x5515 */ |
2993 | 4668 | static uint16 tab_uni_jisx021213[]={ | 4669 | static const uint16 tab_uni_jisx021213[]={ |
2994 | 4669 | 0x326F, 0, 0, 0, 0,0x3270,0x3271, 0, | 4670 | 0x326F, 0, 0, 0, 0,0x3270,0x3271, 0, |
2995 | 4670 | 0, 0, 0, 0, 0,0x3272, 0, 0, | 4671 | 0, 0, 0, 0, 0,0x3272, 0, 0, |
2996 | 4671 | 0x3273, 0, 0, 0, 0, 0, 0, 0, | 4672 | 0x3273, 0, 0, 0, 0, 0, 0, 0, |
2997 | @@ -4784,7 +4785,7 @@ | |||
2998 | 4784 | }; | 4785 | }; |
2999 | 4785 | 4786 | ||
3000 | 4786 | /* page 14 0x552A-0x5566 */ | 4787 | /* page 14 0x552A-0x5566 */ |
3002 | 4787 | static uint16 tab_uni_jisx021214[]={ | 4788 | static const uint16 tab_uni_jisx021214[]={ |
3003 | 4788 | 0x354E,0x354F, 0, 0, 0, 0, 0, 0, | 4789 | 0x354E,0x354F, 0, 0, 0, 0, 0, 0, |
3004 | 4789 | 0x3550, 0, 0,0x3551,0x3552, 0, 0, 0, | 4790 | 0x3550, 0, 0,0x3551,0x3552, 0, 0, 0, |
3005 | 4790 | 0,0x3553,0x3554,0x3555, 0, 0, 0,0x3556, | 4791 | 0,0x3553,0x3554,0x3555, 0, 0, 0,0x3556, |
3006 | @@ -4795,7 +4796,7 @@ | |||
3007 | 4795 | 0, 0,0x3563, 0,0x3564}; | 4796 | 0, 0,0x3563, 0,0x3564}; |
3008 | 4796 | 4797 | ||
3009 | 4797 | /* page 15 0x557F-0x5C36 */ | 4798 | /* page 15 0x557F-0x5C36 */ |
3011 | 4798 | static uint16 tab_uni_jisx021215[]={ | 4799 | static const uint16 tab_uni_jisx021215[]={ |
3012 | 4799 | 0x3565, 0,0x3566,0x3567, 0, 0, 0,0x3568, | 4800 | 0x3565, 0,0x3566,0x3567, 0, 0, 0,0x3568, |
3013 | 4800 | 0,0x3569, 0, 0, 0, 0, 0,0x356A, | 4801 | 0,0x3569, 0, 0, 0, 0, 0,0x356A, |
3014 | 4801 | 0x356B, 0,0x356C,0x356D,0x356E,0x356F, 0, 0, | 4802 | 0x356B, 0,0x356C,0x356D,0x356E,0x356F, 0, 0, |
3015 | @@ -5014,7 +5015,7 @@ | |||
3016 | 5014 | }; | 5015 | }; |
3017 | 5015 | 5016 | ||
3018 | 5016 | /* page 16 0x5C59-0x5EEB */ | 5017 | /* page 16 0x5C59-0x5EEB */ |
3020 | 5017 | static uint16 tab_uni_jisx021216[]={ | 5018 | static const uint16 tab_uni_jisx021216[]={ |
3021 | 5018 | 0x3A77,0x3A78, 0,0x3A79, 0, 0, 0, 0, | 5019 | 0x3A77,0x3A78, 0,0x3A79, 0, 0, 0, 0, |
3022 | 5019 | 0,0x3A7A,0x3A7B, 0, 0, 0,0x3A7C,0x3A7D, | 5020 | 0,0x3A7A,0x3A7B, 0, 0, 0,0x3A7C,0x3A7D, |
3023 | 5020 | 0x3A7E, 0, 0, 0,0x3B21, 0, 0,0x3B22, | 5021 | 0x3A7E, 0, 0, 0,0x3B21, 0, 0,0x3B22, |
3024 | @@ -5100,7 +5101,7 @@ | |||
3025 | 5100 | 0, 0,0x3C5B}; | 5101 | 0, 0,0x3C5B}; |
3026 | 5101 | 5102 | ||
3027 | 5102 | /* page 17 0x5F02-0x6149 */ | 5103 | /* page 17 0x5F02-0x6149 */ |
3029 | 5103 | static uint16 tab_uni_jisx021217[]={ | 5104 | static const uint16 tab_uni_jisx021217[]={ |
3030 | 5104 | 0x3C5C, 0, 0, 0,0x3C5D,0x3C5E,0x3C5F, 0, | 5105 | 0x3C5C, 0, 0, 0,0x3C5D,0x3C5E,0x3C5F, 0, |
3031 | 5105 | 0, 0, 0, 0,0x3C60, 0, 0, 0, | 5106 | 0, 0, 0, 0,0x3C60, 0, 0, 0, |
3032 | 5106 | 0, 0, 0, 0, 0, 0, 0,0x3C61, | 5107 | 0, 0, 0, 0, 0, 0, 0,0x3C61, |
3033 | @@ -5177,7 +5178,7 @@ | |||
3034 | 5177 | }; | 5178 | }; |
3035 | 5178 | 5179 | ||
3036 | 5179 | /* page 18 0x615E-0x6290 */ | 5180 | /* page 18 0x615E-0x6290 */ |
3038 | 5180 | static uint16 tab_uni_jisx021218[]={ | 5181 | static const uint16 tab_uni_jisx021218[]={ |
3039 | 5181 | 0x3E53, 0,0x3E54, 0, 0, 0, 0, 0, | 5182 | 0x3E53, 0,0x3E54, 0, 0, 0, 0, 0, |
3040 | 5182 | 0, 0, 0, 0, 0, 0,0x3E55, 0, | 5183 | 0, 0, 0, 0, 0, 0,0x3E55, 0, |
3041 | 5183 | 0, 0, 0, 0,0x3E56, 0, 0, 0, | 5184 | 0, 0, 0, 0,0x3E56, 0, 0, 0, |
3042 | @@ -5219,7 +5220,7 @@ | |||
3043 | 5219 | 0x3F46,0x3F47,0x3F48}; | 5220 | 0x3F46,0x3F47,0x3F48}; |
3044 | 5220 | 5221 | ||
3045 | 5221 | /* page 19 0x62A6-0x679B */ | 5222 | /* page 19 0x62A6-0x679B */ |
3047 | 5222 | static uint16 tab_uni_jisx021219[]={ | 5223 | static const uint16 tab_uni_jisx021219[]={ |
3048 | 5223 | 0x3F49, 0,0x3F4A, 0, 0, 0, 0, 0, | 5224 | 0x3F49, 0,0x3F4A, 0, 0, 0, 0, 0, |
3049 | 5224 | 0, 0, 0, 0, 0,0x3F4B, 0, 0, | 5225 | 0, 0, 0, 0, 0,0x3F4B, 0, 0, |
3050 | 5225 | 0x3F4C,0x3F4D, 0, 0,0x3F4E, 0, 0, 0, | 5226 | 0x3F4C,0x3F4D, 0, 0,0x3F4E, 0, 0, 0, |
3051 | @@ -5381,7 +5382,7 @@ | |||
3052 | 5381 | 0x432D, 0,0x432E,0x432F, 0,0x4330}; | 5382 | 0x432D, 0,0x432E,0x432F, 0,0x4330}; |
3053 | 5382 | 5383 | ||
3054 | 5383 | /* page 20 0x67B0-0x6801 */ | 5384 | /* page 20 0x67B0-0x6801 */ |
3056 | 5384 | static uint16 tab_uni_jisx021220[]={ | 5385 | static const uint16 tab_uni_jisx021220[]={ |
3057 | 5385 | 0x4331,0x4332,0x4333, 0, 0,0x4334, 0, 0, | 5386 | 0x4331,0x4332,0x4333, 0, 0,0x4334, 0, 0, |
3058 | 5386 | 0, 0, 0,0x4335,0x4336,0x4337, 0, 0, | 5387 | 0, 0, 0,0x4335,0x4336,0x4337, 0, 0, |
3059 | 5387 | 0x4339, 0,0x433A,0x433B, 0,0x433C, 0, 0, | 5388 | 0x4339, 0,0x433A,0x433B, 0,0x433C, 0, 0, |
3060 | @@ -5395,7 +5396,7 @@ | |||
3061 | 5395 | 0,0x7446}; | 5396 | 0,0x7446}; |
3062 | 5396 | 5397 | ||
3063 | 5397 | /* page 21 0x6814-0x6917 */ | 5398 | /* page 21 0x6814-0x6917 */ |
3065 | 5398 | static uint16 tab_uni_jisx021221[]={ | 5399 | static const uint16 tab_uni_jisx021221[]={ |
3066 | 5399 | 0x434A, 0, 0, 0, 0,0x434B, 0, 0, | 5400 | 0x434A, 0, 0, 0, 0,0x434B, 0, 0, |
3067 | 5400 | 0,0x434C, 0,0x434D, 0, 0, 0, 0, | 5401 | 0,0x434C, 0,0x434D, 0, 0, 0, 0, |
3068 | 5401 | 0, 0, 0,0x434F,0x434E, 0, 0, 0, | 5402 | 0, 0, 0,0x434F,0x434E, 0, 0, 0, |
3069 | @@ -5431,7 +5432,7 @@ | |||
3070 | 5431 | 0, 0,0x443B,0x443C}; | 5432 | 0, 0,0x443B,0x443C}; |
3071 | 5432 | 5433 | ||
3072 | 5433 | /* page 22 0x6931-0x6D3F */ | 5434 | /* page 22 0x6931-0x6D3F */ |
3074 | 5434 | static uint16 tab_uni_jisx021222[]={ | 5435 | static const uint16 tab_uni_jisx021222[]={ |
3075 | 5435 | 0x443D, 0,0x443E, 0,0x443F, 0, 0,0x4440, | 5436 | 0x443D, 0,0x443E, 0,0x443F, 0, 0,0x4440, |
3076 | 5436 | 0, 0,0x4441, 0, 0, 0, 0, 0, | 5437 | 0, 0,0x4441, 0, 0, 0, 0, 0, |
3077 | 5437 | 0,0x4442, 0, 0,0x4443, 0, 0, 0, | 5438 | 0,0x4442, 0, 0,0x4443, 0, 0, 0, |
3078 | @@ -5564,7 +5565,7 @@ | |||
3079 | 5564 | 0x473A, 0, 0,0x473B, 0, 0,0x473C}; | 5565 | 0x473A, 0, 0,0x473B, 0, 0,0x473C}; |
3080 | 5565 | 5566 | ||
3081 | 5566 | /* page 23 0x6D57-0x6E04 */ | 5567 | /* page 23 0x6D57-0x6E04 */ |
3083 | 5567 | static uint16 tab_uni_jisx021223[]={ | 5568 | static const uint16 tab_uni_jisx021223[]={ |
3084 | 5568 | 0x473D, 0, 0, 0, 0, 0, 0,0x473E, | 5569 | 0x473D, 0, 0, 0, 0, 0, 0,0x473E, |
3085 | 5569 | 0x473F, 0,0x4740, 0, 0, 0,0x4741, 0, | 5570 | 0x473F, 0,0x4740, 0, 0, 0,0x4741, 0, |
3086 | 5570 | 0x4742, 0, 0, 0, 0, 0, 0, 0, | 5571 | 0x4742, 0, 0, 0, 0, 0, 0, 0, |
3087 | @@ -5589,7 +5590,7 @@ | |||
3088 | 5589 | 0,0x4767, 0, 0, 0,0x4768}; | 5590 | 0,0x4767, 0, 0, 0,0x4768}; |
3089 | 5590 | 5591 | ||
3090 | 5591 | /* page 24 0x6E1E-0x6ECF */ | 5592 | /* page 24 0x6E1E-0x6ECF */ |
3092 | 5592 | static uint16 tab_uni_jisx021224[]={ | 5593 | static const uint16 tab_uni_jisx021224[]={ |
3093 | 5593 | 0x4769, 0, 0, 0,0x476A, 0, 0, 0, | 5594 | 0x4769, 0, 0, 0,0x476A, 0, 0, 0, |
3094 | 5594 | 0,0x476B, 0, 0, 0, 0, 0, 0, | 5595 | 0,0x476B, 0, 0, 0, 0, 0, 0, |
3095 | 5595 | 0, 0, 0, 0,0x476C, 0, 0, 0, | 5596 | 0, 0, 0, 0,0x476C, 0, 0, 0, |
3096 | @@ -5615,7 +5616,7 @@ | |||
3097 | 5615 | 0x4839,0x483A}; | 5616 | 0x4839,0x483A}; |
3098 | 5616 | 5617 | ||
3099 | 5617 | /* page 25 0x6EEB-0x70E4 */ | 5618 | /* page 25 0x6EEB-0x70E4 */ |
3101 | 5618 | static uint16 tab_uni_jisx021225[]={ | 5619 | static const uint16 tab_uni_jisx021225[]={ |
3102 | 5619 | 0x483B, 0,0x483C,0x483D, 0, 0, 0, 0, | 5620 | 0x483B, 0,0x483C,0x483D, 0, 0, 0, 0, |
3103 | 5620 | 0, 0, 0, 0, 0, 0,0x483E, 0, | 5621 | 0, 0, 0, 0, 0, 0,0x483E, 0, |
3104 | 5621 | 0x483F, 0,0x4840, 0, 0, 0, 0, 0, | 5622 | 0x483F, 0,0x4840, 0, 0, 0, 0, 0, |
3105 | @@ -5682,7 +5683,7 @@ | |||
3106 | 5682 | 0,0x4960}; | 5683 | 0,0x4960}; |
3107 | 5683 | 5684 | ||
3108 | 5684 | /* page 26 0x70FA-0x71DC */ | 5685 | /* page 26 0x70FA-0x71DC */ |
3110 | 5685 | static uint16 tab_uni_jisx021226[]={ | 5686 | static const uint16 tab_uni_jisx021226[]={ |
3111 | 5686 | 0x4961, 0, 0, 0, 0, 0, 0, 0, | 5687 | 0x4961, 0, 0, 0, 0, 0, 0, 0, |
3112 | 5687 | 0,0x4962,0x4963,0x4964,0x4965,0x4966, 0, 0, | 5688 | 0,0x4962,0x4963,0x4964,0x4965,0x4966, 0, 0, |
3113 | 5688 | 0,0x4967,0x4968, 0, 0,0x4969, 0, 0, | 5689 | 0,0x4967,0x4968, 0, 0,0x4969, 0, 0, |
3114 | @@ -5714,7 +5715,7 @@ | |||
3115 | 5714 | 0x4A3A, 0,0x4A3B}; | 5715 | 0x4A3A, 0,0x4A3B}; |
3116 | 5715 | 5716 | ||
3117 | 5716 | /* page 27 0x71F8-0x7E9E */ | 5717 | /* page 27 0x71F8-0x7E9E */ |
3119 | 5717 | static uint16 tab_uni_jisx021227[]={ | 5718 | static const uint16 tab_uni_jisx021227[]={ |
3120 | 5718 | 0x4A3C, 0, 0, 0, 0, 0,0x4A3D, 0, | 5719 | 0x4A3C, 0, 0, 0, 0, 0,0x4A3D, 0, |
3121 | 5719 | 0x4A3E, 0, 0, 0, 0, 0, 0,0x4A3F, | 5720 | 0x4A3E, 0, 0, 0, 0, 0, 0,0x4A3F, |
3122 | 5720 | 0x4A40,0x4A41, 0, 0, 0, 0, 0, 0, | 5721 | 0x4A40,0x4A41, 0, 0, 0, 0, 0, 0, |
3123 | @@ -6122,7 +6123,7 @@ | |||
3124 | 6122 | 0x5467, 0,0x5468, 0, 0,0x5469,0x546A}; | 6123 | 0x5467, 0,0x5468, 0, 0,0x5469,0x546A}; |
3125 | 6123 | 6124 | ||
3126 | 6124 | /* page 28 0x7F3B-0x8044 */ | 6125 | /* page 28 0x7F3B-0x8044 */ |
3128 | 6125 | static uint16 tab_uni_jisx021228[]={ | 6126 | static const uint16 tab_uni_jisx021228[]={ |
3129 | 6126 | 0x546C,0x546B,0x546D,0x546E,0x546F, 0, 0, 0, | 6127 | 0x546C,0x546B,0x546D,0x546E,0x546F, 0, 0, 0, |
3130 | 6127 | 0x5470,0x5471, 0, 0,0x5472, 0, 0, 0, | 6128 | 0x5470,0x5471, 0, 0,0x5472, 0, 0, 0, |
3131 | 6128 | 0, 0, 0, 0,0x5473, 0, 0,0x5474, | 6129 | 0, 0, 0, 0,0x5473, 0, 0,0x5474, |
3132 | @@ -6159,7 +6160,7 @@ | |||
3133 | 6159 | 0,0x5563}; | 6160 | 0,0x5563}; |
3134 | 6160 | 6161 | ||
3135 | 6161 | /* page 29 0x8060-0x8362 */ | 6162 | /* page 29 0x8060-0x8362 */ |
3137 | 6162 | static uint16 tab_uni_jisx021229[]={ | 6163 | static const uint16 tab_uni_jisx021229[]={ |
3138 | 6163 | 0x5564, 0, 0, 0,0x5565, 0,0x5566, 0, | 6164 | 0x5564, 0, 0, 0,0x5565, 0,0x5566, 0, |
3139 | 6164 | 0, 0, 0, 0, 0,0x5567, 0, 0, | 6165 | 0, 0, 0, 0, 0,0x5567, 0, 0, |
3140 | 6165 | 0,0x5568, 0, 0, 0,0x5569, 0, 0, | 6166 | 0,0x5568, 0, 0, 0,0x5569, 0, 0, |
3141 | @@ -6259,7 +6260,7 @@ | |||
3142 | 6259 | 0, 0,0x745F}; | 6260 | 0, 0,0x745F}; |
3143 | 6260 | 6261 | ||
3144 | 6261 | /* page 30 0x8370-0x8419 */ | 6262 | /* page 30 0x8370-0x8419 */ |
3146 | 6262 | static uint16 tab_uni_jisx021230[]={ | 6263 | static const uint16 tab_uni_jisx021230[]={ |
3147 | 6263 | 0x577D, 0, 0, 0, 0, 0, 0, 0, | 6264 | 0x577D, 0, 0, 0, 0, 0, 0, 0, |
3148 | 6264 | 0x577E, 0, 0, 0, 0,0x5821, 0,0x5822, | 6265 | 0x577E, 0, 0, 0, 0,0x5821, 0,0x5822, |
3149 | 6265 | 0x5823, 0,0x5824, 0,0x5825, 0,0x5826, 0, | 6266 | 0x5823, 0,0x5824, 0,0x5825, 0,0x5826, 0, |
3150 | @@ -6284,7 +6285,7 @@ | |||
3151 | 6284 | 0,0x584B}; | 6285 | 0,0x584B}; |
3152 | 6285 | 6286 | ||
3153 | 6286 | /* page 31 0x842F-0x8880 */ | 6287 | /* page 31 0x842F-0x8880 */ |
3155 | 6287 | static uint16 tab_uni_jisx021231[]={ | 6288 | static const uint16 tab_uni_jisx021231[]={ |
3156 | 6288 | 0x584D, 0, 0, 0, 0, 0, 0, 0, | 6289 | 0x584D, 0, 0, 0, 0, 0, 0, 0, |
3157 | 6289 | 0, 0,0x584E, 0, 0, 0, 0, 0, | 6290 | 0, 0,0x584E, 0, 0, 0, 0, 0, |
3158 | 6290 | 0, 0, 0, 0, 0, 0,0x584F, 0, | 6291 | 0, 0, 0, 0, 0, 0,0x584F, 0, |
3159 | @@ -6426,7 +6427,7 @@ | |||
3160 | 6426 | 0,0x5C38}; | 6427 | 0,0x5C38}; |
3161 | 6427 | 6428 | ||
3162 | 6428 | /* page 32 0x8898-0x89BC */ | 6429 | /* page 32 0x8898-0x89BC */ |
3164 | 6429 | static uint16 tab_uni_jisx021232[]={ | 6430 | static const uint16 tab_uni_jisx021232[]={ |
3165 | 6430 | 0x5C39, 0,0x5C3A,0x5C3B,0x5C3C, 0, 0,0x5C3D, | 6431 | 0x5C39, 0,0x5C3A,0x5C3B,0x5C3C, 0, 0,0x5C3D, |
3166 | 6431 | 0x5C3E, 0, 0, 0, 0, 0, 0, 0, | 6432 | 0x5C3E, 0, 0, 0, 0, 0, 0, 0, |
3167 | 6432 | 0x5C3F, 0,0x5C40, 0, 0, 0, 0, 0, | 6433 | 0x5C3F, 0,0x5C40, 0, 0, 0, 0, 0, |
3168 | @@ -6466,7 +6467,7 @@ | |||
3169 | 6466 | 0, 0, 0, 0,0x5D33}; | 6467 | 0, 0, 0, 0,0x5D33}; |
3170 | 6467 | 6468 | ||
3171 | 6468 | /* page 33 0x89D4-0x8B9F */ | 6469 | /* page 33 0x89D4-0x8B9F */ |
3173 | 6469 | static uint16 tab_uni_jisx021233[]={ | 6470 | static const uint16 tab_uni_jisx021233[]={ |
3174 | 6470 | 0x5D34,0x5D35,0x5D36,0x5D37,0x5D38, 0, 0, 0, | 6471 | 0x5D34,0x5D35,0x5D36,0x5D37,0x5D38, 0, 0, 0, |
3175 | 6471 | 0, 0, 0, 0, 0, 0, 0, 0, | 6472 | 0, 0, 0, 0, 0, 0, 0, 0, |
3176 | 6472 | 0,0x5D39, 0, 0, 0,0x5D3A, 0,0x5D3B, | 6473 | 0,0x5D39, 0, 0, 0,0x5D3A, 0,0x5D3B, |
3177 | @@ -6527,7 +6528,7 @@ | |||
3178 | 6527 | 0x5E5F, 0,0x5E60,0x5E61}; | 6528 | 0x5E5F, 0,0x5E60,0x5E61}; |
3179 | 6528 | 6529 | ||
3180 | 6529 | /* page 34 0x8C38-0x8CA4 */ | 6530 | /* page 34 0x8C38-0x8CA4 */ |
3182 | 6530 | static uint16 tab_uni_jisx021234[]={ | 6531 | static const uint16 tab_uni_jisx021234[]={ |
3183 | 6531 | 0x5E62,0x5E63, 0, 0, 0,0x5E64,0x5E65, 0, | 6532 | 0x5E62,0x5E63, 0, 0, 0,0x5E64,0x5E65, 0, |
3184 | 6532 | 0, 0, 0, 0, 0,0x5E66, 0,0x5E67, | 6533 | 0, 0, 0, 0, 0,0x5E66, 0,0x5E67, |
3185 | 6533 | 0,0x5E68, 0,0x5E69, 0, 0, 0,0x5E6A, | 6534 | 0,0x5E68, 0,0x5E69, 0, 0, 0,0x5E6A, |
3186 | @@ -6544,7 +6545,7 @@ | |||
3187 | 6544 | 0, 0, 0, 0,0x5F29}; | 6545 | 0, 0, 0, 0,0x5F29}; |
3188 | 6545 | 6546 | ||
3189 | 6546 | /* page 35 0x8CB9-0x8D1B */ | 6547 | /* page 35 0x8CB9-0x8D1B */ |
3191 | 6547 | static uint16 tab_uni_jisx021235[]={ | 6548 | static const uint16 tab_uni_jisx021235[]={ |
3192 | 6548 | 0x5F2A,0x5F2B, 0, 0, 0, 0, 0, 0, | 6549 | 0x5F2A,0x5F2B, 0, 0, 0, 0, 0, 0, |
3193 | 6549 | 0, 0, 0, 0,0x5F2C,0x5F2D, 0, 0, | 6550 | 0, 0, 0, 0,0x5F2C,0x5F2D, 0, 0, |
3194 | 6550 | 0x5F2E, 0,0x5F2F, 0, 0, 0,0x5F30, 0, | 6551 | 0x5F2E, 0,0x5F2F, 0, 0, 0,0x5F30, 0, |
3195 | @@ -6560,7 +6561,7 @@ | |||
3196 | 6560 | 0, 0,0x5F45}; | 6561 | 0, 0,0x5F45}; |
3197 | 6561 | 6562 | ||
3198 | 6562 | /* page 36 0x8D65-0x8F65 */ | 6563 | /* page 36 0x8D65-0x8F65 */ |
3200 | 6563 | static uint16 tab_uni_jisx021236[]={ | 6564 | static const uint16 tab_uni_jisx021236[]={ |
3201 | 6564 | 0x5F46, 0, 0, 0,0x5F47, 0, 0,0x5F48, | 6565 | 0x5F46, 0, 0, 0,0x5F47, 0, 0,0x5F48, |
3202 | 6565 | 0,0x5F49, 0, 0, 0, 0, 0, 0, | 6566 | 0,0x5F49, 0, 0, 0, 0, 0, 0, |
3203 | 6566 | 0,0x7468, 0, 0, 0, 0, 0, 0, | 6567 | 0,0x7468, 0, 0, 0, 0, 0, 0, |
3204 | @@ -6628,7 +6629,7 @@ | |||
3205 | 6628 | 0x612C}; | 6629 | 0x612C}; |
3206 | 6629 | 6630 | ||
3207 | 6630 | /* page 37 0x8F9D-0x9484 */ | 6631 | /* page 37 0x8F9D-0x9484 */ |
3209 | 6631 | static uint16 tab_uni_jisx021237[]={ | 6632 | static const uint16 tab_uni_jisx021237[]={ |
3210 | 6632 | 0x612D, 0, 0,0x612E,0x612F, 0, 0,0x6130, | 6633 | 0x612D, 0, 0,0x612E,0x612F, 0, 0,0x6130, |
3211 | 6633 | 0x6131,0x6132, 0, 0, 0, 0, 0, 0, | 6634 | 0x6131,0x6132, 0, 0, 0, 0, 0, 0, |
3212 | 6634 | 0, 0, 0, 0, 0, 0, 0, 0, | 6635 | 0, 0, 0, 0, 0, 0, 0, 0, |
3213 | @@ -6789,7 +6790,7 @@ | |||
3214 | 6789 | }; | 6790 | }; |
3215 | 6790 | 6791 | ||
3216 | 6791 | /* page 38 0x9578-0x95E6 */ | 6792 | /* page 38 0x9578-0x95E6 */ |
3218 | 6792 | static uint16 tab_uni_jisx021238[]={ | 6793 | static const uint16 tab_uni_jisx021238[]={ |
3219 | 6793 | 0x657D,0x657E, 0, 0, 0, 0,0x6621, 0, | 6794 | 0x657D,0x657E, 0, 0, 0, 0,0x6621, 0, |
3220 | 6794 | 0, 0, 0, 0,0x6622, 0, 0, 0, | 6795 | 0, 0, 0, 0,0x6622, 0, 0, 0, |
3221 | 6795 | 0x6623, 0, 0, 0,0x6624,0x6625,0x6626, 0, | 6796 | 0x6623, 0, 0, 0,0x6624,0x6625,0x6626, 0, |
3222 | @@ -6806,7 +6807,7 @@ | |||
3223 | 6806 | 0x6641, 0, 0, 0,0x6642, 0,0x6643}; | 6807 | 0x6641, 0, 0, 0,0x6642, 0,0x6643}; |
3224 | 6807 | 6808 | ||
3225 | 6808 | /* page 39 0x961D-0x986C */ | 6809 | /* page 39 0x961D-0x986C */ |
3227 | 6809 | static uint16 tab_uni_jisx021239[]={ | 6810 | static const uint16 tab_uni_jisx021239[]={ |
3228 | 6810 | 0x6644,0x6645, 0, 0, 0,0x6646, 0,0x6647, | 6811 | 0x6644,0x6645, 0, 0, 0,0x6646, 0,0x6647, |
3229 | 6811 | 0x6648,0x6649, 0, 0, 0, 0, 0,0x664A, | 6812 | 0x6648,0x6649, 0, 0, 0, 0, 0,0x664A, |
3230 | 6812 | 0, 0, 0, 0,0x664B, 0,0x664C, 0, | 6813 | 0, 0, 0, 0,0x664B, 0,0x664C, 0, |
3231 | @@ -6884,7 +6885,7 @@ | |||
3232 | 6884 | }; | 6885 | }; |
3233 | 6885 | 6886 | ||
3234 | 6886 | /* page 40 0x98AB-0x98CC */ | 6887 | /* page 40 0x98AB-0x98CC */ |
3236 | 6887 | static uint16 tab_uni_jisx021240[]={ | 6888 | static const uint16 tab_uni_jisx021240[]={ |
3237 | 6888 | 0x683A, 0,0x683B,0x683C, 0,0x683D, 0, 0, | 6889 | 0x683A, 0,0x683B,0x683C, 0,0x683D, 0, 0, |
3238 | 6889 | 0,0x683E, 0, 0,0x683F,0x6840, 0,0x6841, | 6890 | 0,0x683E, 0, 0,0x683F,0x6840, 0,0x6841, |
3239 | 6890 | 0x6842, 0, 0, 0,0x6843, 0, 0,0x6844, | 6891 | 0x6842, 0, 0, 0,0x6843, 0, 0,0x6844, |
3240 | @@ -6892,7 +6893,7 @@ | |||
3241 | 6892 | 0,0x6847}; | 6893 | 0,0x6847}; |
3242 | 6893 | 6894 | ||
3243 | 6894 | /* page 41 0x98E1-0x9960 */ | 6895 | /* page 41 0x98E1-0x9960 */ |
3245 | 6895 | static uint16 tab_uni_jisx021241[]={ | 6896 | static const uint16 tab_uni_jisx021241[]={ |
3246 | 6896 | 0x6848, 0,0x6849, 0,0x684A,0x684B,0x684C, 0, | 6897 | 0x6848, 0,0x6849, 0,0x684A,0x684B,0x684C, 0, |
3247 | 6897 | 0,0x684D, 0, 0, 0, 0, 0, 0, | 6898 | 0,0x684D, 0, 0, 0, 0, 0, 0, |
3248 | 6898 | 0, 0,0x684E, 0, 0,0x684F, 0, 0, | 6899 | 0, 0,0x684E, 0, 0,0x684F, 0, 0, |
3249 | @@ -6912,7 +6913,7 @@ | |||
3250 | 6912 | }; | 6913 | }; |
3251 | 6913 | 6914 | ||
3252 | 6914 | /* page 42 0x999B-0x9A5D */ | 6915 | /* page 42 0x999B-0x9A5D */ |
3254 | 6915 | static uint16 tab_uni_jisx021242[]={ | 6916 | static const uint16 tab_uni_jisx021242[]={ |
3255 | 6916 | 0x6877, 0,0x6878,0x747A,0x6879, 0, 0, 0, | 6917 | 0x6877, 0,0x6878,0x747A,0x6879, 0, 0, 0, |
3256 | 6917 | 0, 0, 0,0x687A, 0, 0, 0, 0, | 6918 | 0, 0, 0,0x687A, 0, 0, 0, 0, |
3257 | 6918 | 0, 0, 0, 0, 0,0x687B,0x687C,0x687D, | 6919 | 0, 0, 0, 0, 0,0x687B,0x687C,0x687D, |
3258 | @@ -6940,7 +6941,7 @@ | |||
3259 | 6940 | 0, 0,0x6955}; | 6941 | 0, 0,0x6955}; |
3260 | 6941 | 6942 | ||
3261 | 6942 | /* page 43 0x9AAA-0x9C7B */ | 6943 | /* page 43 0x9AAA-0x9C7B */ |
3263 | 6943 | static uint16 tab_uni_jisx021243[]={ | 6944 | static const uint16 tab_uni_jisx021243[]={ |
3264 | 6944 | 0x6956, 0,0x6957, 0,0x6958,0x6959, 0, 0, | 6945 | 0x6956, 0,0x6957, 0,0x6958,0x6959, 0, 0, |
3265 | 6945 | 0x695A, 0,0x695B,0x695C,0x695D, 0, 0,0x695E, | 6946 | 0x695A, 0,0x695B,0x695C,0x695D, 0, 0,0x695E, |
3266 | 6946 | 0,0x695F, 0, 0,0x6960,0x6961, 0,0x6962, | 6947 | 0,0x695F, 0, 0,0x6960,0x6961, 0,0x6962, |
3267 | @@ -7002,7 +7003,7 @@ | |||
3268 | 7002 | 0,0x6B58}; | 7003 | 0,0x6B58}; |
3269 | 7003 | 7004 | ||
3270 | 7004 | /* page 44 0x9CE6-0x9E1D */ | 7005 | /* page 44 0x9CE6-0x9E1D */ |
3272 | 7005 | static uint16 tab_uni_jisx021244[]={ | 7006 | static const uint16 tab_uni_jisx021244[]={ |
3273 | 7006 | 0x6B59, 0, 0, 0, 0, 0, 0, 0, | 7007 | 0x6B59, 0, 0, 0, 0, 0, 0, 0, |
3274 | 7007 | 0, 0, 0, 0,0x6B5A, 0, 0, 0, | 7008 | 0, 0, 0, 0,0x6B5A, 0, 0, 0, |
3275 | 7008 | 0,0x6B5B, 0,0x6B5C, 0, 0, 0, 0, | 7009 | 0,0x6B5B, 0,0x6B5C, 0, 0, 0, 0, |
3276 | @@ -7045,7 +7046,7 @@ | |||
3277 | 7045 | }; | 7046 | }; |
3278 | 7046 | 7047 | ||
3279 | 7047 | /* page 45 0x9E7A-0x9FA5 */ | 7048 | /* page 45 0x9E7A-0x9FA5 */ |
3281 | 7048 | static uint16 tab_uni_jisx021245[]={ | 7049 | static const uint16 tab_uni_jisx021245[]={ |
3282 | 7049 | 0x6C59,0x6C5A,0x6C5B, 0, 0, 0,0x6C5C, 0, | 7050 | 0x6C59,0x6C5A,0x6C5B, 0, 0, 0,0x6C5C, 0, |
3283 | 7050 | 0x6C5D,0x6C5E,0x6C5F,0x6C60, 0,0x6C61, 0, 0, | 7051 | 0x6C5D,0x6C5E,0x6C5F,0x6C60, 0,0x6C61, 0, 0, |
3284 | 7051 | 0, 0, 0, 0,0x6C62,0x6C63, 0, 0, | 7052 | 0, 0, 0, 0,0x6C62,0x6C63, 0, 0, |
3285 | @@ -7086,15 +7087,15 @@ | |||
3286 | 7086 | 0x6D61,0x6D62, 0,0x6D63}; | 7087 | 0x6D61,0x6D62, 0,0x6D63}; |
3287 | 7087 | 7088 | ||
3288 | 7088 | /* page 46 0xF929-0xF929 */ | 7089 | /* page 46 0xF929-0xF929 */ |
3290 | 7089 | static uint16 tab_uni_jisx021246[]={ | 7090 | static const uint16 tab_uni_jisx021246[]={ |
3291 | 7090 | 0x7445}; | 7091 | 0x7445}; |
3292 | 7091 | 7092 | ||
3293 | 7092 | /* page 47 0xF9DC-0xF9DC */ | 7093 | /* page 47 0xF9DC-0xF9DC */ |
3295 | 7093 | static uint16 tab_uni_jisx021247[]={ | 7094 | static const uint16 tab_uni_jisx021247[]={ |
3296 | 7094 | 0x7472}; | 7095 | 0x7472}; |
3297 | 7095 | 7096 | ||
3298 | 7096 | /* page 48 0xFA00-0xFA2D */ | 7097 | /* page 48 0xFA00-0xFA2D */ |
3300 | 7097 | static uint16 tab_uni_jisx021248[]={ | 7098 | static const uint16 tab_uni_jisx021248[]={ |
3301 | 7098 | 0, 0, 0, 0, 0, 0, 0, 0, | 7099 | 0, 0, 0, 0, 0, 0, 0, 0, |
3302 | 7099 | 0, 0, 0, 0, 0, 0,0x7434,0x7437, | 7100 | 0, 0, 0, 0, 0, 0,0x7434,0x7437, |
3303 | 7100 | 0x7438,0x743D,0x7444,0x7447,0x7448,0x744E,0x744F,0x7453, | 7101 | 0x7438,0x743D,0x7444,0x7447,0x7448,0x744E,0x744F,0x7453, |
3304 | @@ -7103,11 +7104,11 @@ | |||
3305 | 7103 | 0x7470,0x7473,0x7477,0x7478,0x7479,0x747D}; | 7104 | 0x7470,0x7473,0x7477,0x7478,0x7479,0x747D}; |
3306 | 7104 | 7105 | ||
3307 | 7105 | /* page 49 0xFF00-0XFF07 */ | 7106 | /* page 49 0xFF00-0XFF07 */ |
3309 | 7106 | static uint16 tab_uni_jisx021249[]={ | 7107 | static const uint16 tab_uni_jisx021249[]={ |
3310 | 7107 | 0, 0,0x742A, 0, 0, 0, 0,0x7429}; | 7108 | 0, 0,0x742A, 0, 0, 0, 0,0x7429}; |
3311 | 7108 | 7109 | ||
3312 | 7109 | /* page 50 0xFFE4-0xFFE4 */ | 7110 | /* page 50 0xFFE4-0xFFE4 */ |
3314 | 7110 | static uint16 tab_uni_jisx021250[]={ | 7111 | static const uint16 tab_uni_jisx021250[]={ |
3315 | 7111 | 0x2243}; | 7112 | 0x2243}; |
3316 | 7112 | 7113 | ||
3317 | 7113 | static int | 7114 | static int |
3318 | @@ -7218,34 +7219,34 @@ | |||
3319 | 7218 | } | 7219 | } |
3320 | 7219 | 7220 | ||
3321 | 7220 | /* page 0 0x222F-0x2244 */ | 7221 | /* page 0 0x222F-0x2244 */ |
3323 | 7221 | static uint16 tab_jisx0212_uni0[]={ | 7222 | static const uint16 tab_jisx0212_uni0[]={ |
3324 | 7222 | 0x02D8,0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA, | 7223 | 0x02D8,0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA, |
3325 | 7223 | 0xFF5E,0x0384,0x0385, 0, 0, 0, 0, 0, | 7224 | 0xFF5E,0x0384,0x0385, 0, 0, 0, 0, 0, |
3326 | 7224 | 0, 0, 0,0x00A1,0xFFE4,0x00BF}; | 7225 | 0, 0, 0,0x00A1,0xFFE4,0x00BF}; |
3327 | 7225 | 7226 | ||
3328 | 7226 | /* page 1 0x226B-0x2271 */ | 7227 | /* page 1 0x226B-0x2271 */ |
3330 | 7227 | static uint16 tab_jisx0212_uni1[]={ | 7228 | static const uint16 tab_jisx0212_uni1[]={ |
3331 | 7228 | 0x00BA,0x00AA,0x00A9,0x00AE,0x2122,0x00A4,0x2116}; | 7229 | 0x00BA,0x00AA,0x00A9,0x00AE,0x2122,0x00A4,0x2116}; |
3332 | 7229 | 7230 | ||
3333 | 7230 | /* page 2 0x2661-0x267C */ | 7231 | /* page 2 0x2661-0x267C */ |
3335 | 7231 | static uint16 tab_jisx0212_uni2[]={ | 7232 | static const uint16 tab_jisx0212_uni2[]={ |
3336 | 7232 | 0x0386,0x0388,0x0389,0x038A,0x03AA, 0,0x038C, 0, | 7233 | 0x0386,0x0388,0x0389,0x038A,0x03AA, 0,0x038C, 0, |
3337 | 7233 | 0x038E,0x03AB, 0,0x038F, 0, 0, 0, 0, | 7234 | 0x038E,0x03AB, 0,0x038F, 0, 0, 0, 0, |
3338 | 7234 | 0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,0x03C2, | 7235 | 0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,0x03C2, |
3339 | 7235 | 0x03CD,0x03CB,0x03B0,0x03CE}; | 7236 | 0x03CD,0x03CB,0x03B0,0x03CE}; |
3340 | 7236 | 7237 | ||
3341 | 7237 | /* page 3 0x2742-0x274E */ | 7238 | /* page 3 0x2742-0x274E */ |
3343 | 7238 | static uint16 tab_jisx0212_uni3[]={ | 7239 | static const uint16 tab_jisx0212_uni3[]={ |
3344 | 7239 | 0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409, | 7240 | 0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409, |
3345 | 7240 | 0x040A,0x040B,0x040C,0x040E,0x040F}; | 7241 | 0x040A,0x040B,0x040C,0x040E,0x040F}; |
3346 | 7241 | 7242 | ||
3347 | 7242 | /* page 4 0x2772-0x277E */ | 7243 | /* page 4 0x2772-0x277E */ |
3349 | 7243 | static uint16 tab_jisx0212_uni4[]={ | 7244 | static const uint16 tab_jisx0212_uni4[]={ |
3350 | 7244 | 0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459, | 7245 | 0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459, |
3351 | 7245 | 0x045A,0x045B,0x045C,0x045E,0x045F}; | 7246 | 0x045A,0x045B,0x045C,0x045E,0x045F}; |
3352 | 7246 | 7247 | ||
3353 | 7247 | /* page 5 0x2921-0x2950 */ | 7248 | /* page 5 0x2921-0x2950 */ |
3355 | 7248 | static uint16 tab_jisx0212_uni5[]={ | 7249 | static const uint16 tab_jisx0212_uni5[]={ |
3356 | 7249 | 0x00C6,0x0110, 0,0x0126, 0,0x0132, 0,0x0141, | 7250 | 0x00C6,0x0110, 0,0x0126, 0,0x0132, 0,0x0141, |
3357 | 7250 | 0x013F, 0,0x014A,0x00D8,0x0152, 0,0x0166,0x00DE, | 7251 | 0x013F, 0,0x014A,0x00D8,0x0152, 0,0x0166,0x00DE, |
3358 | 7251 | 0, 0, 0, 0, 0, 0, 0, 0, | 7252 | 0, 0, 0, 0, 0, 0, 0, 0, |
3359 | @@ -7255,7 +7256,7 @@ | |||
3360 | 7255 | }; | 7256 | }; |
3361 | 7256 | 7257 | ||
3362 | 7257 | /* page 6 0x2A21-0x2A77 */ | 7258 | /* page 6 0x2A21-0x2A77 */ |
3364 | 7258 | static uint16 tab_jisx0212_uni6[]={ | 7259 | static const uint16 tab_jisx0212_uni6[]={ |
3365 | 7259 | 0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,0x0104, | 7260 | 0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,0x0104, |
3366 | 7260 | 0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,0x010E, | 7261 | 0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,0x010E, |
3367 | 7261 | 0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,0x0118, | 7262 | 0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,0x0118, |
3368 | @@ -7269,7 +7270,7 @@ | |||
3369 | 7269 | 0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B}; | 7270 | 0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B}; |
3370 | 7270 | 7271 | ||
3371 | 7271 | /* page 7 0x2B21-0x2B77 */ | 7272 | /* page 7 0x2B21-0x2B77 */ |
3373 | 7272 | static uint16 tab_jisx0212_uni7[]={ | 7273 | static const uint16 tab_jisx0212_uni7[]={ |
3374 | 7273 | 0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,0x0105, | 7274 | 0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,0x0105, |
3375 | 7274 | 0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,0x010F, | 7275 | 0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,0x010F, |
3376 | 7275 | 0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,0x0119, | 7276 | 0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,0x0119, |
3377 | @@ -7283,7 +7284,7 @@ | |||
3378 | 7283 | 0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C}; | 7284 | 0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C}; |
3379 | 7284 | 7285 | ||
3380 | 7285 | /* page 8 0x3021-0x307E */ | 7286 | /* page 8 0x3021-0x307E */ |
3382 | 7286 | static uint16 tab_jisx0212_uni8[]={ | 7287 | static const uint16 tab_jisx0212_uni8[]={ |
3383 | 7287 | 0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,0x4E24, | 7288 | 0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,0x4E24, |
3384 | 7288 | 0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,0x4E41, | 7289 | 0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,0x4E41, |
3385 | 7289 | 0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,0x4E69, | 7290 | 0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,0x4E69, |
3386 | @@ -7298,7 +7299,7 @@ | |||
3387 | 7298 | 0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84}; | 7299 | 0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84}; |
3388 | 7299 | 7300 | ||
3389 | 7300 | /* page 9 0x3121-0x317E */ | 7301 | /* page 9 0x3121-0x317E */ |
3391 | 7301 | static uint16 tab_jisx0212_uni9[]={ | 7302 | static const uint16 tab_jisx0212_uni9[]={ |
3392 | 7302 | 0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93, | 7303 | 0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93, |
3393 | 7303 | 0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,0x4FB7, | 7304 | 0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,0x4FB7, |
3394 | 7304 | 0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,0x4FC5, | 7305 | 0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,0x4FC5, |
3395 | @@ -7313,7 +7314,7 @@ | |||
3396 | 7313 | 0x5084,0x5086,0x508A,0x508E,0x508F,0x5090}; | 7314 | 0x5084,0x5086,0x508A,0x508E,0x508F,0x5090}; |
3397 | 7314 | 7315 | ||
3398 | 7315 | /* page 10 0x3221-0x327E */ | 7316 | /* page 10 0x3221-0x327E */ |
3400 | 7316 | static uint16 tab_jisx0212_uni10[]={ | 7317 | static const uint16 tab_jisx0212_uni10[]={ |
3401 | 7317 | 0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,0x509F, | 7318 | 0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,0x509F, |
3402 | 7318 | 0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,0x50BA, | 7319 | 0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,0x50BA, |
3403 | 7319 | 0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,0x50D0, | 7320 | 0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,0x50D0, |
3404 | @@ -7328,7 +7329,7 @@ | |||
3405 | 7328 | 0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2}; | 7329 | 0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2}; |
3406 | 7329 | 7330 | ||
3407 | 7330 | /* page 11 0x3321-0x337E */ | 7331 | /* page 11 0x3321-0x337E */ |
3409 | 7331 | static uint16 tab_jisx0212_uni11[]={ | 7332 | static const uint16 tab_jisx0212_uni11[]={ |
3410 | 7332 | 0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,0x51DE, | 7333 | 0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,0x51DE, |
3411 | 7333 | 0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,0x5201, | 7334 | 0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,0x5201, |
3412 | 7334 | 0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,0x5222, | 7335 | 0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,0x5222, |
3413 | @@ -7343,7 +7344,7 @@ | |||
3414 | 7343 | 0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B}; | 7344 | 0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B}; |
3415 | 7344 | 7345 | ||
3416 | 7345 | /* page 12 0x3421-0x347E */ | 7346 | /* page 12 0x3421-0x347E */ |
3418 | 7346 | static uint16 tab_jisx0212_uni12[]={ | 7347 | static const uint16 tab_jisx0212_uni12[]={ |
3419 | 7347 | 0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,0x531F, | 7348 | 0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,0x531F, |
3420 | 7348 | 0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,0x5330, | 7349 | 0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,0x5330, |
3421 | 7349 | 0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,0x534B, | 7350 | 0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,0x534B, |
3422 | @@ -7358,7 +7359,7 @@ | |||
3423 | 7358 | 0x5469,0x546B,0x546D,0x546E,0x5474,0x547F}; | 7359 | 0x5469,0x546B,0x546D,0x546E,0x5474,0x547F}; |
3424 | 7359 | 7360 | ||
3425 | 7360 | /* page 13 0x3521-0x357E */ | 7361 | /* page 13 0x3521-0x357E */ |
3427 | 7361 | static uint16 tab_jisx0212_uni13[]={ | 7362 | static const uint16 tab_jisx0212_uni13[]={ |
3428 | 7362 | 0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,0x5495, | 7363 | 0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,0x5495, |
3429 | 7363 | 0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,0x54AA, | 7364 | 0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,0x54AA, |
3430 | 7364 | 0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,0x54BF, | 7365 | 0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,0x54BF, |
3431 | @@ -7373,7 +7374,7 @@ | |||
3432 | 7373 | 0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2}; | 7374 | 0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2}; |
3433 | 7374 | 7375 | ||
3434 | 7375 | /* page 14 0x3621-0x367E */ | 7376 | /* page 14 0x3621-0x367E */ |
3436 | 7376 | static uint16 tab_jisx0212_uni14[]={ | 7377 | static const uint16 tab_jisx0212_uni14[]={ |
3437 | 7377 | 0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,0x55F6, | 7378 | 0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,0x55F6, |
3438 | 7378 | 0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,0x5610, | 7379 | 0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,0x5610, |
3439 | 7379 | 0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,0x5637, | 7380 | 0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,0x5637, |
3440 | @@ -7388,7 +7389,7 @@ | |||
3441 | 7388 | 0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED}; | 7389 | 0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED}; |
3442 | 7389 | 7390 | ||
3443 | 7390 | /* page 15 0x3721-0x377E */ | 7391 | /* page 15 0x3721-0x377E */ |
3445 | 7391 | static uint16 tab_jisx0212_uni15[]={ | 7392 | static const uint16 tab_jisx0212_uni15[]={ |
3446 | 7392 | 0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,0x5711, | 7393 | 0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,0x5711, |
3447 | 7393 | 0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,0x5724, | 7394 | 0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,0x5724, |
3448 | 7394 | 0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,0x5734, | 7395 | 0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,0x5734, |
3449 | @@ -7403,7 +7404,7 @@ | |||
3450 | 7403 | 0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1}; | 7404 | 0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1}; |
3451 | 7404 | 7405 | ||
3452 | 7405 | /* page 16 0x3821-0x387E */ | 7406 | /* page 16 0x3821-0x387E */ |
3454 | 7406 | static uint16 tab_jisx0212_uni16[]={ | 7407 | static const uint16 tab_jisx0212_uni16[]={ |
3455 | 7407 | 0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,0x5827, | 7408 | 0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,0x5827, |
3456 | 7408 | 0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,0x584F, | 7409 | 0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,0x584F, |
3457 | 7409 | 0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,0x5878, | 7410 | 0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,0x5878, |
3458 | @@ -7418,7 +7419,7 @@ | |||
3459 | 7418 | 0x595E,0x595F,0x5961,0x5963,0x596B,0x596D}; | 7419 | 0x595E,0x595F,0x5961,0x5963,0x596B,0x596D}; |
3460 | 7419 | 7420 | ||
3461 | 7420 | /* page 17 0x3921-0x397E */ | 7421 | /* page 17 0x3921-0x397E */ |
3463 | 7421 | static uint16 tab_jisx0212_uni17[]={ | 7422 | static const uint16 tab_jisx0212_uni17[]={ |
3464 | 7422 | 0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,0x598B, | 7423 | 0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,0x598B, |
3465 | 7423 | 0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,0x59A7, | 7424 | 0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,0x59A7, |
3466 | 7424 | 0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,0x59BC, | 7425 | 0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,0x59BC, |
3467 | @@ -7433,7 +7434,7 @@ | |||
3468 | 7433 | 0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF}; | 7434 | 0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF}; |
3469 | 7434 | 7435 | ||
3470 | 7435 | /* page 18 0x3A21-0x3A7E */ | 7436 | /* page 18 0x3A21-0x3A7E */ |
3472 | 7436 | static uint16 tab_jisx0212_uni18[]={ | 7437 | static const uint16 tab_jisx0212_uni18[]={ |
3473 | 7437 | 0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,0x5AE5, | 7438 | 0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,0x5AE5, |
3474 | 7438 | 0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,0x5B08, | 7439 | 0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,0x5B08, |
3475 | 7439 | 0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,0x5B2D, | 7440 | 0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,0x5B2D, |
3476 | @@ -7448,7 +7449,7 @@ | |||
3477 | 7448 | 0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69}; | 7449 | 0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69}; |
3478 | 7449 | 7450 | ||
3479 | 7450 | /* page 19 0x3B21-0x3B7E */ | 7451 | /* page 19 0x3B21-0x3B7E */ |
3481 | 7451 | static uint16 tab_jisx0212_uni19[]={ | 7452 | static const uint16 tab_jisx0212_uni19[]={ |
3482 | 7452 | 0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,0x5C7D, | 7453 | 0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,0x5C7D, |
3483 | 7453 | 0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,0x5CA0, | 7454 | 0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,0x5CA0, |
3484 | 7454 | 0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,0x5CBA, | 7455 | 0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,0x5CBA, |
3485 | @@ -7463,7 +7464,7 @@ | |||
3486 | 7463 | 0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4}; | 7464 | 0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4}; |
3487 | 7464 | 7465 | ||
3488 | 7465 | /* page 20 0x3C21-0x3C7E */ | 7466 | /* page 20 0x3C21-0x3C7E */ |
3490 | 7466 | static uint16 tab_jisx0212_uni20[]={ | 7467 | static const uint16 tab_jisx0212_uni20[]={ |
3491 | 7467 | 0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,0x5E14, | 7468 | 0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,0x5E14, |
3492 | 7468 | 0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,0x5E35, | 7469 | 0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,0x5E35, |
3493 | 7469 | 0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,0x5E5B, | 7470 | 0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,0x5E5B, |
3494 | @@ -7478,7 +7479,7 @@ | |||
3495 | 7478 | 0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67}; | 7479 | 0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67}; |
3496 | 7479 | 7480 | ||
3497 | 7480 | /* page 21 0x3D21-0x3D7E */ | 7481 | /* page 21 0x3D21-0x3D7E */ |
3499 | 7481 | static uint16 tab_jisx0212_uni21[]={ | 7482 | static const uint16 tab_jisx0212_uni21[]={ |
3500 | 7482 | 0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,0x5F7E, | 7483 | 0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,0x5F7E, |
3501 | 7483 | 0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,0x5FA7, | 7484 | 0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,0x5FA7, |
3502 | 7484 | 0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,0x5FC4, | 7485 | 0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,0x5FC4, |
3503 | @@ -7493,7 +7494,7 @@ | |||
3504 | 7493 | 0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7}; | 7494 | 0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7}; |
3505 | 7494 | 7495 | ||
3506 | 7495 | /* page 22 0x3E21-0x3E7E */ | 7496 | /* page 22 0x3E21-0x3E7E */ |
3508 | 7496 | static uint16 tab_jisx0212_uni22[]={ | 7497 | static const uint16 tab_jisx0212_uni22[]={ |
3509 | 7497 | 0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,0x60CB, | 7498 | 0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,0x60CB, |
3510 | 7498 | 0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,0x60DE, | 7499 | 0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,0x60DE, |
3511 | 7499 | 0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,0x6102, | 7500 | 0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,0x6102, |
3512 | @@ -7508,7 +7509,7 @@ | |||
3513 | 7508 | 0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5}; | 7509 | 0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5}; |
3514 | 7509 | 7510 | ||
3515 | 7510 | /* page 23 0x3F21-0x3F7E */ | 7511 | /* page 23 0x3F21-0x3F7E */ |
3517 | 7511 | static uint16 tab_jisx0212_uni23[]={ | 7512 | static const uint16 tab_jisx0212_uni23[]={ |
3518 | 7512 | 0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,0x6213, | 7513 | 0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,0x6213, |
3519 | 7513 | 0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,0x622B, | 7514 | 0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,0x622B, |
3520 | 7514 | 0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,0x6250, | 7515 | 0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,0x6250, |
3521 | @@ -7523,7 +7524,7 @@ | |||
3522 | 7523 | 0x6366,0x636C,0x636D,0x6371,0x6374,0x6375}; | 7524 | 0x6366,0x636C,0x636D,0x6371,0x6374,0x6375}; |
3523 | 7524 | 7525 | ||
3524 | 7525 | /* page 24 0x4021-0x407E */ | 7526 | /* page 24 0x4021-0x407E */ |
3526 | 7526 | static uint16 tab_jisx0212_uni24[]={ | 7527 | static const uint16 tab_jisx0212_uni24[]={ |
3527 | 7527 | 0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,0x638A, | 7528 | 0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,0x638A, |
3528 | 7528 | 0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,0x63A6, | 7529 | 0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,0x63A6, |
3529 | 7529 | 0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,0x63CE, | 7530 | 0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,0x63CE, |
3530 | @@ -7538,7 +7539,7 @@ | |||
3531 | 7538 | 0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF}; | 7539 | 0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF}; |
3532 | 7539 | 7540 | ||
3533 | 7540 | /* page 25 0x4121-0x417E */ | 7541 | /* page 25 0x4121-0x417E */ |
3535 | 7541 | static uint16 tab_jisx0212_uni25[]={ | 7542 | static const uint16 tab_jisx0212_uni25[]={ |
3536 | 7542 | 0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,0x64D1, | 7543 | 0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,0x64D1, |
3537 | 7543 | 0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,0x64F0, | 7544 | 0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,0x64F0, |
3538 | 7544 | 0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,0x6509, | 7545 | 0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,0x6509, |
3539 | @@ -7553,7 +7554,7 @@ | |||
3540 | 7553 | 0x660D,0x6611,0x6612,0x6615,0x6616,0x661D}; | 7554 | 0x660D,0x6611,0x6612,0x6615,0x6616,0x661D}; |
3541 | 7554 | 7555 | ||
3542 | 7555 | /* page 26 0x4221-0x427E */ | 7556 | /* page 26 0x4221-0x427E */ |
3544 | 7556 | static uint16 tab_jisx0212_uni26[]={ | 7557 | static const uint16 tab_jisx0212_uni26[]={ |
3545 | 7557 | 0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,0x662A, | 7558 | 0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,0x662A, |
3546 | 7558 | 0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,0x6637, | 7559 | 0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,0x6637, |
3547 | 7559 | 0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,0x6657, | 7560 | 0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,0x6657, |
3548 | @@ -7568,7 +7569,7 @@ | |||
3549 | 7568 | 0x6747,0x6748,0x674C,0x6754,0x6755,0x675D}; | 7569 | 0x6747,0x6748,0x674C,0x6754,0x6755,0x675D}; |
3550 | 7569 | 7570 | ||
3551 | 7570 | /* page 27 0x4321-0x437E */ | 7571 | /* page 27 0x4321-0x437E */ |
3553 | 7571 | static uint16 tab_jisx0212_uni27[]={ | 7572 | static const uint16 tab_jisx0212_uni27[]={ |
3554 | 7572 | 0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,0x6784, | 7573 | 0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,0x6784, |
3555 | 7573 | 0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,0x679B, | 7574 | 0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,0x679B, |
3556 | 7574 | 0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,0x67F9, | 7575 | 0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,0x67F9, |
3557 | @@ -7583,7 +7584,7 @@ | |||
3558 | 7583 | 0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF}; | 7584 | 0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF}; |
3559 | 7584 | 7585 | ||
3560 | 7585 | /* page 28 0x4421-0x447E */ | 7586 | /* page 28 0x4421-0x447E */ |
3562 | 7586 | static uint16 tab_jisx0212_uni28[]={ | 7587 | static const uint16 tab_jisx0212_uni28[]={ |
3563 | 7587 | 0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,0x68E5, | 7588 | 0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,0x68E5, |
3564 | 7588 | 0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,0x68F5, | 7589 | 0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,0x68F5, |
3565 | 7589 | 0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,0x6910, | 7590 | 0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,0x6910, |
3566 | @@ -7598,7 +7599,7 @@ | |||
3567 | 7598 | 0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32}; | 7599 | 0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32}; |
3568 | 7599 | 7600 | ||
3569 | 7600 | /* page 29 0x4521-0x457E */ | 7601 | /* page 29 0x4521-0x457E */ |
3571 | 7601 | static uint16 tab_jisx0212_uni29[]={ | 7602 | static const uint16 tab_jisx0212_uni29[]={ |
3572 | 7602 | 0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,0x6A49, | 7603 | 0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,0x6A49, |
3573 | 7603 | 0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,0x6A5B, | 7604 | 0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,0x6A5B, |
3574 | 7604 | 0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,0x6A83, | 7605 | 0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,0x6A83, |
3575 | @@ -7613,7 +7614,7 @@ | |||
3576 | 7613 | 0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D}; | 7614 | 0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D}; |
3577 | 7614 | 7615 | ||
3578 | 7615 | /* page 30 0x4621-0x467E */ | 7616 | /* page 30 0x4621-0x467E */ |
3580 | 7616 | static uint16 tab_jisx0212_uni30[]={ | 7617 | static const uint16 tab_jisx0212_uni30[]={ |
3581 | 7617 | 0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,0x6BA2, | 7618 | 0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,0x6BA2, |
3582 | 7618 | 0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,0x6BB8, | 7619 | 0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,0x6BB8, |
3583 | 7619 | 0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,0x6BD6, | 7620 | 0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,0x6BD6, |
3584 | @@ -7628,7 +7629,7 @@ | |||
3585 | 7628 | 0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6}; | 7629 | 0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6}; |
3586 | 7629 | 7630 | ||
3587 | 7630 | /* page 31 0x4721-0x477E */ | 7631 | /* page 31 0x4721-0x477E */ |
3589 | 7631 | static uint16 tab_jisx0212_uni31[]={ | 7632 | static const uint16 tab_jisx0212_uni31[]={ |
3590 | 7632 | 0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,0x6CEE, | 7633 | 0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,0x6CEE, |
3591 | 7633 | 0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,0x6D11, | 7634 | 0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,0x6D11, |
3592 | 7634 | 0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,0x6D2F, | 7635 | 0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,0x6D2F, |
3593 | @@ -7643,7 +7644,7 @@ | |||
3594 | 7643 | 0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E}; | 7644 | 0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E}; |
3595 | 7644 | 7645 | ||
3596 | 7645 | /* page 32 0x4821-0x487E */ | 7646 | /* page 32 0x4821-0x487E */ |
3598 | 7646 | static uint16 tab_jisx0212_uni32[]={ | 7647 | static const uint16 tab_jisx0212_uni32[]={ |
3599 | 7647 | 0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,0x6E93, | 7648 | 0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,0x6E93, |
3600 | 7648 | 0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,0x6EBB, | 7649 | 0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,0x6EBB, |
3601 | 7649 | 0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,0x6ECD, | 7650 | 0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,0x6ECD, |
3602 | @@ -7658,7 +7659,7 @@ | |||
3603 | 7658 | 0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA}; | 7659 | 0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA}; |
3604 | 7659 | 7660 | ||
3605 | 7660 | /* page 33 0x4921-0x497E */ | 7661 | /* page 33 0x4921-0x497E */ |
3607 | 7661 | static uint16 tab_jisx0212_uni33[]={ | 7662 | static const uint16 tab_jisx0212_uni33[]={ |
3608 | 7662 | 0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,0x6FFC, | 7663 | 0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,0x6FFC, |
3609 | 7663 | 0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,0x7020, | 7664 | 0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,0x7020, |
3610 | 7664 | 0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,0x7044, | 7665 | 0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,0x7044, |
3611 | @@ -7673,7 +7674,7 @@ | |||
3612 | 7673 | 0x7152,0x7157,0x715A,0x715C,0x715E,0x7160}; | 7674 | 0x7152,0x7157,0x715A,0x715C,0x715E,0x7160}; |
3613 | 7674 | 7675 | ||
3614 | 7675 | /* page 34 0x4A21-0x4A7E */ | 7676 | /* page 34 0x4A21-0x4A7E */ |
3616 | 7676 | static uint16 tab_jisx0212_uni34[]={ | 7677 | static const uint16 tab_jisx0212_uni34[]={ |
3617 | 7677 | 0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,0x719A, | 7678 | 0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,0x719A, |
3618 | 7678 | 0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,0x71BA, | 7679 | 0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,0x71BA, |
3619 | 7679 | 0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,0x71D6, | 7680 | 0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,0x71D6, |
3620 | @@ -7688,7 +7689,7 @@ | |||
3621 | 7688 | 0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB}; | 7689 | 0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB}; |
3622 | 7689 | 7690 | ||
3623 | 7690 | /* page 35 0x4B21-0x4B7E */ | 7691 | /* page 35 0x4B21-0x4B7E */ |
3625 | 7691 | static uint16 tab_jisx0212_uni35[]={ | 7692 | static const uint16 tab_jisx0212_uni35[]={ |
3626 | 7692 | 0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,0x7312, | 7693 | 0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,0x7312, |
3627 | 7693 | 0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,0x7328, | 7694 | 0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,0x7328, |
3628 | 7694 | 0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,0x7343, | 7695 | 0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,0x7343, |
3629 | @@ -7703,7 +7704,7 @@ | |||
3630 | 7703 | 0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD}; | 7704 | 0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD}; |
3631 | 7704 | 7705 | ||
3632 | 7705 | /* page 36 0x4C21-0x4C7E */ | 7706 | /* page 36 0x4C21-0x4C7E */ |
3634 | 7706 | static uint16 tab_jisx0212_uni36[]={ | 7707 | static const uint16 tab_jisx0212_uni36[]={ |
3635 | 7707 | 0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,0x741A, | 7708 | 0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,0x741A, |
3636 | 7708 | 0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,0x742C, | 7709 | 0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,0x742C, |
3637 | 7709 | 0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,0x7443, | 7710 | 0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,0x7443, |
3638 | @@ -7718,7 +7719,7 @@ | |||
3639 | 7718 | 0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506}; | 7719 | 0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506}; |
3640 | 7719 | 7720 | ||
3641 | 7720 | /* page 37 0x4D21-0x4D7E */ | 7721 | /* page 37 0x4D21-0x4D7E */ |
3643 | 7721 | static uint16 tab_jisx0212_uni37[]={ | 7722 | static const uint16 tab_jisx0212_uni37[]={ |
3644 | 7722 | 0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,0x7529, | 7723 | 0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,0x7529, |
3645 | 7723 | 0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,0x7540, | 7724 | 0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,0x7540, |
3646 | 7724 | 0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,0x755E, | 7725 | 0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,0x755E, |
3647 | @@ -7733,7 +7734,7 @@ | |||
3648 | 7733 | 0x762D,0x7632,0x7633,0x7635,0x7638,0x7639}; | 7734 | 0x762D,0x7632,0x7633,0x7635,0x7638,0x7639}; |
3649 | 7734 | 7735 | ||
3650 | 7735 | /* page 38 0x4E21-0x4E7E */ | 7736 | /* page 38 0x4E21-0x4E7E */ |
3652 | 7736 | static uint16 tab_jisx0212_uni38[]={ | 7737 | static const uint16 tab_jisx0212_uni38[]={ |
3653 | 7737 | 0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,0x7645, | 7738 | 0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,0x7645, |
3654 | 7738 | 0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,0x766D, | 7739 | 0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,0x766D, |
3655 | 7739 | 0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,0x768D, | 7740 | 0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,0x768D, |
3656 | @@ -7748,7 +7749,7 @@ | |||
3657 | 7748 | 0x7757,0x775C,0x775E,0x775F,0x7760,0x7762}; | 7749 | 0x7757,0x775C,0x775E,0x775F,0x7760,0x7762}; |
3658 | 7749 | 7750 | ||
3659 | 7750 | /* page 39 0x4F21-0x4F7E */ | 7751 | /* page 39 0x4F21-0x4F7E */ |
3661 | 7751 | static uint16 tab_jisx0212_uni39[]={ | 7752 | static const uint16 tab_jisx0212_uni39[]={ |
3662 | 7752 | 0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,0x7774, | 7753 | 0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,0x7774, |
3663 | 7753 | 0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,0x7795, | 7754 | 0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,0x7795, |
3664 | 7754 | 0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,0x77AF, | 7755 | 0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,0x77AF, |
3665 | @@ -7763,7 +7764,7 @@ | |||
3666 | 7763 | 0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3}; | 7764 | 0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3}; |
3667 | 7764 | 7765 | ||
3668 | 7765 | /* page 40 0x5021-0x507E */ | 7766 | /* page 40 0x5021-0x507E */ |
3670 | 7766 | static uint16 tab_jisx0212_uni40[]={ | 7767 | static const uint16 tab_jisx0212_uni40[]={ |
3671 | 7767 | 0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,0x78CE, | 7768 | 0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,0x78CE, |
3672 | 7768 | 0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,0x78E0, | 7769 | 0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,0x78E0, |
3673 | 7769 | 0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,0x78F7, | 7770 | 0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,0x78F7, |
3674 | @@ -7778,7 +7779,7 @@ | |||
3675 | 7778 | 0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE}; | 7779 | 0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE}; |
3676 | 7779 | 7780 | ||
3677 | 7780 | /* page 41 0x5121-0x517E */ | 7781 | /* page 41 0x5121-0x517E */ |
3679 | 7781 | static uint16 tab_jisx0212_uni41[]={ | 7782 | static const uint16 tab_jisx0212_uni41[]={ |
3680 | 7782 | 0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,0x79F8, | 7783 | 0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,0x79F8, |
3681 | 7783 | 0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,0x7A11, | 7784 | 0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,0x7A11, |
3682 | 7784 | 0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,0x7A2F, | 7785 | 0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,0x7A2F, |
3683 | @@ -7793,7 +7794,7 @@ | |||
3684 | 7793 | 0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30}; | 7794 | 0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30}; |
3685 | 7794 | 7795 | ||
3686 | 7795 | /* page 42 0x5221-0x527E */ | 7796 | /* page 42 0x5221-0x527E */ |
3688 | 7796 | static uint16 tab_jisx0212_uni42[]={ | 7797 | static const uint16 tab_jisx0212_uni42[]={ |
3689 | 7797 | 0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,0x7B4E, | 7798 | 0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,0x7B4E, |
3690 | 7798 | 0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,0x7B6F, | 7799 | 0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,0x7B6F, |
3691 | 7799 | 0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,0x7B91, | 7800 | 0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,0x7B91, |
3692 | @@ -7808,7 +7809,7 @@ | |||
3693 | 7808 | 0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E}; | 7809 | 0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E}; |
3694 | 7809 | 7810 | ||
3695 | 7810 | /* page 43 0x5321-0x537E */ | 7811 | /* page 43 0x5321-0x537E */ |
3697 | 7811 | static uint16 tab_jisx0212_uni43[]={ | 7812 | static const uint16 tab_jisx0212_uni43[]={ |
3698 | 7812 | 0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,0x7C72, | 7813 | 0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,0x7C72, |
3699 | 7813 | 0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,0x7C9E, | 7814 | 0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,0x7C9E, |
3700 | 7814 | 0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,0x7CBC, | 7815 | 0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,0x7CBC, |
3701 | @@ -7823,7 +7824,7 @@ | |||
3702 | 7823 | 0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D}; | 7824 | 0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D}; |
3703 | 7824 | 7825 | ||
3704 | 7825 | /* page 44 0x5421-0x547E */ | 7826 | /* page 44 0x5421-0x547E */ |
3706 | 7826 | static uint16 tab_jisx0212_uni44[]={ | 7827 | static const uint16 tab_jisx0212_uni44[]={ |
3707 | 7827 | 0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,0x7DB9, | 7828 | 0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,0x7DB9, |
3708 | 7828 | 0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,0x7DCE, | 7829 | 0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,0x7DCE, |
3709 | 7829 | 0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,0x7DEB, | 7830 | 0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,0x7DEB, |
3710 | @@ -7838,7 +7839,7 @@ | |||
3711 | 7838 | 0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D}; | 7839 | 0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D}; |
3712 | 7839 | 7840 | ||
3713 | 7840 | /* page 45 0x5521-0x557E */ | 7841 | /* page 45 0x5521-0x557E */ |
3715 | 7841 | static uint16 tab_jisx0212_uni45[]={ | 7842 | static const uint16 tab_jisx0212_uni45[]={ |
3716 | 7842 | 0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,0x7F8F, | 7843 | 0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,0x7F8F, |
3717 | 7843 | 0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,0x7FA6, | 7844 | 0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,0x7FA6, |
3718 | 7844 | 0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,0x7FC8, | 7845 | 0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,0x7FC8, |
3719 | @@ -7853,7 +7854,7 @@ | |||
3720 | 7853 | 0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE}; | 7854 | 0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE}; |
3721 | 7854 | 7855 | ||
3722 | 7855 | /* page 46 0x5621-0x567E */ | 7856 | /* page 46 0x5621-0x567E */ |
3724 | 7856 | static uint16 tab_jisx0212_uni46[]={ | 7857 | static const uint16 tab_jisx0212_uni46[]={ |
3725 | 7857 | 0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,0x8103, | 7858 | 0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,0x8103, |
3726 | 7858 | 0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,0x8124, | 7859 | 0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,0x8124, |
3727 | 7859 | 0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,0x8147, | 7860 | 0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,0x8147, |
3728 | @@ -7868,7 +7869,7 @@ | |||
3729 | 7868 | 0x8234,0x823A,0x8243,0x8244,0x8245,0x8246}; | 7869 | 0x8234,0x823A,0x8243,0x8244,0x8245,0x8246}; |
3730 | 7869 | 7870 | ||
3731 | 7870 | /* page 47 0x5721-0x577E */ | 7871 | /* page 47 0x5721-0x577E */ |
3733 | 7871 | static uint16 tab_jisx0212_uni47[]={ | 7872 | static const uint16 tab_jisx0212_uni47[]={ |
3734 | 7872 | 0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,0x8263, | 7873 | 0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,0x8263, |
3735 | 7873 | 0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,0x8281, | 7874 | 0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,0x8281, |
3736 | 7874 | 0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,0x8294, | 7875 | 0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,0x8294, |
3737 | @@ -7883,7 +7884,7 @@ | |||
3738 | 7883 | 0x8351,0x8355,0x8356,0x8357,0x8370,0x8378}; | 7884 | 0x8351,0x8355,0x8356,0x8357,0x8370,0x8378}; |
3739 | 7884 | 7885 | ||
3740 | 7885 | /* page 48 0x5821-0x587E */ | 7886 | /* page 48 0x5821-0x587E */ |
3742 | 7886 | static uint16 tab_jisx0212_uni48[]={ | 7887 | static const uint16 tab_jisx0212_uni48[]={ |
3743 | 7887 | 0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,0x8392, | 7888 | 0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,0x8392, |
3744 | 7888 | 0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,0x83A6, | 7889 | 0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,0x83A6, |
3745 | 7889 | 0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,0x83C9, | 7890 | 0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,0x83C9, |
3746 | @@ -7898,7 +7899,7 @@ | |||
3747 | 7898 | 0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3}; | 7899 | 0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3}; |
3748 | 7899 | 7900 | ||
3749 | 7900 | /* page 49 0x5921-0x597E */ | 7901 | /* page 49 0x5921-0x597E */ |
3751 | 7901 | static uint16 tab_jisx0212_uni49[]={ | 7902 | static const uint16 tab_jisx0212_uni49[]={ |
3752 | 7902 | 0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,0x84F7, | 7903 | 0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,0x84F7, |
3753 | 7903 | 0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,0x850C, | 7904 | 0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,0x850C, |
3754 | 7904 | 0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,0x8525, | 7905 | 0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,0x8525, |
3755 | @@ -7913,7 +7914,7 @@ | |||
3756 | 7913 | 0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC}; | 7914 | 0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC}; |
3757 | 7914 | 7915 | ||
3758 | 7915 | /* page 50 0x5A21-0x5A7E */ | 7916 | /* page 50 0x5A21-0x5A7E */ |
3760 | 7916 | static uint16 tab_jisx0212_uni50[]={ | 7917 | static const uint16 tab_jisx0212_uni50[]={ |
3761 | 7917 | 0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,0x8611, | 7918 | 0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,0x8611, |
3762 | 7918 | 0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,0x8629, | 7919 | 0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,0x8629, |
3763 | 7919 | 0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,0x8646, | 7920 | 0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,0x8646, |
3764 | @@ -7928,7 +7929,7 @@ | |||
3765 | 7928 | 0x8714,0x8719,0x871E,0x871F,0x8721,0x8723}; | 7929 | 0x8714,0x8719,0x871E,0x871F,0x8721,0x8723}; |
3766 | 7929 | 7930 | ||
3767 | 7930 | /* page 51 0x5B21-0x5B7E */ | 7931 | /* page 51 0x5B21-0x5B7E */ |
3769 | 7931 | static uint16 tab_jisx0212_uni51[]={ | 7932 | static const uint16 tab_jisx0212_uni51[]={ |
3770 | 7932 | 0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,0x873C, | 7933 | 0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,0x873C, |
3771 | 7933 | 0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,0x875D, | 7934 | 0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,0x875D, |
3772 | 7934 | 0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,0x8783, | 7935 | 0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,0x8783, |
3773 | @@ -7943,7 +7944,7 @@ | |||
3774 | 7943 | 0x8828,0x882D,0x882E,0x8830,0x8832,0x8835}; | 7944 | 0x8828,0x882D,0x882E,0x8830,0x8832,0x8835}; |
3775 | 7944 | 7945 | ||
3776 | 7945 | /* page 52 0x5C21-0x5C7E */ | 7946 | /* page 52 0x5C21-0x5C7E */ |
3778 | 7946 | static uint16 tab_jisx0212_uni52[]={ | 7947 | static const uint16 tab_jisx0212_uni52[]={ |
3779 | 7947 | 0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,0x884A, | 7948 | 0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,0x884A, |
3780 | 7948 | 0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,0x885C, | 7949 | 0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,0x885C, |
3781 | 7949 | 0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,0x8880, | 7950 | 0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,0x8880, |
3782 | @@ -7958,7 +7959,7 @@ | |||
3783 | 7958 | 0x896B,0x896E,0x8970,0x8973,0x8975,0x897A}; | 7959 | 0x896B,0x896E,0x8970,0x8973,0x8975,0x897A}; |
3784 | 7959 | 7960 | ||
3785 | 7960 | /* page 53 0x5D21-0x5D7E */ | 7961 | /* page 53 0x5D21-0x5D7E */ |
3787 | 7961 | static uint16 tab_jisx0212_uni53[]={ | 7962 | static const uint16 tab_jisx0212_uni53[]={ |
3788 | 7962 | 0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,0x8995, | 7963 | 0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,0x8995, |
3789 | 7963 | 0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,0x89B5, | 7964 | 0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,0x89B5, |
3790 | 7964 | 0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,0x89D8, | 7965 | 0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,0x89D8, |
3791 | @@ -7973,7 +7974,7 @@ | |||
3792 | 7973 | 0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3}; | 7974 | 0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3}; |
3793 | 7974 | 7975 | ||
3794 | 7975 | /* page 54 0x5E21-0x5E7E */ | 7976 | /* page 54 0x5E21-0x5E7E */ |
3796 | 7976 | static uint16 tab_jisx0212_uni54[]={ | 7977 | static const uint16 tab_jisx0212_uni54[]={ |
3797 | 7977 | 0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,0x8AC9, | 7978 | 0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,0x8AC9, |
3798 | 7978 | 0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,0x8ADF, | 7979 | 0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,0x8ADF, |
3799 | 7979 | 0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,0x8B05, | 7980 | 0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,0x8B05, |
3800 | @@ -7988,7 +7989,7 @@ | |||
3801 | 7988 | 0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86}; | 7989 | 0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86}; |
3802 | 7989 | 7990 | ||
3803 | 7990 | /* page 55 0x5F21-0x5F7E */ | 7991 | /* page 55 0x5F21-0x5F7E */ |
3805 | 7991 | static uint16 tab_jisx0212_uni55[]={ | 7992 | static const uint16 tab_jisx0212_uni55[]={ |
3806 | 7992 | 0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,0x8C9C, | 7993 | 0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,0x8C9C, |
3807 | 7993 | 0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,0x8CCF, | 7994 | 0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,0x8CCF, |
3808 | 7994 | 0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,0x8CEF, | 7995 | 0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,0x8CEF, |
3809 | @@ -8003,7 +8004,7 @@ | |||
3810 | 8003 | 0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22}; | 8004 | 0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22}; |
3811 | 8004 | 8005 | ||
3812 | 8005 | /* page 56 0x6021-0x607E */ | 8006 | /* page 56 0x6021-0x607E */ |
3814 | 8006 | static uint16 tab_jisx0212_uni56[]={ | 8007 | static const uint16 tab_jisx0212_uni56[]={ |
3815 | 8007 | 0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,0x8E38, | 8008 | 0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,0x8E38, |
3816 | 8008 | 0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,0x8E4F, | 8009 | 0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,0x8E4F, |
3817 | 8009 | 0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,0x8E69, | 8010 | 0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,0x8E69, |
3818 | @@ -8018,7 +8019,7 @@ | |||
3819 | 8018 | 0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41}; | 8019 | 0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41}; |
3820 | 8019 | 8020 | ||
3821 | 8020 | /* page 57 0x6121-0x617E */ | 8021 | /* page 57 0x6121-0x617E */ |
3823 | 8021 | static uint16 tab_jisx0212_uni57[]={ | 8022 | static const uint16 tab_jisx0212_uni57[]={ |
3824 | 8022 | 0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,0x8F55, | 8023 | 0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,0x8F55, |
3825 | 8023 | 0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,0x8FA4, | 8024 | 0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,0x8FA4, |
3826 | 8024 | 0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,0x8FC1, | 8025 | 0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,0x8FC1, |
3827 | @@ -8033,7 +8034,7 @@ | |||
3828 | 8033 | 0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3}; | 8034 | 0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3}; |
3829 | 8034 | 8035 | ||
3830 | 8035 | /* page 58 0x6221-0x627E */ | 8036 | /* page 58 0x6221-0x627E */ |
3832 | 8036 | static uint16 tab_jisx0212_uni58[]={ | 8037 | static const uint16 tab_jisx0212_uni58[]={ |
3833 | 8037 | 0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,0x90D9, | 8038 | 0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,0x90D9, |
3834 | 8038 | 0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,0x90EF, | 8039 | 0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,0x90EF, |
3835 | 8039 | 0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,0x9106, | 8040 | 0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,0x9106, |
3836 | @@ -8048,7 +8049,7 @@ | |||
3837 | 8048 | 0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF}; | 8049 | 0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF}; |
3838 | 8049 | 8050 | ||
3839 | 8050 | /* page 59 0x6321-0x637E */ | 8051 | /* page 59 0x6321-0x637E */ |
3841 | 8051 | static uint16 tab_jisx0212_uni59[]={ | 8052 | static const uint16 tab_jisx0212_uni59[]={ |
3842 | 8052 | 0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,0x91DA, | 8053 | 0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,0x91DA, |
3843 | 8053 | 0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,0x91EE, | 8054 | 0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,0x91EE, |
3844 | 8054 | 0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,0x9200, | 8055 | 0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,0x9200, |
3845 | @@ -8063,7 +8064,7 @@ | |||
3846 | 8063 | 0x9289,0x928A,0x928D,0x928E,0x9292,0x9297}; | 8064 | 0x9289,0x928A,0x928D,0x928E,0x9292,0x9297}; |
3847 | 8064 | 8065 | ||
3848 | 8065 | /* page 60 0x6421-0x647E */ | 8066 | /* page 60 0x6421-0x647E */ |
3850 | 8066 | static uint16 tab_jisx0212_uni60[]={ | 8067 | static const uint16 tab_jisx0212_uni60[]={ |
3851 | 8067 | 0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,0x92AB, | 8068 | 0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,0x92AB, |
3852 | 8068 | 0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,0x92BD, | 8069 | 0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,0x92BD, |
3853 | 8069 | 0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,0x92C7, | 8070 | 0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,0x92C7, |
3854 | @@ -8078,7 +8079,7 @@ | |||
3855 | 8078 | 0x936F,0x9370,0x9371,0x9373,0x9374,0x9376}; | 8079 | 0x936F,0x9370,0x9371,0x9373,0x9374,0x9376}; |
3856 | 8079 | 8080 | ||
3857 | 8080 | /* page 61 0x6521-0x657E */ | 8081 | /* page 61 0x6521-0x657E */ |
3859 | 8081 | static uint16 tab_jisx0212_uni61[]={ | 8082 | static const uint16 tab_jisx0212_uni61[]={ |
3860 | 8082 | 0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,0x938A, | 8083 | 0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,0x938A, |
3861 | 8083 | 0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,0x939E, | 8084 | 0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,0x939E, |
3862 | 8084 | 0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,0x93B5, | 8085 | 0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,0x93B5, |
3863 | @@ -8093,7 +8094,7 @@ | |||
3864 | 8093 | 0x9471,0x9472,0x9484,0x9483,0x9578,0x9579}; | 8094 | 0x9471,0x9472,0x9484,0x9483,0x9578,0x9579}; |
3865 | 8094 | 8095 | ||
3866 | 8095 | /* page 62 0x6621-0x667E */ | 8096 | /* page 62 0x6621-0x667E */ |
3868 | 8096 | static uint16 tab_jisx0212_uni62[]={ | 8097 | static const uint16 tab_jisx0212_uni62[]={ |
3869 | 8097 | 0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,0x959E, | 8098 | 0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,0x959E, |
3870 | 8098 | 0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,0x95B6, | 8099 | 0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,0x95B6, |
3871 | 8099 | 0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,0x95D0, | 8100 | 0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,0x95D0, |
3872 | @@ -8108,7 +8109,7 @@ | |||
3873 | 8108 | 0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702}; | 8109 | 0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702}; |
3874 | 8109 | 8110 | ||
3875 | 8110 | /* page 63 0x6721-0x677E */ | 8111 | /* page 63 0x6721-0x677E */ |
3877 | 8111 | static uint16 tab_jisx0212_uni63[]={ | 8112 | static const uint16 tab_jisx0212_uni63[]={ |
3878 | 8112 | 0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,0x9722, | 8113 | 0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,0x9722, |
3879 | 8113 | 0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,0x974E, | 8114 | 0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,0x974E, |
3880 | 8114 | 0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,0x9767, | 8115 | 0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,0x9767, |
3881 | @@ -8123,7 +8124,7 @@ | |||
3882 | 8123 | 0x9816,0x981C,0x981E,0x9820,0x9823,0x9826}; | 8124 | 0x9816,0x981C,0x981E,0x9820,0x9823,0x9826}; |
3883 | 8124 | 8125 | ||
3884 | 8125 | /* page 64 0x6821-0x687E */ | 8126 | /* page 64 0x6821-0x687E */ |
3886 | 8126 | static uint16 tab_jisx0212_uni64[]={ | 8127 | static const uint16 tab_jisx0212_uni64[]={ |
3887 | 8127 | 0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,0x9825, | 8128 | 0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,0x9825, |
3888 | 8128 | 0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,0x9856, | 8129 | 0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,0x9856, |
3889 | 8129 | 0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,0x986A, | 8130 | 0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,0x986A, |
3890 | @@ -8138,7 +8139,7 @@ | |||
3891 | 8138 | 0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5}; | 8139 | 0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5}; |
3892 | 8139 | 8140 | ||
3893 | 8140 | /* page 65 0x6921-0x697E */ | 8141 | /* page 65 0x6921-0x697E */ |
3895 | 8141 | static uint16 tab_jisx0212_uni65[]={ | 8142 | static const uint16 tab_jisx0212_uni65[]={ |
3896 | 8142 | 0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,0x99D4, | 8143 | 0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,0x99D4, |
3897 | 8143 | 0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,0x99EC, | 8144 | 0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,0x99EC, |
3898 | 8144 | 0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,0x9A03, | 8145 | 0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,0x9A03, |
3899 | @@ -8153,7 +8154,7 @@ | |||
3900 | 8153 | 0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03}; | 8154 | 0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03}; |
3901 | 8154 | 8155 | ||
3902 | 8155 | /* page 66 0x6A21-0x6A7E */ | 8156 | /* page 66 0x6A21-0x6A7E */ |
3904 | 8156 | static uint16 tab_jisx0212_uni66[]={ | 8157 | static const uint16 tab_jisx0212_uni66[]={ |
3905 | 8157 | 0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,0x9B0E, | 8158 | 0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,0x9B0E, |
3906 | 8158 | 0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,0x9B26, | 8159 | 0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,0x9B26, |
3907 | 8159 | 0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,0x9B3A, | 8160 | 0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,0x9B3A, |
3908 | @@ -8168,7 +8169,7 @@ | |||
3909 | 8168 | 0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8}; | 8169 | 0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8}; |
3910 | 8169 | 8170 | ||
3911 | 8170 | /* page 67 0x6B21-0x6B7E */ | 8171 | /* page 67 0x6B21-0x6B7E */ |
3913 | 8171 | static uint16 tab_jisx0212_uni67[]={ | 8172 | static const uint16 tab_jisx0212_uni67[]={ |
3914 | 8172 | 0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,0x9C0F, | 8173 | 0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,0x9C0F, |
3915 | 8173 | 0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,0x9C22, | 8174 | 0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,0x9C22, |
3916 | 8174 | 0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,0x9C35, | 8175 | 0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,0x9C35, |
3917 | @@ -8183,7 +8184,7 @@ | |||
3918 | 8183 | 0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B}; | 8184 | 0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B}; |
3919 | 8184 | 8185 | ||
3920 | 8185 | /* page 68 0x6C21-0x6C7E */ | 8186 | /* page 68 0x6C21-0x6C7E */ |
3922 | 8186 | static uint16 tab_jisx0212_uni68[]={ | 8187 | static const uint16 tab_jisx0212_uni68[]={ |
3923 | 8187 | 0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,0x9D8E, | 8188 | 0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,0x9D8E, |
3924 | 8188 | 0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,0x9DAA, | 8189 | 0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,0x9DAA, |
3925 | 8189 | 0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,0x9DC3, | 8190 | 0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,0x9DC3, |
3926 | @@ -8198,7 +8199,7 @@ | |||
3927 | 8198 | 0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5}; | 8199 | 0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5}; |
3928 | 8199 | 8200 | ||
3929 | 8200 | /* page 69 0x6D21-0x6D63 */ | 8201 | /* page 69 0x6D21-0x6D63 */ |
3931 | 8201 | static uint16 tab_jisx0212_uni69[]={ | 8202 | static const uint16 tab_jisx0212_uni69[]={ |
3932 | 8202 | 0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,0x9F11, | 8203 | 0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,0x9F11, |
3933 | 8203 | 0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,0x9F1F, | 8204 | 0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,0x9F1F, |
3934 | 8204 | 0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,0x9F34, | 8205 | 0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,0x9F34, |
3935 | @@ -8210,12 +8211,12 @@ | |||
3936 | 8210 | 0x9FA2,0x9FA3,0x9FA5}; | 8211 | 0x9FA2,0x9FA3,0x9FA5}; |
3937 | 8211 | 8212 | ||
3938 | 8212 | /* page 70 0x7371-0x737E IBM Kanji and Nonkanji */ | 8213 | /* page 70 0x7371-0x737E IBM Kanji and Nonkanji */ |
3940 | 8213 | static uint16 tab_jisx0212_uni70[]={ | 8214 | static const uint16 tab_jisx0212_uni70[]={ |
3941 | 8214 | 0, 0,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175, | 8215 | 0, 0,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175, |
3942 | 8215 | 0x2176,0x2177,0x2178,0x2179,0x2160,0x2161}; | 8216 | 0x2176,0x2177,0x2178,0x2179,0x2160,0x2161}; |
3943 | 8216 | 8217 | ||
3944 | 8217 | /* page 71 0x7421-0x747E IBM Kanji and Nonkanji*/ | 8218 | /* page 71 0x7421-0x747E IBM Kanji and Nonkanji*/ |
3946 | 8218 | static uint16 tab_jisx0212_uni71[]={ | 8219 | static const uint16 tab_jisx0212_uni71[]={ |
3947 | 8219 | 0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,0x2168,0x2169, | 8220 | 0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,0x2168,0x2169, |
3948 | 8220 | 0xFF07,0xFF02,0x3231,0x2116,0x2121,0x70BB,0x4EFC,0x50F4, | 8221 | 0xFF07,0xFF02,0x3231,0x2116,0x2121,0x70BB,0x4EFC,0x50F4, |
3949 | 8221 | 0x51EC,0x5307,0x5324,0xFA0E,0x548A,0x5759,0xFA0F,0xFA10, | 8222 | 0x51EC,0x5307,0x5324,0xFA0E,0x548A,0x5759,0xFA0F,0xFA10, |
3950 | @@ -8685,7 +8686,7 @@ | |||
3951 | 8685 | 8686 | ||
3952 | 8686 | 8687 | ||
3953 | 8687 | 8688 | ||
3955 | 8688 | CHARSET_INFO my_charset_eucjpms_japanese_ci= | 8689 | struct charset_info_st my_charset_eucjpms_japanese_ci= |
3956 | 8689 | { | 8690 | { |
3957 | 8690 | 97,0,0, /* number */ | 8691 | 97,0,0, /* number */ |
3958 | 8691 | MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ | 8692 | MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ |
3959 | @@ -8718,7 +8719,7 @@ | |||
3960 | 8718 | }; | 8719 | }; |
3961 | 8719 | 8720 | ||
3962 | 8720 | 8721 | ||
3964 | 8721 | CHARSET_INFO my_charset_eucjpms_bin= | 8722 | struct charset_info_st my_charset_eucjpms_bin= |
3965 | 8722 | { | 8723 | { |
3966 | 8723 | 98,0,0, /* number */ | 8724 | 98,0,0, /* number */ |
3967 | 8724 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ | 8725 | MY_CS_COMPILED|MY_CS_BINSORT, /* state */ |
3968 | 8725 | 8726 | ||
3969 | === modified file 'strings/ctype-extra.c' | |||
3970 | --- strings/ctype-extra.c 2009-07-02 10:15:33 +0000 | |||
3971 | +++ strings/ctype-extra.c 2009-11-03 19:35:25 +0000 | |||
3972 | @@ -6,7 +6,7 @@ | |||
3973 | 6 | ./conf_to_src ../sql/share/charsets/ > FILE | 6 | ./conf_to_src ../sql/share/charsets/ > FILE |
3974 | 7 | */ | 7 | */ |
3975 | 8 | 8 | ||
3977 | 9 | /* Copyright (C) 2000-2007 MySQL AB | 9 | /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. |
3978 | 10 | 10 | ||
3979 | 11 | This program is free software; you can redistribute it and/or modify | 11 | This program is free software; you can redistribute it and/or modify |
3980 | 12 | it under the terms of the GNU General Public License as published by | 12 | it under the terms of the GNU General Public License as published by |
3981 | @@ -25,7 +25,7 @@ | |||
3982 | 25 | #include <m_ctype.h> | 25 | #include <m_ctype.h> |
3983 | 26 | 26 | ||
3984 | 27 | #ifdef HAVE_CHARSET_dec8 | 27 | #ifdef HAVE_CHARSET_dec8 |
3986 | 28 | uchar ctype_dec8_swedish_ci[] = { | 28 | static const uchar ctype_dec8_swedish_ci[] = { |
3987 | 29 | 0x00, | 29 | 0x00, |
3988 | 30 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 30 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
3989 | 31 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 31 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
3990 | @@ -45,7 +45,7 @@ | |||
3991 | 45 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 45 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
3992 | 46 | }; | 46 | }; |
3993 | 47 | 47 | ||
3995 | 48 | uchar to_lower_dec8_swedish_ci[] = { | 48 | static const uchar to_lower_dec8_swedish_ci[] = { |
3996 | 49 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 49 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
3997 | 50 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 50 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
3998 | 51 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 51 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
3999 | @@ -64,7 +64,7 @@ | |||
4000 | 64 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 64 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4001 | 65 | }; | 65 | }; |
4002 | 66 | 66 | ||
4004 | 67 | uchar to_upper_dec8_swedish_ci[] = { | 67 | static const uchar to_upper_dec8_swedish_ci[] = { |
4005 | 68 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 68 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4006 | 69 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 69 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4007 | 70 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 70 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4008 | @@ -83,7 +83,7 @@ | |||
4009 | 83 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 83 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4010 | 84 | }; | 84 | }; |
4011 | 85 | 85 | ||
4013 | 86 | uchar sort_order_dec8_swedish_ci[] = { | 86 | static const uchar sort_order_dec8_swedish_ci[] = { |
4014 | 87 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 87 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4015 | 88 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 88 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4016 | 89 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 89 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4017 | @@ -102,7 +102,7 @@ | |||
4018 | 102 | 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5D,0xF7,0xD8,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF | 102 | 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5D,0xF7,0xD8,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF |
4019 | 103 | }; | 103 | }; |
4020 | 104 | 104 | ||
4022 | 105 | uint16 to_uni_dec8_swedish_ci[] = { | 105 | static const uint16 to_uni_dec8_swedish_ci[] = { |
4023 | 106 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 106 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4024 | 107 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 107 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4025 | 108 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 108 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4026 | @@ -140,7 +140,7 @@ | |||
4027 | 140 | #endif | 140 | #endif |
4028 | 141 | 141 | ||
4029 | 142 | #ifdef HAVE_CHARSET_cp850 | 142 | #ifdef HAVE_CHARSET_cp850 |
4031 | 143 | uchar ctype_cp850_general_ci[] = { | 143 | static const uchar ctype_cp850_general_ci[] = { |
4032 | 144 | 0x00, | 144 | 0x00, |
4033 | 145 | 0x20,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x30,0x30, | 145 | 0x20,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x30,0x30, |
4034 | 146 | 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x30,0x30,0x30,0x30,0x30, | 146 | 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x30,0x30,0x30,0x30,0x30, |
4035 | @@ -160,7 +160,7 @@ | |||
4036 | 160 | 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 | 160 | 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 |
4037 | 161 | }; | 161 | }; |
4038 | 162 | 162 | ||
4040 | 163 | uchar to_lower_cp850_general_ci[] = { | 163 | static const uchar to_lower_cp850_general_ci[] = { |
4041 | 164 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 164 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4042 | 165 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 165 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4043 | 166 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 166 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4044 | @@ -179,7 +179,7 @@ | |||
4045 | 179 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 179 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4046 | 180 | }; | 180 | }; |
4047 | 181 | 181 | ||
4049 | 182 | uchar to_upper_cp850_general_ci[] = { | 182 | static const uchar to_upper_cp850_general_ci[] = { |
4050 | 183 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 183 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4051 | 184 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 184 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4052 | 185 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 185 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4053 | @@ -198,7 +198,7 @@ | |||
4054 | 198 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 198 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4055 | 199 | }; | 199 | }; |
4056 | 200 | 200 | ||
4058 | 201 | uchar sort_order_cp850_general_ci[] = { | 201 | static const uchar sort_order_cp850_general_ci[] = { |
4059 | 202 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 202 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4060 | 203 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 203 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4061 | 204 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 204 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4062 | @@ -217,7 +217,7 @@ | |||
4063 | 217 | 0xED,0xF1,0xC1,0xFE,0xF6,0xE7,0xBF,0xBC,0xF0,0xE8,0xF7,0xF9,0xF3,0xF2,0xDF,0xE0 | 217 | 0xED,0xF1,0xC1,0xFE,0xF6,0xE7,0xBF,0xBC,0xF0,0xE8,0xF7,0xF9,0xF3,0xF2,0xDF,0xE0 |
4064 | 218 | }; | 218 | }; |
4065 | 219 | 219 | ||
4067 | 220 | uint16 to_uni_cp850_general_ci[] = { | 220 | static const uint16 to_uni_cp850_general_ci[] = { |
4068 | 221 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 221 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4069 | 222 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 222 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4070 | 223 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 223 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4071 | @@ -255,7 +255,7 @@ | |||
4072 | 255 | #endif | 255 | #endif |
4073 | 256 | 256 | ||
4074 | 257 | #ifdef HAVE_CHARSET_latin1 | 257 | #ifdef HAVE_CHARSET_latin1 |
4076 | 258 | uchar ctype_latin1_german1_ci[] = { | 258 | static const uchar ctype_latin1_german1_ci[] = { |
4077 | 259 | 0x00, | 259 | 0x00, |
4078 | 260 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 260 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4079 | 261 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 261 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4080 | @@ -275,7 +275,7 @@ | |||
4081 | 275 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 275 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
4082 | 276 | }; | 276 | }; |
4083 | 277 | 277 | ||
4085 | 278 | uchar to_lower_latin1_german1_ci[] = { | 278 | static const uchar to_lower_latin1_german1_ci[] = { |
4086 | 279 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 279 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4087 | 280 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 280 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4088 | 281 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 281 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4089 | @@ -294,7 +294,7 @@ | |||
4090 | 294 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 294 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4091 | 295 | }; | 295 | }; |
4092 | 296 | 296 | ||
4094 | 297 | uchar to_upper_latin1_german1_ci[] = { | 297 | static const uchar to_upper_latin1_german1_ci[] = { |
4095 | 298 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 298 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4096 | 299 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 299 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4097 | 300 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 300 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4098 | @@ -313,7 +313,7 @@ | |||
4099 | 313 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 313 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4100 | 314 | }; | 314 | }; |
4101 | 315 | 315 | ||
4103 | 316 | uchar sort_order_latin1_german1_ci[] = { | 316 | static const uchar sort_order_latin1_german1_ci[] = { |
4104 | 317 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 317 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4105 | 318 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 318 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4106 | 319 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 319 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4107 | @@ -332,7 +332,7 @@ | |||
4108 | 332 | 0xD0,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0xF7,0x4F,0x55,0x55,0x55,0x55,0x59,0xDE,0xFF | 332 | 0xD0,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0xF7,0x4F,0x55,0x55,0x55,0x55,0x59,0xDE,0xFF |
4109 | 333 | }; | 333 | }; |
4110 | 334 | 334 | ||
4112 | 335 | uint16 to_uni_latin1_german1_ci[] = { | 335 | static const uint16 to_uni_latin1_german1_ci[] = { |
4113 | 336 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 336 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4114 | 337 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 337 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4115 | 338 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 338 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4116 | @@ -370,7 +370,7 @@ | |||
4117 | 370 | #endif | 370 | #endif |
4118 | 371 | 371 | ||
4119 | 372 | #ifdef HAVE_CHARSET_hp8 | 372 | #ifdef HAVE_CHARSET_hp8 |
4121 | 373 | uchar ctype_hp8_english_ci[] = { | 373 | static const uchar ctype_hp8_english_ci[] = { |
4122 | 374 | 0x00, | 374 | 0x00, |
4123 | 375 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 375 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4124 | 376 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 376 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4125 | @@ -390,7 +390,7 @@ | |||
4126 | 390 | 0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 | 390 | 0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 |
4127 | 391 | }; | 391 | }; |
4128 | 392 | 392 | ||
4130 | 393 | uchar to_lower_hp8_english_ci[] = { | 393 | static const uchar to_lower_hp8_english_ci[] = { |
4131 | 394 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 394 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4132 | 395 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 395 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4133 | 396 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 396 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4134 | @@ -409,7 +409,7 @@ | |||
4135 | 409 | 0xF1,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 409 | 0xF1,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4136 | 410 | }; | 410 | }; |
4137 | 411 | 411 | ||
4139 | 412 | uchar to_upper_hp8_english_ci[] = { | 412 | static const uchar to_upper_hp8_english_ci[] = { |
4140 | 413 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 413 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4141 | 414 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 414 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4142 | 415 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 415 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4143 | @@ -428,7 +428,7 @@ | |||
4144 | 428 | 0xF0,0xF0,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 428 | 0xF0,0xF0,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4145 | 429 | }; | 429 | }; |
4146 | 430 | 430 | ||
4148 | 431 | uchar sort_order_hp8_english_ci[] = { | 431 | static const uchar sort_order_hp8_english_ci[] = { |
4149 | 432 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 432 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4150 | 433 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 433 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4151 | 434 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 434 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4152 | @@ -447,7 +447,7 @@ | |||
4153 | 447 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 447 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4154 | 448 | }; | 448 | }; |
4155 | 449 | 449 | ||
4157 | 450 | uint16 to_uni_hp8_english_ci[] = { | 450 | static const uint16 to_uni_hp8_english_ci[] = { |
4158 | 451 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 451 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4159 | 452 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 452 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4160 | 453 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 453 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4161 | @@ -485,7 +485,7 @@ | |||
4162 | 485 | #endif | 485 | #endif |
4163 | 486 | 486 | ||
4164 | 487 | #ifdef HAVE_CHARSET_koi8r | 487 | #ifdef HAVE_CHARSET_koi8r |
4166 | 488 | uchar ctype_koi8r_general_ci[] = { | 488 | static const uchar ctype_koi8r_general_ci[] = { |
4167 | 489 | 0x00, | 489 | 0x00, |
4168 | 490 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 490 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4169 | 491 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 491 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4170 | @@ -505,7 +505,7 @@ | |||
4171 | 505 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 | 505 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 |
4172 | 506 | }; | 506 | }; |
4173 | 507 | 507 | ||
4175 | 508 | uchar to_lower_koi8r_general_ci[] = { | 508 | static const uchar to_lower_koi8r_general_ci[] = { |
4176 | 509 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 509 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4177 | 510 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 510 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4178 | 511 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 511 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4179 | @@ -524,7 +524,7 @@ | |||
4180 | 524 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF | 524 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF |
4181 | 525 | }; | 525 | }; |
4182 | 526 | 526 | ||
4184 | 527 | uchar to_upper_koi8r_general_ci[] = { | 527 | static const uchar to_upper_koi8r_general_ci[] = { |
4185 | 528 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 528 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4186 | 529 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 529 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4187 | 530 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 530 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4188 | @@ -543,7 +543,7 @@ | |||
4189 | 543 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 543 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4190 | 544 | }; | 544 | }; |
4191 | 545 | 545 | ||
4193 | 546 | uchar sort_order_koi8r_general_ci[] = { | 546 | static const uchar sort_order_koi8r_general_ci[] = { |
4194 | 547 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 547 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4195 | 548 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 548 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4196 | 549 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 549 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4197 | @@ -562,7 +562,7 @@ | |||
4198 | 562 | 0xEF,0xFF,0xF0,0xF1,0xF2,0xF3,0xE6,0xE1,0xFC,0xFB,0xE7,0xF8,0xFD,0xF9,0xF7,0xFA | 562 | 0xEF,0xFF,0xF0,0xF1,0xF2,0xF3,0xE6,0xE1,0xFC,0xFB,0xE7,0xF8,0xFD,0xF9,0xF7,0xFA |
4199 | 563 | }; | 563 | }; |
4200 | 564 | 564 | ||
4202 | 565 | uint16 to_uni_koi8r_general_ci[] = { | 565 | static const uint16 to_uni_koi8r_general_ci[] = { |
4203 | 566 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 566 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4204 | 567 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 567 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4205 | 568 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 568 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4206 | @@ -600,7 +600,7 @@ | |||
4207 | 600 | #endif | 600 | #endif |
4208 | 601 | 601 | ||
4209 | 602 | #ifdef HAVE_CHARSET_latin2 | 602 | #ifdef HAVE_CHARSET_latin2 |
4211 | 603 | uchar ctype_latin2_general_ci[] = { | 603 | static const uchar ctype_latin2_general_ci[] = { |
4212 | 604 | 0x00, | 604 | 0x00, |
4213 | 605 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 605 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4214 | 606 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 606 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4215 | @@ -620,7 +620,7 @@ | |||
4216 | 620 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 | 620 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 |
4217 | 621 | }; | 621 | }; |
4218 | 622 | 622 | ||
4220 | 623 | uchar to_lower_latin2_general_ci[] = { | 623 | static const uchar to_lower_latin2_general_ci[] = { |
4221 | 624 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 624 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4222 | 625 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 625 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4223 | 626 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 626 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4224 | @@ -639,7 +639,7 @@ | |||
4225 | 639 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 639 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4226 | 640 | }; | 640 | }; |
4227 | 641 | 641 | ||
4229 | 642 | uchar to_upper_latin2_general_ci[] = { | 642 | static const uchar to_upper_latin2_general_ci[] = { |
4230 | 643 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 643 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4231 | 644 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 644 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4232 | 645 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 645 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4233 | @@ -658,7 +658,7 @@ | |||
4234 | 658 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 658 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4235 | 659 | }; | 659 | }; |
4236 | 660 | 660 | ||
4238 | 661 | uchar sort_order_latin2_general_ci[] = { | 661 | static const uchar sort_order_latin2_general_ci[] = { |
4239 | 662 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 662 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4240 | 663 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 663 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4241 | 664 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 664 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4242 | @@ -677,7 +677,7 @@ | |||
4243 | 677 | 0xFF,0x55,0x54,0x57,0x56,0x56,0x56,0xFF,0x5A,0x5F,0x5F,0x5F,0x5F,0x63,0x5E,0xFF | 677 | 0xFF,0x55,0x54,0x57,0x56,0x56,0x56,0xFF,0x5A,0x5F,0x5F,0x5F,0x5F,0x63,0x5E,0xFF |
4244 | 678 | }; | 678 | }; |
4245 | 679 | 679 | ||
4247 | 680 | uint16 to_uni_latin2_general_ci[] = { | 680 | static const uint16 to_uni_latin2_general_ci[] = { |
4248 | 681 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 681 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4249 | 682 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 682 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4250 | 683 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 683 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4251 | @@ -715,7 +715,7 @@ | |||
4252 | 715 | #endif | 715 | #endif |
4253 | 716 | 716 | ||
4254 | 717 | #ifdef HAVE_CHARSET_swe7 | 717 | #ifdef HAVE_CHARSET_swe7 |
4256 | 718 | uchar ctype_swe7_swedish_ci[] = { | 718 | static const uchar ctype_swe7_swedish_ci[] = { |
4257 | 719 | 0x00, | 719 | 0x00, |
4258 | 720 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 720 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4259 | 721 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 721 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4260 | @@ -735,7 +735,7 @@ | |||
4261 | 735 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 | 735 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 |
4262 | 736 | }; | 736 | }; |
4263 | 737 | 737 | ||
4265 | 738 | uchar to_lower_swe7_swedish_ci[] = { | 738 | static const uchar to_lower_swe7_swedish_ci[] = { |
4266 | 739 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 739 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4267 | 740 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 740 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4268 | 741 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 741 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4269 | @@ -754,7 +754,7 @@ | |||
4270 | 754 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 754 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4271 | 755 | }; | 755 | }; |
4272 | 756 | 756 | ||
4274 | 757 | uchar to_upper_swe7_swedish_ci[] = { | 757 | static const uchar to_upper_swe7_swedish_ci[] = { |
4275 | 758 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 758 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4276 | 759 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 759 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4277 | 760 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 760 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4278 | @@ -773,7 +773,7 @@ | |||
4279 | 773 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 773 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4280 | 774 | }; | 774 | }; |
4281 | 775 | 775 | ||
4283 | 776 | uchar sort_order_swe7_swedish_ci[] = { | 776 | static const uchar sort_order_swe7_swedish_ci[] = { |
4284 | 777 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 777 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4285 | 778 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 778 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4286 | 779 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 779 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4287 | @@ -792,7 +792,7 @@ | |||
4288 | 792 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 792 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4289 | 793 | }; | 793 | }; |
4290 | 794 | 794 | ||
4292 | 795 | uint16 to_uni_swe7_swedish_ci[] = { | 795 | static const uint16 to_uni_swe7_swedish_ci[] = { |
4293 | 796 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 796 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4294 | 797 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 797 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4295 | 798 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 798 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4296 | @@ -830,7 +830,7 @@ | |||
4297 | 830 | #endif | 830 | #endif |
4298 | 831 | 831 | ||
4299 | 832 | #ifdef HAVE_CHARSET_ascii | 832 | #ifdef HAVE_CHARSET_ascii |
4301 | 833 | uchar ctype_ascii_general_ci[] = { | 833 | static const uchar ctype_ascii_general_ci[] = { |
4302 | 834 | 0x00, | 834 | 0x00, |
4303 | 835 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 835 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4304 | 836 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 836 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4305 | @@ -850,7 +850,7 @@ | |||
4306 | 850 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 | 850 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 |
4307 | 851 | }; | 851 | }; |
4308 | 852 | 852 | ||
4310 | 853 | uchar to_lower_ascii_general_ci[] = { | 853 | static const uchar to_lower_ascii_general_ci[] = { |
4311 | 854 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 854 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4312 | 855 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 855 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4313 | 856 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 856 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4314 | @@ -869,45 +869,45 @@ | |||
4315 | 869 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 869 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4316 | 870 | }; | 870 | }; |
4317 | 871 | 871 | ||
4357 | 872 | uchar to_upper_ascii_general_ci[] = { | 872 | static const uchar to_upper_ascii_general_ci[] = { |
4358 | 873 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 873 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4359 | 874 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 874 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4360 | 875 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 875 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4361 | 876 | 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F, | 876 | 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F, |
4362 | 877 | 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, | 877 | 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, |
4363 | 878 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, | 878 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, |
4364 | 879 | 0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, | 879 | 0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, |
4365 | 880 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F, | 880 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F, |
4366 | 881 | 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, | 881 | 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, |
4367 | 882 | 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, | 882 | 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, |
4368 | 883 | 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, | 883 | 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, |
4369 | 884 | 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, | 884 | 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, |
4370 | 885 | 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, | 885 | 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, |
4371 | 886 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, | 886 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, |
4372 | 887 | 0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, | 887 | 0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, |
4373 | 888 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 888 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4374 | 889 | }; | 889 | }; |
4375 | 890 | 890 | ||
4376 | 891 | uchar sort_order_ascii_general_ci[] = { | 891 | static const uchar sort_order_ascii_general_ci[] = { |
4377 | 892 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 892 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4378 | 893 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 893 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4379 | 894 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 894 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4380 | 895 | 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F, | 895 | 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F, |
4381 | 896 | 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, | 896 | 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, |
4382 | 897 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, | 897 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, |
4383 | 898 | 0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, | 898 | 0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, |
4384 | 899 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F, | 899 | 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F, |
4385 | 900 | 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, | 900 | 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, |
4386 | 901 | 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, | 901 | 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, |
4387 | 902 | 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, | 902 | 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, |
4388 | 903 | 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, | 903 | 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, |
4389 | 904 | 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, | 904 | 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, |
4390 | 905 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, | 905 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, |
4391 | 906 | 0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, | 906 | 0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, |
4392 | 907 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 907 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4393 | 908 | }; | 908 | }; |
4394 | 909 | 909 | ||
4395 | 910 | uint16 to_uni_ascii_general_ci[] = { | 910 | static const uint16 to_uni_ascii_general_ci[] = { |
4396 | 911 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 911 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4397 | 912 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 912 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4398 | 913 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 913 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4399 | @@ -945,7 +945,7 @@ | |||
4400 | 945 | #endif | 945 | #endif |
4401 | 946 | 946 | ||
4402 | 947 | #ifdef HAVE_CHARSET_cp1251 | 947 | #ifdef HAVE_CHARSET_cp1251 |
4404 | 948 | uchar ctype_cp1251_bulgarian_ci[] = { | 948 | static const uchar ctype_cp1251_bulgarian_ci[] = { |
4405 | 949 | 0x00, | 949 | 0x00, |
4406 | 950 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 950 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4407 | 951 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 951 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4408 | @@ -965,7 +965,7 @@ | |||
4409 | 965 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 965 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
4410 | 966 | }; | 966 | }; |
4411 | 967 | 967 | ||
4413 | 968 | uchar to_lower_cp1251_bulgarian_ci[] = { | 968 | static const uchar to_lower_cp1251_bulgarian_ci[] = { |
4414 | 969 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 969 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4415 | 970 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 970 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4416 | 971 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 971 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4417 | @@ -984,7 +984,7 @@ | |||
4418 | 984 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 984 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4419 | 985 | }; | 985 | }; |
4420 | 986 | 986 | ||
4422 | 987 | uchar to_upper_cp1251_bulgarian_ci[] = { | 987 | static const uchar to_upper_cp1251_bulgarian_ci[] = { |
4423 | 988 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 988 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4424 | 989 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 989 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4425 | 990 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 990 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4426 | @@ -1003,7 +1003,7 @@ | |||
4427 | 1003 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF | 1003 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF |
4428 | 1004 | }; | 1004 | }; |
4429 | 1005 | 1005 | ||
4431 | 1006 | uchar sort_order_cp1251_bulgarian_ci[] = { | 1006 | static const uchar sort_order_cp1251_bulgarian_ci[] = { |
4432 | 1007 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1007 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4433 | 1008 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1008 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4434 | 1009 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1009 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4435 | @@ -1022,7 +1022,7 @@ | |||
4436 | 1022 | 0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B | 1022 | 0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B |
4437 | 1023 | }; | 1023 | }; |
4438 | 1024 | 1024 | ||
4440 | 1025 | uint16 to_uni_cp1251_bulgarian_ci[] = { | 1025 | static const uint16 to_uni_cp1251_bulgarian_ci[] = { |
4441 | 1026 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1026 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4442 | 1027 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1027 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4443 | 1028 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1028 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4444 | @@ -1060,7 +1060,7 @@ | |||
4445 | 1060 | #endif | 1060 | #endif |
4446 | 1061 | 1061 | ||
4447 | 1062 | #ifdef HAVE_CHARSET_latin1 | 1062 | #ifdef HAVE_CHARSET_latin1 |
4449 | 1063 | uchar ctype_latin1_danish_ci[] = { | 1063 | static const uchar ctype_latin1_danish_ci[] = { |
4450 | 1064 | 0x00, | 1064 | 0x00, |
4451 | 1065 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1065 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4452 | 1066 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1066 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4453 | @@ -1080,7 +1080,7 @@ | |||
4454 | 1080 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 1080 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
4455 | 1081 | }; | 1081 | }; |
4456 | 1082 | 1082 | ||
4458 | 1083 | uchar to_lower_latin1_danish_ci[] = { | 1083 | static const uchar to_lower_latin1_danish_ci[] = { |
4459 | 1084 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1084 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4460 | 1085 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1085 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4461 | 1086 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1086 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4462 | @@ -1099,7 +1099,7 @@ | |||
4463 | 1099 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1099 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4464 | 1100 | }; | 1100 | }; |
4465 | 1101 | 1101 | ||
4467 | 1102 | uchar to_upper_latin1_danish_ci[] = { | 1102 | static const uchar to_upper_latin1_danish_ci[] = { |
4468 | 1103 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1103 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4469 | 1104 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1104 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4470 | 1105 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1105 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4471 | @@ -1118,7 +1118,7 @@ | |||
4472 | 1118 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 1118 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4473 | 1119 | }; | 1119 | }; |
4474 | 1120 | 1120 | ||
4476 | 1121 | uchar sort_order_latin1_danish_ci[] = { | 1121 | static const uchar sort_order_latin1_danish_ci[] = { |
4477 | 1122 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1122 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4478 | 1123 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1123 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4479 | 1124 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1124 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4480 | @@ -1137,7 +1137,7 @@ | |||
4481 | 1137 | 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5C,0xF7,0x5C,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF | 1137 | 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5C,0xF7,0x5C,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF |
4482 | 1138 | }; | 1138 | }; |
4483 | 1139 | 1139 | ||
4485 | 1140 | uint16 to_uni_latin1_danish_ci[] = { | 1140 | static const uint16 to_uni_latin1_danish_ci[] = { |
4486 | 1141 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1141 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4487 | 1142 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1142 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4488 | 1143 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1143 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4489 | @@ -1175,7 +1175,7 @@ | |||
4490 | 1175 | #endif | 1175 | #endif |
4491 | 1176 | 1176 | ||
4492 | 1177 | #ifdef HAVE_CHARSET_hebrew | 1177 | #ifdef HAVE_CHARSET_hebrew |
4494 | 1178 | uchar ctype_hebrew_general_ci[] = { | 1178 | static const uchar ctype_hebrew_general_ci[] = { |
4495 | 1179 | 0x00, | 1179 | 0x00, |
4496 | 1180 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1180 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4497 | 1181 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1181 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4498 | @@ -1195,7 +1195,7 @@ | |||
4499 | 1195 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x20,0x20,0x00 | 1195 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x20,0x20,0x00 |
4500 | 1196 | }; | 1196 | }; |
4501 | 1197 | 1197 | ||
4503 | 1198 | uchar to_lower_hebrew_general_ci[] = { | 1198 | static const uchar to_lower_hebrew_general_ci[] = { |
4504 | 1199 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1199 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4505 | 1200 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1200 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4506 | 1201 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1201 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4507 | @@ -1214,7 +1214,7 @@ | |||
4508 | 1214 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1214 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4509 | 1215 | }; | 1215 | }; |
4510 | 1216 | 1216 | ||
4512 | 1217 | uchar to_upper_hebrew_general_ci[] = { | 1217 | static const uchar to_upper_hebrew_general_ci[] = { |
4513 | 1218 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1218 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4514 | 1219 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1219 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4515 | 1220 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1220 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4516 | @@ -1233,7 +1233,7 @@ | |||
4517 | 1233 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1233 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4518 | 1234 | }; | 1234 | }; |
4519 | 1235 | 1235 | ||
4521 | 1236 | uchar sort_order_hebrew_general_ci[] = { | 1236 | static const uchar sort_order_hebrew_general_ci[] = { |
4522 | 1237 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1237 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4523 | 1238 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1238 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4524 | 1239 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1239 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4525 | @@ -1252,7 +1252,7 @@ | |||
4526 | 1252 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1252 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4527 | 1253 | }; | 1253 | }; |
4528 | 1254 | 1254 | ||
4530 | 1255 | uint16 to_uni_hebrew_general_ci[] = { | 1255 | static const uint16 to_uni_hebrew_general_ci[] = { |
4531 | 1256 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1256 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4532 | 1257 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1257 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4533 | 1258 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1258 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4534 | @@ -1290,7 +1290,7 @@ | |||
4535 | 1290 | #endif | 1290 | #endif |
4536 | 1291 | 1291 | ||
4537 | 1292 | #ifdef HAVE_CHARSET_latin7 | 1292 | #ifdef HAVE_CHARSET_latin7 |
4539 | 1293 | uchar ctype_latin7_estonian_cs[] = { | 1293 | static const uchar ctype_latin7_estonian_cs[] = { |
4540 | 1294 | 0x00, | 1294 | 0x00, |
4541 | 1295 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1295 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4542 | 1296 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1296 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4543 | @@ -1310,7 +1310,7 @@ | |||
4544 | 1310 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 | 1310 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 |
4545 | 1311 | }; | 1311 | }; |
4546 | 1312 | 1312 | ||
4548 | 1313 | uchar to_lower_latin7_estonian_cs[] = { | 1313 | static const uchar to_lower_latin7_estonian_cs[] = { |
4549 | 1314 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1314 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4550 | 1315 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1315 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4551 | 1316 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1316 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4552 | @@ -1329,7 +1329,7 @@ | |||
4553 | 1329 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1329 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4554 | 1330 | }; | 1330 | }; |
4555 | 1331 | 1331 | ||
4557 | 1332 | uchar to_upper_latin7_estonian_cs[] = { | 1332 | static const uchar to_upper_latin7_estonian_cs[] = { |
4558 | 1333 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1333 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4559 | 1334 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1334 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4560 | 1335 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1335 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4561 | @@ -1348,7 +1348,7 @@ | |||
4562 | 1348 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 1348 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4563 | 1349 | }; | 1349 | }; |
4564 | 1350 | 1350 | ||
4566 | 1351 | uchar sort_order_latin7_estonian_cs[] = { | 1351 | static const uchar sort_order_latin7_estonian_cs[] = { |
4567 | 1352 | 0x00,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x2E,0x2F,0x30,0x31,0x32,0x0A,0x0B, | 1352 | 0x00,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x2E,0x2F,0x30,0x31,0x32,0x0A,0x0B, |
4568 | 1353 | 0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, | 1353 | 0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, |
4569 | 1354 | 0x2C,0x33,0x34,0x35,0x36,0x37,0x38,0x27,0x39,0x3A,0x3B,0x5D,0x3C,0x28,0x3D,0x3E, | 1354 | 0x2C,0x33,0x34,0x35,0x36,0x37,0x38,0x27,0x39,0x3A,0x3B,0x5D,0x3C,0x28,0x3D,0x3E, |
4570 | @@ -1367,7 +1367,7 @@ | |||
4571 | 1367 | 0xDC,0xC3,0xC5,0xC9,0xCB,0xF3,0xF7,0x65,0xED,0xBD,0xD9,0xEB,0xF9,0xE2,0xE4,0x53 | 1367 | 0xDC,0xC3,0xC5,0xC9,0xCB,0xF3,0xF7,0x65,0xED,0xBD,0xD9,0xEB,0xF9,0xE2,0xE4,0x53 |
4572 | 1368 | }; | 1368 | }; |
4573 | 1369 | 1369 | ||
4575 | 1370 | uint16 to_uni_latin7_estonian_cs[] = { | 1370 | static const uint16 to_uni_latin7_estonian_cs[] = { |
4576 | 1371 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1371 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4577 | 1372 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1372 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4578 | 1373 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1373 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4579 | @@ -1405,7 +1405,7 @@ | |||
4580 | 1405 | #endif | 1405 | #endif |
4581 | 1406 | 1406 | ||
4582 | 1407 | #ifdef HAVE_CHARSET_latin2 | 1407 | #ifdef HAVE_CHARSET_latin2 |
4584 | 1408 | uchar ctype_latin2_hungarian_ci[] = { | 1408 | static const uchar ctype_latin2_hungarian_ci[] = { |
4585 | 1409 | 0x00, | 1409 | 0x00, |
4586 | 1410 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1410 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4587 | 1411 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1411 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4588 | @@ -1425,7 +1425,7 @@ | |||
4589 | 1425 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 | 1425 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 |
4590 | 1426 | }; | 1426 | }; |
4591 | 1427 | 1427 | ||
4593 | 1428 | uchar to_lower_latin2_hungarian_ci[] = { | 1428 | static const uchar to_lower_latin2_hungarian_ci[] = { |
4594 | 1429 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1429 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4595 | 1430 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1430 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4596 | 1431 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1431 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4597 | @@ -1444,7 +1444,7 @@ | |||
4598 | 1444 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1444 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4599 | 1445 | }; | 1445 | }; |
4600 | 1446 | 1446 | ||
4602 | 1447 | uchar to_upper_latin2_hungarian_ci[] = { | 1447 | static const uchar to_upper_latin2_hungarian_ci[] = { |
4603 | 1448 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1448 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4604 | 1449 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1449 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4605 | 1450 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1450 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4606 | @@ -1463,7 +1463,7 @@ | |||
4607 | 1463 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 1463 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4608 | 1464 | }; | 1464 | }; |
4609 | 1465 | 1465 | ||
4611 | 1466 | uchar sort_order_latin2_hungarian_ci[] = { | 1466 | static const uchar sort_order_latin2_hungarian_ci[] = { |
4612 | 1467 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1467 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4613 | 1468 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1468 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4614 | 1469 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1469 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4615 | @@ -1482,7 +1482,7 @@ | |||
4616 | 1482 | 0xFF,0x62,0x63,0x64,0x66,0x67,0x67,0xFF,0x6D,0x77,0x75,0x78,0x78,0x7E,0x74,0xFF | 1482 | 0xFF,0x62,0x63,0x64,0x66,0x67,0x67,0xFF,0x6D,0x77,0x75,0x78,0x78,0x7E,0x74,0xFF |
4617 | 1483 | }; | 1483 | }; |
4618 | 1484 | 1484 | ||
4620 | 1485 | uint16 to_uni_latin2_hungarian_ci[] = { | 1485 | static const uint16 to_uni_latin2_hungarian_ci[] = { |
4621 | 1486 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1486 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4622 | 1487 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1487 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4623 | 1488 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1488 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4624 | @@ -1520,7 +1520,7 @@ | |||
4625 | 1520 | #endif | 1520 | #endif |
4626 | 1521 | 1521 | ||
4627 | 1522 | #ifdef HAVE_CHARSET_koi8u | 1522 | #ifdef HAVE_CHARSET_koi8u |
4629 | 1523 | uchar ctype_koi8u_general_ci[] = { | 1523 | static const uchar ctype_koi8u_general_ci[] = { |
4630 | 1524 | 0x00, | 1524 | 0x00, |
4631 | 1525 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1525 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4632 | 1526 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1526 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4633 | @@ -1540,7 +1540,7 @@ | |||
4634 | 1540 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 | 1540 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 |
4635 | 1541 | }; | 1541 | }; |
4636 | 1542 | 1542 | ||
4638 | 1543 | uchar to_lower_koi8u_general_ci[] = { | 1543 | static const uchar to_lower_koi8u_general_ci[] = { |
4639 | 1544 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1544 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4640 | 1545 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1545 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4641 | 1546 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1546 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4642 | @@ -1559,7 +1559,7 @@ | |||
4643 | 1559 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF | 1559 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF |
4644 | 1560 | }; | 1560 | }; |
4645 | 1561 | 1561 | ||
4647 | 1562 | uchar to_upper_koi8u_general_ci[] = { | 1562 | static const uchar to_upper_koi8u_general_ci[] = { |
4648 | 1563 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1563 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4649 | 1564 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1564 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4650 | 1565 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1565 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4651 | @@ -1578,7 +1578,7 @@ | |||
4652 | 1578 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1578 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4653 | 1579 | }; | 1579 | }; |
4654 | 1580 | 1580 | ||
4656 | 1581 | uchar sort_order_koi8u_general_ci[] = { | 1581 | static const uchar sort_order_koi8u_general_ci[] = { |
4657 | 1582 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1582 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4658 | 1583 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1583 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4659 | 1584 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1584 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4660 | @@ -1597,7 +1597,7 @@ | |||
4661 | 1597 | 0x94,0xA4,0x95,0x96,0x97,0x98,0x89,0x82,0xA1,0xA0,0x8A,0x9D,0xA2,0x9E,0x9C,0x9F | 1597 | 0x94,0xA4,0x95,0x96,0x97,0x98,0x89,0x82,0xA1,0xA0,0x8A,0x9D,0xA2,0x9E,0x9C,0x9F |
4662 | 1598 | }; | 1598 | }; |
4663 | 1599 | 1599 | ||
4665 | 1600 | uint16 to_uni_koi8u_general_ci[] = { | 1600 | static const uint16 to_uni_koi8u_general_ci[] = { |
4666 | 1601 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1601 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4667 | 1602 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1602 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4668 | 1603 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1603 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4669 | @@ -1635,7 +1635,7 @@ | |||
4670 | 1635 | #endif | 1635 | #endif |
4671 | 1636 | 1636 | ||
4672 | 1637 | #ifdef HAVE_CHARSET_cp1251 | 1637 | #ifdef HAVE_CHARSET_cp1251 |
4674 | 1638 | uchar ctype_cp1251_ukrainian_ci[] = { | 1638 | static const uchar ctype_cp1251_ukrainian_ci[] = { |
4675 | 1639 | 0x00, | 1639 | 0x00, |
4676 | 1640 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1640 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4677 | 1641 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1641 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4678 | @@ -1655,7 +1655,7 @@ | |||
4679 | 1655 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 1655 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
4680 | 1656 | }; | 1656 | }; |
4681 | 1657 | 1657 | ||
4683 | 1658 | uchar to_lower_cp1251_ukrainian_ci[] = { | 1658 | static const uchar to_lower_cp1251_ukrainian_ci[] = { |
4684 | 1659 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1659 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4685 | 1660 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1660 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4686 | 1661 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1661 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4687 | @@ -1674,7 +1674,7 @@ | |||
4688 | 1674 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1674 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4689 | 1675 | }; | 1675 | }; |
4690 | 1676 | 1676 | ||
4692 | 1677 | uchar to_upper_cp1251_ukrainian_ci[] = { | 1677 | static const uchar to_upper_cp1251_ukrainian_ci[] = { |
4693 | 1678 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1678 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4694 | 1679 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1679 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4695 | 1680 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1680 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4696 | @@ -1693,7 +1693,7 @@ | |||
4697 | 1693 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF | 1693 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF |
4698 | 1694 | }; | 1694 | }; |
4699 | 1695 | 1695 | ||
4701 | 1696 | uchar sort_order_cp1251_ukrainian_ci[] = { | 1696 | static const uchar sort_order_cp1251_ukrainian_ci[] = { |
4702 | 1697 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1697 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4703 | 1698 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1698 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4704 | 1699 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1699 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4705 | @@ -1712,7 +1712,7 @@ | |||
4706 | 1712 | 0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xA0,0xA1,0xA2,0xA3,0xA4 | 1712 | 0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xA0,0xA1,0xA2,0xA3,0xA4 |
4707 | 1713 | }; | 1713 | }; |
4708 | 1714 | 1714 | ||
4710 | 1715 | uint16 to_uni_cp1251_ukrainian_ci[] = { | 1715 | static const uint16 to_uni_cp1251_ukrainian_ci[] = { |
4711 | 1716 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1716 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4712 | 1717 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1717 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4713 | 1718 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1718 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4714 | @@ -1750,7 +1750,7 @@ | |||
4715 | 1750 | #endif | 1750 | #endif |
4716 | 1751 | 1751 | ||
4717 | 1752 | #ifdef HAVE_CHARSET_greek | 1752 | #ifdef HAVE_CHARSET_greek |
4719 | 1753 | uchar ctype_greek_general_ci[] = { | 1753 | static const uchar ctype_greek_general_ci[] = { |
4720 | 1754 | 0x00, | 1754 | 0x00, |
4721 | 1755 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1755 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4722 | 1756 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1756 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4723 | @@ -1770,7 +1770,7 @@ | |||
4724 | 1770 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 | 1770 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 |
4725 | 1771 | }; | 1771 | }; |
4726 | 1772 | 1772 | ||
4728 | 1773 | uchar to_lower_greek_general_ci[] = { | 1773 | static const uchar to_lower_greek_general_ci[] = { |
4729 | 1774 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1774 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4730 | 1775 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1775 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4731 | 1776 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1776 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4732 | @@ -1789,7 +1789,7 @@ | |||
4733 | 1789 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1789 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4734 | 1790 | }; | 1790 | }; |
4735 | 1791 | 1791 | ||
4737 | 1792 | uchar to_upper_greek_general_ci[] = { | 1792 | static const uchar to_upper_greek_general_ci[] = { |
4738 | 1793 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1793 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4739 | 1794 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1794 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4740 | 1795 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1795 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4741 | @@ -1808,7 +1808,7 @@ | |||
4742 | 1808 | 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xCF,0xD5,0xD9,0xFF | 1808 | 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xCF,0xD5,0xD9,0xFF |
4743 | 1809 | }; | 1809 | }; |
4744 | 1810 | 1810 | ||
4746 | 1811 | uchar sort_order_greek_general_ci[] = { | 1811 | static const uchar sort_order_greek_general_ci[] = { |
4747 | 1812 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1812 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4748 | 1813 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1813 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4749 | 1814 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1814 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4750 | @@ -1827,7 +1827,7 @@ | |||
4751 | 1827 | 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xC9,0xD5,0xCF,0xD5,0xD9,0xFF | 1827 | 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xC9,0xD5,0xCF,0xD5,0xD9,0xFF |
4752 | 1828 | }; | 1828 | }; |
4753 | 1829 | 1829 | ||
4755 | 1830 | uint16 to_uni_greek_general_ci[] = { | 1830 | static const uint16 to_uni_greek_general_ci[] = { |
4756 | 1831 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1831 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4757 | 1832 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1832 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4758 | 1833 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1833 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4759 | @@ -1865,7 +1865,7 @@ | |||
4760 | 1865 | #endif | 1865 | #endif |
4761 | 1866 | 1866 | ||
4762 | 1867 | #ifdef HAVE_CHARSET_cp1250 | 1867 | #ifdef HAVE_CHARSET_cp1250 |
4764 | 1868 | uchar ctype_cp1250_general_ci[] = { | 1868 | static const uchar ctype_cp1250_general_ci[] = { |
4765 | 1869 | 0x00, | 1869 | 0x00, |
4766 | 1870 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1870 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4767 | 1871 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1871 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4768 | @@ -1885,7 +1885,7 @@ | |||
4769 | 1885 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 | 1885 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 |
4770 | 1886 | }; | 1886 | }; |
4771 | 1887 | 1887 | ||
4773 | 1888 | uchar to_lower_cp1250_general_ci[] = { | 1888 | static const uchar to_lower_cp1250_general_ci[] = { |
4774 | 1889 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1889 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4775 | 1890 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1890 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4776 | 1891 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1891 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4777 | @@ -1904,7 +1904,7 @@ | |||
4778 | 1904 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 1904 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4779 | 1905 | }; | 1905 | }; |
4780 | 1906 | 1906 | ||
4782 | 1907 | uchar to_upper_cp1250_general_ci[] = { | 1907 | static const uchar to_upper_cp1250_general_ci[] = { |
4783 | 1908 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1908 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4784 | 1909 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1909 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4785 | 1910 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1910 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4786 | @@ -1923,7 +1923,7 @@ | |||
4787 | 1923 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 1923 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4788 | 1924 | }; | 1924 | }; |
4789 | 1925 | 1925 | ||
4791 | 1926 | uchar sort_order_cp1250_general_ci[] = { | 1926 | static const uchar sort_order_cp1250_general_ci[] = { |
4792 | 1927 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 1927 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4793 | 1928 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 1928 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4794 | 1929 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 1929 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4795 | @@ -1942,7 +1942,7 @@ | |||
4796 | 1942 | 0x47,0x53,0x53,0x55,0x55,0x55,0x55,0xF7,0x58,0x5C,0x5C,0x5C,0x5C,0x60,0x5B,0xFF | 1942 | 0x47,0x53,0x53,0x55,0x55,0x55,0x55,0xF7,0x58,0x5C,0x5C,0x5C,0x5C,0x60,0x5B,0xFF |
4797 | 1943 | }; | 1943 | }; |
4798 | 1944 | 1944 | ||
4800 | 1945 | uint16 to_uni_cp1250_general_ci[] = { | 1945 | static const uint16 to_uni_cp1250_general_ci[] = { |
4801 | 1946 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 1946 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4802 | 1947 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 1947 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4803 | 1948 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 1948 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4804 | @@ -1980,7 +1980,7 @@ | |||
4805 | 1980 | #endif | 1980 | #endif |
4806 | 1981 | 1981 | ||
4807 | 1982 | #ifdef HAVE_CHARSET_latin2 | 1982 | #ifdef HAVE_CHARSET_latin2 |
4809 | 1983 | uchar ctype_latin2_croatian_ci[] = { | 1983 | static const uchar ctype_latin2_croatian_ci[] = { |
4810 | 1984 | 0x00, | 1984 | 0x00, |
4811 | 1985 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 1985 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4812 | 1986 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 1986 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4813 | @@ -2000,7 +2000,7 @@ | |||
4814 | 2000 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 | 2000 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 |
4815 | 2001 | }; | 2001 | }; |
4816 | 2002 | 2002 | ||
4818 | 2003 | uchar to_lower_latin2_croatian_ci[] = { | 2003 | static const uchar to_lower_latin2_croatian_ci[] = { |
4819 | 2004 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2004 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4820 | 2005 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2005 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4821 | 2006 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2006 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4822 | @@ -2019,7 +2019,7 @@ | |||
4823 | 2019 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 2019 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4824 | 2020 | }; | 2020 | }; |
4825 | 2021 | 2021 | ||
4827 | 2022 | uchar to_upper_latin2_croatian_ci[] = { | 2022 | static const uchar to_upper_latin2_croatian_ci[] = { |
4828 | 2023 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2023 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4829 | 2024 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2024 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4830 | 2025 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2025 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4831 | @@ -2038,7 +2038,7 @@ | |||
4832 | 2038 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 2038 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4833 | 2039 | }; | 2039 | }; |
4834 | 2040 | 2040 | ||
4836 | 2041 | uchar sort_order_latin2_croatian_ci[] = { | 2041 | static const uchar sort_order_latin2_croatian_ci[] = { |
4837 | 2042 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2042 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4838 | 2043 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2043 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4839 | 2044 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2044 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4840 | @@ -2057,7 +2057,7 @@ | |||
4841 | 2057 | 0x4A,0x57,0x57,0x59,0x59,0x59,0x59,0xFE,0x5D,0x64,0x64,0x64,0x64,0x69,0x62,0xFF | 2057 | 0x4A,0x57,0x57,0x59,0x59,0x59,0x59,0xFE,0x5D,0x64,0x64,0x64,0x64,0x69,0x62,0xFF |
4842 | 2058 | }; | 2058 | }; |
4843 | 2059 | 2059 | ||
4845 | 2060 | uint16 to_uni_latin2_croatian_ci[] = { | 2060 | static const uint16 to_uni_latin2_croatian_ci[] = { |
4846 | 2061 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 2061 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4847 | 2062 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 2062 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4848 | 2063 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 2063 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4849 | @@ -2095,7 +2095,7 @@ | |||
4850 | 2095 | #endif | 2095 | #endif |
4851 | 2096 | 2096 | ||
4852 | 2097 | #ifdef HAVE_CHARSET_cp1257 | 2097 | #ifdef HAVE_CHARSET_cp1257 |
4854 | 2098 | uchar ctype_cp1257_lithuanian_ci[] = { | 2098 | static const uchar ctype_cp1257_lithuanian_ci[] = { |
4855 | 2099 | 0x00, | 2099 | 0x00, |
4856 | 2100 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 2100 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4857 | 2101 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 2101 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4858 | @@ -2115,7 +2115,7 @@ | |||
4859 | 2115 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 | 2115 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 |
4860 | 2116 | }; | 2116 | }; |
4861 | 2117 | 2117 | ||
4863 | 2118 | uchar to_lower_cp1257_lithuanian_ci[] = { | 2118 | static const uchar to_lower_cp1257_lithuanian_ci[] = { |
4864 | 2119 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2119 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4865 | 2120 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2120 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4866 | 2121 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2121 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4867 | @@ -2134,7 +2134,7 @@ | |||
4868 | 2134 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 2134 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4869 | 2135 | }; | 2135 | }; |
4870 | 2136 | 2136 | ||
4872 | 2137 | uchar to_upper_cp1257_lithuanian_ci[] = { | 2137 | static const uchar to_upper_cp1257_lithuanian_ci[] = { |
4873 | 2138 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2138 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4874 | 2139 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2139 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4875 | 2140 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2140 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4876 | @@ -2153,7 +2153,7 @@ | |||
4877 | 2153 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF | 2153 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF |
4878 | 2154 | }; | 2154 | }; |
4879 | 2155 | 2155 | ||
4881 | 2156 | uchar sort_order_cp1257_lithuanian_ci[] = { | 2156 | static const uchar sort_order_cp1257_lithuanian_ci[] = { |
4882 | 2157 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2157 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4883 | 2158 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2158 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4884 | 2159 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2159 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4885 | @@ -2172,7 +2172,7 @@ | |||
4886 | 2172 | 0x5A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5E,0xFF,0xFF,0x5D,0xFF,0xFF,0xFF,0xFF | 2172 | 0x5A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5E,0xFF,0xFF,0x5D,0xFF,0xFF,0xFF,0xFF |
4887 | 2173 | }; | 2173 | }; |
4888 | 2174 | 2174 | ||
4890 | 2175 | uint16 to_uni_cp1257_lithuanian_ci[] = { | 2175 | static const uint16 to_uni_cp1257_lithuanian_ci[] = { |
4891 | 2176 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 2176 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4892 | 2177 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 2177 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4893 | 2178 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 2178 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4894 | @@ -2210,7 +2210,7 @@ | |||
4895 | 2210 | #endif | 2210 | #endif |
4896 | 2211 | 2211 | ||
4897 | 2212 | #ifdef HAVE_CHARSET_latin5 | 2212 | #ifdef HAVE_CHARSET_latin5 |
4899 | 2213 | uchar ctype_latin5_turkish_ci[] = { | 2213 | static const uchar ctype_latin5_turkish_ci[] = { |
4900 | 2214 | 0x00, | 2214 | 0x00, |
4901 | 2215 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 2215 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4902 | 2216 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 2216 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4903 | @@ -2230,7 +2230,7 @@ | |||
4904 | 2230 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 | 2230 | 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 |
4905 | 2231 | }; | 2231 | }; |
4906 | 2232 | 2232 | ||
4908 | 2233 | uchar to_lower_latin5_turkish_ci[] = { | 2233 | static const uchar to_lower_latin5_turkish_ci[] = { |
4909 | 2234 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2234 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4910 | 2235 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2235 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4911 | 2236 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2236 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4912 | @@ -2249,7 +2249,7 @@ | |||
4913 | 2249 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 2249 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4914 | 2250 | }; | 2250 | }; |
4915 | 2251 | 2251 | ||
4917 | 2252 | uchar to_upper_latin5_turkish_ci[] = { | 2252 | static const uchar to_upper_latin5_turkish_ci[] = { |
4918 | 2253 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2253 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4919 | 2254 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2254 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4920 | 2255 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2255 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4921 | @@ -2268,7 +2268,7 @@ | |||
4922 | 2268 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0x49,0xDE,0xFF | 2268 | 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0x49,0xDE,0xFF |
4923 | 2269 | }; | 2269 | }; |
4924 | 2270 | 2270 | ||
4926 | 2271 | uchar sort_order_latin5_turkish_ci[] = { | 2271 | static const uchar sort_order_latin5_turkish_ci[] = { |
4927 | 2272 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2272 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4928 | 2273 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2273 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4929 | 2274 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2274 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4930 | @@ -2287,7 +2287,7 @@ | |||
4931 | 2287 | 0x49,0x51,0x52,0x52,0x52,0x52,0x53,0xFA,0x52,0x5A,0x5A,0x5A,0x5B,0x4B,0x58,0x5F | 2287 | 0x49,0x51,0x52,0x52,0x52,0x52,0x53,0xFA,0x52,0x5A,0x5A,0x5A,0x5B,0x4B,0x58,0x5F |
4932 | 2288 | }; | 2288 | }; |
4933 | 2289 | 2289 | ||
4935 | 2290 | uint16 to_uni_latin5_turkish_ci[] = { | 2290 | static const uint16 to_uni_latin5_turkish_ci[] = { |
4936 | 2291 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 2291 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4937 | 2292 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 2292 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4938 | 2293 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 2293 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4939 | @@ -2325,7 +2325,7 @@ | |||
4940 | 2325 | #endif | 2325 | #endif |
4941 | 2326 | 2326 | ||
4942 | 2327 | #ifdef HAVE_CHARSET_armscii8 | 2327 | #ifdef HAVE_CHARSET_armscii8 |
4944 | 2328 | uchar ctype_armscii8_general_ci[] = { | 2328 | static const uchar ctype_armscii8_general_ci[] = { |
4945 | 2329 | 0x00, | 2329 | 0x00, |
4946 | 2330 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 2330 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4947 | 2331 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 2331 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4948 | @@ -2345,7 +2345,7 @@ | |||
4949 | 2345 | 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x10,0x10 | 2345 | 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x10,0x10 |
4950 | 2346 | }; | 2346 | }; |
4951 | 2347 | 2347 | ||
4953 | 2348 | uchar to_lower_armscii8_general_ci[] = { | 2348 | static const uchar to_lower_armscii8_general_ci[] = { |
4954 | 2349 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2349 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4955 | 2350 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2350 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4956 | 2351 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2351 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4957 | @@ -2364,7 +2364,7 @@ | |||
4958 | 2364 | 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFB,0xFB,0xFD,0xFD,0xFE,0xFF | 2364 | 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFB,0xFB,0xFD,0xFD,0xFE,0xFF |
4959 | 2365 | }; | 2365 | }; |
4960 | 2366 | 2366 | ||
4962 | 2367 | uchar to_upper_armscii8_general_ci[] = { | 2367 | static const uchar to_upper_armscii8_general_ci[] = { |
4963 | 2368 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2368 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4964 | 2369 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2369 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4965 | 2370 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2370 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4966 | @@ -2383,7 +2383,7 @@ | |||
4967 | 2383 | 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFE,0xFF | 2383 | 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFE,0xFF |
4968 | 2384 | }; | 2384 | }; |
4969 | 2385 | 2385 | ||
4971 | 2386 | uchar sort_order_armscii8_general_ci[] = { | 2386 | static const uchar sort_order_armscii8_general_ci[] = { |
4972 | 2387 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2387 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
4973 | 2388 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2388 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
4974 | 2389 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, | 2389 | 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, |
4975 | @@ -2402,7 +2402,7 @@ | |||
4976 | 2402 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF | 2402 | 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF |
4977 | 2403 | }; | 2403 | }; |
4978 | 2404 | 2404 | ||
4980 | 2405 | uint16 to_uni_armscii8_general_ci[] = { | 2405 | static const uint16 to_uni_armscii8_general_ci[] = { |
4981 | 2406 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, | 2406 | 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, |
4982 | 2407 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, | 2407 | 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |
4983 | 2408 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, | 2408 | 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, |
4984 | @@ -2440,7 +2440,7 @@ | |||
4985 | 2440 | #endif | 2440 | #endif |
4986 | 2441 | 2441 | ||
4987 | 2442 | #ifdef HAVE_CHARSET_cp866 | 2442 | #ifdef HAVE_CHARSET_cp866 |
4989 | 2443 | uchar ctype_cp866_general_ci[] = { | 2443 | static const uchar ctype_cp866_general_ci[] = { |
4990 | 2444 | 0x00, | 2444 | 0x00, |
4991 | 2445 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, | 2445 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, |
4992 | 2446 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, | 2446 | 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, |
4993 | @@ -2460,7 +2460,7 @@ | |||
4994 | 2460 | 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 | 2460 | 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 |
4995 | 2461 | }; | 2461 | }; |
4996 | 2462 | 2462 | ||
4998 | 2463 | uchar to_lower_cp866_general_ci[] = { | 2463 | static const uchar to_lower_cp866_general_ci[] = { |
4999 | 2464 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, | 2464 | 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, |
5000 | 2465 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, | 2465 | 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |
The diff has been truncated for viewing.
Makes CHARSET_INFO a const structure.
Allows compilers to make better choices.