Overview
Comment: | Add Unicode -> Codepage 437 conversion. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e66defc0731720f64bd7bc2d61f1137d |
User & Date: | js on 2014-01-19 14:17:06 |
Other Links: | manifest | tags |
Context
2014-01-22
| ||
02:55 | extra.mk.in: Add missing OFZIP variable. check-in: 22063057e1 user: js tags: trunk | |
2014-01-19
| ||
14:17 | Add Unicode -> Codepage 437 conversion. check-in: e66defc073 user: js tags: trunk | |
14:10 | Clean up Unicode -> * conversions. check-in: 7c26551b67 user: js tags: trunk | |
Changes
Modified src/OFString.m from [04e1844f94] to [f9a79a3ca8].
︙ | ︙ | |||
74 75 76 77 78 79 80 81 82 83 84 85 86 87 | - (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding lossy: (bool)lossy; @end extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, char*, size_t, bool); extern bool of_unicode_to_windows_1252(const of_unichar_t*, char*, size_t, bool); /* References for static linking */ void _references_to_categories_of_OFString(void) { _OFString_Hashing_reference = 1; _OFString_JSONValue_reference = 1; _OFString_Serialization_reference = 1; | > > | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding lossy: (bool)lossy; @end extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, char*, size_t, bool); extern bool of_unicode_to_windows_1252(const of_unichar_t*, char*, size_t, bool); extern bool of_unicode_to_codepage_437(const of_unichar_t*, char*, size_t, bool); /* References for static linking */ void _references_to_categories_of_OFString(void) { _OFString_Hashing_reference = 1; _OFString_JSONValue_reference = 1; _OFString_Serialization_reference = 1; |
︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 | if (!of_unicode_to_windows_1252(characters, cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; default: @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } } | > > > > > > > > > > > | 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 | if (!of_unicode_to_windows_1252(characters, cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; case OF_STRING_ENCODING_CODEPAGE_437: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_codepage_437(characters, cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; default: @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } } |
︙ | ︙ | |||
1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 | } break; case OF_STRING_ENCODING_ASCII: case OF_STRING_ENCODING_ISO_8859_1: case OF_STRING_ENCODING_ISO_8859_15: case OF_STRING_ENCODING_WINDOWS_1252: cString = [object allocMemoryWithSize: length + 1]; [self OF_getCString: cString maxLength: length + 1 encoding: encoding lossy: lossy]; | > | 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 | } break; case OF_STRING_ENCODING_ASCII: case OF_STRING_ENCODING_ISO_8859_1: case OF_STRING_ENCODING_ISO_8859_15: case OF_STRING_ENCODING_WINDOWS_1252: case OF_STRING_ENCODING_CODEPAGE_437: cString = [object allocMemoryWithSize: length + 1]; [self OF_getCString: cString maxLength: length + 1 encoding: encoding lossy: lossy]; |
︙ | ︙ | |||
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | } return UTF8StringLength; case OF_STRING_ENCODING_ASCII: case OF_STRING_ENCODING_ISO_8859_1: case OF_STRING_ENCODING_ISO_8859_15: case OF_STRING_ENCODING_WINDOWS_1252: return [self length]; default: @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } } | > | 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 | } return UTF8StringLength; case OF_STRING_ENCODING_ASCII: case OF_STRING_ENCODING_ISO_8859_1: case OF_STRING_ENCODING_ISO_8859_15: case OF_STRING_ENCODING_WINDOWS_1252: case OF_STRING_ENCODING_CODEPAGE_437: return [self length]; default: @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } } |
︙ | ︙ |
Modified src/codepage_437.m from [d58d872dc4] to [9a8ab0e727].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFString.h" const of_char16_t of_codepage_437[128] = { 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFString.h" #import "macros.h" const of_char16_t of_codepage_437[128] = { 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; bool of_unicode_to_codepage_437(const of_unichar_t *input, char *output, size_t length, bool lossy) { size_t i; for (i = 0; i < length; i++) { of_unichar_t c = input[i]; if OF_UNLIKELY (c > 0x7F) { if OF_UNLIKELY (c > 0xFFFF) { if (lossy) { output[i] = '?'; continue; } else return false; } switch ((of_char16_t)c) { case 0xC7: output[i] = 0x80; break; case 0xFC: output[i] = 0x81; break; case 0xE9: output[i] = 0x82; break; case 0xE2: output[i] = 0x83; break; case 0xE4: output[i] = 0x84; break; case 0xE0: output[i] = 0x85; break; case 0xE5: output[i] = 0x86; break; case 0xE7: output[i] = 0x87; break; case 0xEA: output[i] = 0x88; break; case 0xEB: output[i] = 0x89; break; case 0xE8: output[i] = 0x8A; break; case 0xEF: output[i] = 0x8B; break; case 0xEE: output[i] = 0x8C; break; case 0xEC: output[i] = 0x8D; break; case 0xC4: output[i] = 0x8E; break; case 0xC5: output[i] = 0x8F; break; case 0xC9: output[i] = 0x90; break; case 0xE6: output[i] = 0x91; break; case 0xC6: output[i] = 0x92; break; case 0xF4: output[i] = 0x93; break; case 0xF6: output[i] = 0x94; break; case 0xF2: output[i] = 0x95; break; case 0xFB: output[i] = 0x96; break; case 0xF9: output[i] = 0x97; break; case 0xFF: output[i] = 0x98; break; case 0xD6: output[i] = 0x99; break; case 0xDC: output[i] = 0x9A; break; case 0xA2: output[i] = 0x9B; break; case 0xA3: output[i] = 0x9C; break; case 0xA5: output[i] = 0x9D; break; case 0x20A7: output[i] = 0x9E; break; case 0x192: output[i] = 0x9F; break; case 0xE1: output[i] = 0xA0; break; case 0xED: output[i] = 0xA1; break; case 0xF3: output[i] = 0xA2; break; case 0xFA: output[i] = 0xA3; break; case 0xF1: output[i] = 0xA4; break; case 0xD1: output[i] = 0xA5; break; case 0xAA: output[i] = 0xA6; break; case 0xBA: output[i] = 0xA7; break; case 0xBF: output[i] = 0xA8; break; case 0x2310: output[i] = 0xA9; break; case 0xAC: output[i] = 0xAA; break; case 0xBD: output[i] = 0xAB; break; case 0xBC: output[i] = 0xAC; break; case 0xA1: output[i] = 0xAD; break; case 0xAB: output[i] = 0xAE; break; case 0xBB: output[i] = 0xAF; break; case 0x2591: output[i] = 0xB0; break; case 0x2592: output[i] = 0xB1; break; case 0x2593: output[i] = 0xB2; break; case 0x2502: output[i] = 0xB3; break; case 0x2524: output[i] = 0xB4; break; case 0x2561: output[i] = 0xB5; break; case 0x2562: output[i] = 0xB6; break; case 0x2556: output[i] = 0xB7; break; case 0x2555: output[i] = 0xB8; break; case 0x2563: output[i] = 0xB9; break; case 0x2551: output[i] = 0xBA; break; case 0x2557: output[i] = 0xBB; break; case 0x255D: output[i] = 0xBC; break; case 0x255C: output[i] = 0xBD; break; case 0x255B: output[i] = 0xBE; break; case 0x2510: output[i] = 0xBF; break; case 0x2514: output[i] = 0xC0; break; case 0x2534: output[i] = 0xC1; break; case 0x252C: output[i] = 0xC2; break; case 0x251C: output[i] = 0xC3; break; case 0x2500: output[i] = 0xC4; break; case 0x253C: output[i] = 0xC5; break; case 0x255E: output[i] = 0xC6; break; case 0x255F: output[i] = 0xC7; break; case 0x255A: output[i] = 0xC8; break; case 0x2554: output[i] = 0xC9; break; case 0x2569: output[i] = 0xCA; break; case 0x2566: output[i] = 0xCB; break; case 0x2560: output[i] = 0xCC; break; case 0x2550: output[i] = 0xCD; break; case 0x256C: output[i] = 0xCE; break; case 0x2567: output[i] = 0xCF; break; case 0x2568: output[i] = 0xD0; break; case 0x2564: output[i] = 0xD1; break; case 0x2565: output[i] = 0xD2; break; case 0x2559: output[i] = 0xD3; break; case 0x2558: output[i] = 0xD4; break; case 0x2552: output[i] = 0xD5; break; case 0x2553: output[i] = 0xD6; break; case 0x256B: output[i] = 0xD7; break; case 0x256A: output[i] = 0xD8; break; case 0x2518: output[i] = 0xD9; break; case 0x250C: output[i] = 0xDA; break; case 0x2588: output[i] = 0xDB; break; case 0x2584: output[i] = 0xDC; break; case 0x258C: output[i] = 0xDD; break; case 0x2590: output[i] = 0xDE; break; case 0x2580: output[i] = 0xDF; break; case 0x3B1: output[i] = 0xE0; break; case 0xDF: output[i] = 0xE1; break; case 0x393: output[i] = 0xE2; break; case 0x3C0: output[i] = 0xE3; break; case 0x3A3: output[i] = 0xE4; break; case 0x3C3: output[i] = 0xE5; break; case 0xB5: output[i] = 0xE6; break; case 0x3C4: output[i] = 0xE7; break; case 0x3A6: output[i] = 0xE8; break; case 0x398: output[i] = 0xE9; break; case 0x3A9: output[i] = 0xEA; break; case 0x3B4: output[i] = 0xEB; break; case 0x221E: output[i] = 0xEC; break; case 0x3C6: output[i] = 0xED; break; case 0x3B5: output[i] = 0xEE; break; case 0x2229: output[i] = 0xEF; break; case 0x2261: output[i] = 0xF0; break; case 0xB1: output[i] = 0xF1; break; case 0x2265: output[i] = 0xF2; break; case 0x2264: output[i] = 0xF3; break; case 0x2320: output[i] = 0xF4; break; case 0x2321: output[i] = 0xF5; break; case 0xF7: output[i] = 0xF6; break; case 0x2248: output[i] = 0xF7; break; case 0xB0: output[i] = 0xF8; break; case 0x2219: output[i] = 0xF9; break; case 0xB7: output[i] = 0xFA; break; case 0x221A: output[i] = 0xFB; break; case 0x207F: output[i] = 0xFC; break; case 0xB2: output[i] = 0xFD; break; case 0x25A0: output[i] = 0xFE; break; case 0xA0: output[i] = 0xFF; break; default: if (lossy) output[i] = '?'; else return false; break; } } else output[i] = (uint8_t)c; } return true; } |
Modified tests/OFStringTests.m from [da479fb931] to [8c5b4654b9].
︙ | ︙ | |||
253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | !strcmp([@"This is ä t€st…" cStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252], "This is \xE4 t\x80st\x85")) EXPECT_EXCEPTION(@"Conversion of Unicode to Windows-1252 #2", OFInvalidEncodingException, [@"This is ä t€st…‼" cStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252]) TEST(@"Lossy conversion of Unicode to ASCII", !strcmp([@"This is a tést" lossyCStringWithEncoding: OF_STRING_ENCODING_ASCII], "This is a t?st")) TEST(@"Lossy conversion of Unicode to ISO-8859-1", !strcmp([@"This is ä t€st" lossyCStringWithEncoding: OF_STRING_ENCODING_ISO_8859_1], "This is \xE4 t?st")) TEST(@"Lossy conversion of Unicode to ISO-8859-15", !strcmp([@"This is ä t€st…" lossyCStringWithEncoding: OF_STRING_ENCODING_ISO_8859_15], "This is \xE4 t\xA4st?")) TEST(@"Lossy conversion of Unicode to Windows-1252", !strcmp([@"This is ä t€st…‼" lossyCStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252], "This is \xE4 t\x80st\x85?")) TEST(@"+[stringWithFormat:]", [(s[0] = [OFMutableString stringWithFormat: @"%@:%d", @"test", 123]) isEqual: @"test:123"]) TEST(@"-[appendFormat:]", R(([s[0] appendFormat: @"%02X", 15])) && [s[0] isEqual: @"test:1230F"]) | > > > > > > > > > > > > | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | !strcmp([@"This is ä t€st…" cStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252], "This is \xE4 t\x80st\x85")) EXPECT_EXCEPTION(@"Conversion of Unicode to Windows-1252 #2", OFInvalidEncodingException, [@"This is ä t€st…‼" cStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252]) TEST(@"Conversion of Unicode to Codepage 437 #1", !strcmp([@"Tést strîng ░▒▓" cStringWithEncoding: OF_STRING_ENCODING_CODEPAGE_437], "T\x82st str\x8Cng \xB0\xB1\xB2")) EXPECT_EXCEPTION(@"Conversion of Unicode to Codepage 437 #2", OFInvalidEncodingException, [@"T€st strîng ░▒▓" cStringWithEncoding: OF_STRING_ENCODING_CODEPAGE_437]) TEST(@"Lossy conversion of Unicode to ASCII", !strcmp([@"This is a tést" lossyCStringWithEncoding: OF_STRING_ENCODING_ASCII], "This is a t?st")) TEST(@"Lossy conversion of Unicode to ISO-8859-1", !strcmp([@"This is ä t€st" lossyCStringWithEncoding: OF_STRING_ENCODING_ISO_8859_1], "This is \xE4 t?st")) TEST(@"Lossy conversion of Unicode to ISO-8859-15", !strcmp([@"This is ä t€st…" lossyCStringWithEncoding: OF_STRING_ENCODING_ISO_8859_15], "This is \xE4 t\xA4st?")) TEST(@"Lossy conversion of Unicode to Windows-1252", !strcmp([@"This is ä t€st…‼" lossyCStringWithEncoding: OF_STRING_ENCODING_WINDOWS_1252], "This is \xE4 t\x80st\x85?")) TEST(@"Lossy conversion of Unicode to Codepage 437", !strcmp([@"T€st strîng ░▒▓" lossyCStringWithEncoding: OF_STRING_ENCODING_CODEPAGE_437], "T?st str\x8Cng \xB0\xB1\xB2")) TEST(@"+[stringWithFormat:]", [(s[0] = [OFMutableString stringWithFormat: @"%@:%d", @"test", 123]) isEqual: @"test:123"]) TEST(@"-[appendFormat:]", R(([s[0] appendFormat: @"%02X", 15])) && [s[0] isEqual: @"test:1230F"]) |
︙ | ︙ |