X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fchartable.h;h=fdb7c315023cbd2b471d58a4568949719c22a366;hb=2e2adfa5d7ac912434bef5b8a9b25cfb14d4a4a6;hp=fc5b8f34a9ecc76eda7420443dec27b2098ec569;hpb=5451cada955bd952f5c732857e27ed676e873aa1;p=libucw.git

diff --git a/charset/chartable.h b/charset/chartable.h
index fc5b8f34..fdb7c315 100644
--- a/charset/chartable.h
+++ b/charset/chartable.h
@@ -1,6 +1,6 @@
 /* Generated by tabgen 1.0, please don't edit manually. */
 
-static unsigned short int input_to_x[8][256] = {
+static unsigned short int input_to_x[10][256] = {
 
 /* set/ascii */
 {
@@ -82,6 +82,26 @@ static unsigned short int input_to_x[8][256] = {
 240, 306, 307, 243, 244, 308, 246, 247, 309, 310, 250, 311, 252, 253, 312, 313,
 },
 
+/* set/win-1252 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 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,
+337, 129, 314, 338, 315, 339, 317, 318, 340, 319, 262, 320, 341, 141, 266, 143,
+144, 321, 322, 323, 324, 325, 326, 327, 342, 328, 274, 329, 343, 157, 279, 344,
+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,
+},
+
 /* set/kamen-ctrl */
 {
 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -91,15 +111,15 @@ static unsigned short int input_to_x[8][256] = {
 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, 337,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 345,
 285, 252, 233, 304, 228, 288, 264, 301, 303, 287, 283, 205, 271, 299, 196, 193,
 201, 279, 266, 244, 246, 211, 310, 218, 253, 214, 220, 262, 260, 221, 293, 276,
 225, 237, 243, 250, 307, 291, 294, 212, 274, 309, 297, 281, 188, 167, 187, 171,
-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, 334, 392, 393, 394, 395, 396, 397, 398, 399, 400,
-401, 177, 402, 403, 404, 405, 247, 406, 176, 407, 183, 408, 409, 178, 410, 160,
+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, 334, 400, 401, 402, 403, 404, 405, 406, 407, 408,
+409, 177, 410, 411, 412, 413, 247, 414, 176, 415, 183, 416, 417, 178, 418, 160,
 },
 
 /* set/koi8 */
@@ -116,9 +136,9 @@ static unsigned short int input_to_x[8][256] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 225, 256, 301, 304, 303, 297, 411, 252, 237, 310, 299, 271, 246, 307, 243,
-244, 228, 309, 274, 276, 250, 256, 233, 224, 253, 279, 256, 330, 256, 412, 256,
-180, 193, 256, 285, 288, 287, 281, 413, 220, 205, 294, 283, 260, 214, 291, 211,
+256, 225, 256, 301, 304, 303, 297, 419, 252, 237, 310, 299, 271, 246, 307, 243,
+244, 228, 309, 274, 276, 250, 256, 233, 224, 253, 279, 256, 330, 256, 420, 256,
+180, 193, 256, 285, 288, 287, 281, 421, 220, 205, 294, 283, 260, 214, 291, 211,
 212, 196, 293, 262, 264, 218, 256, 201, 282, 221, 266, 256, 256, 256, 176, 256,
 },
 
@@ -131,15 +151,15 @@ static unsigned short int input_to_x[8][256] = {
 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, 337,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 345,
 199, 252, 233, 226, 228, 310, 300, 231, 270, 235, 292, 308, 238, 265, 196, 284,
 201, 283, 299, 244, 246, 260, 271, 261, 272, 214, 220, 264, 276, 259, 215, 301,
 225, 237, 243, 250, 257, 268, 266, 279, 286, 302, 172, 277, 285, 275, 187, 171,
-338, 339, 340, 341, 342, 193, 194, 287, 263, 347, 348, 349, 350, 267, 280, 353,
-354, 355, 356, 357, 358, 359, 282, 298, 362, 363, 364, 365, 366, 367, 368, 164,
-240, 208, 288, 203, 304, 291, 205, 206, 303, 379, 380, 381, 382, 296, 294, 385,
+346, 347, 348, 349, 350, 193, 194, 287, 263, 355, 356, 357, 358, 267, 280, 361,
+362, 363, 364, 365, 366, 367, 282, 298, 370, 371, 372, 373, 374, 375, 376, 164,
+240, 208, 288, 203, 304, 291, 205, 206, 303, 387, 388, 389, 390, 296, 294, 393,
 211, 223, 212, 290, 306, 307, 262, 274, 281, 218, 297, 295, 253, 221, 312, 180,
-414, 336, 333, 330, 331, 167, 247, 335, 256, 332, 313, 311, 293, 309, 410, 160,
+422, 336, 333, 330, 331, 167, 247, 335, 256, 332, 313, 311, 293, 309, 418, 160,
 },
 
 /* set/macce */
@@ -152,18 +172,38 @@ static unsigned short int input_to_x[8][256] = {
 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,
-196, 415, 416, 201, 257, 214, 220, 225, 268, 285, 228, 301, 284, 300, 233, 265,
-277, 288, 237, 304, 417, 418, 419, 243, 420, 244, 246, 245, 250, 287, 303, 252,
-317, 176, 286, 163, 167, 325, 182, 223, 174, 169, 328, 302, 332, 421, 422, 423,
-424, 425, 403, 402, 426, 427, 428, 429, 270, 430, 431, 260, 271, 283, 299, 432,
-433, 290, 172, 408, 306, 291, 434, 171, 187, 316, 160, 307, 292, 213, 308, 435,
-327, 326, 323, 324, 321, 322, 247, 436, 437, 281, 297, 293, 320, 329, 309, 438,
-439, 262, 314, 315, 274, 261, 272, 193, 264, 276, 205, 266, 279, 440, 211, 212,
-441, 294, 218, 310, 295, 311, 442, 443, 221, 253, 444, 267, 259, 280, 445, 330,
+196, 423, 424, 201, 257, 214, 220, 225, 268, 285, 228, 301, 284, 300, 233, 265,
+277, 288, 237, 304, 425, 426, 427, 243, 428, 244, 246, 245, 250, 287, 303, 252,
+317, 176, 286, 163, 167, 325, 182, 223, 174, 169, 328, 302, 332, 429, 430, 431,
+432, 433, 411, 410, 434, 435, 436, 437, 270, 438, 439, 260, 271, 283, 299, 440,
+441, 290, 172, 416, 306, 291, 442, 171, 187, 316, 160, 307, 292, 213, 308, 443,
+327, 326, 323, 324, 321, 322, 247, 444, 445, 281, 297, 293, 320, 329, 309, 446,
+447, 262, 314, 315, 274, 261, 272, 193, 264, 276, 205, 266, 279, 448, 211, 212,
+449, 294, 218, 310, 295, 311, 450, 451, 221, 253, 452, 267, 259, 280, 453, 330,
+},
+
+/* set/cork */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 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,
+282, 257, 284, 285, 288, 287, 286, 454, 283, 260, 259, 290, 291, 455, 292, 281,
+293, 261, 262, 263, 264, 296, 295, 294, 344, 265, 266, 267, 456, 457, 240, 167,
+298, 268, 300, 301, 304, 303, 302, 458, 299, 271, 270, 306, 307, 459, 308, 297,
+309, 272, 274, 275, 276, 312, 311, 310, 255, 277, 279, 280, 460, 161, 191, 163,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 341, 216, 217, 218, 219, 220, 221, 222, 461,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 343, 248, 249, 250, 251, 252, 253, 254, 223,
 },
 };
 
-static unsigned short int x_to_uni[446] = {
+static unsigned short int x_to_uni[462] = {
 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 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,
@@ -185,13 +225,14 @@ static unsigned short int x_to_uni[446] = {
 270, 272, 323, 327, 336, 344, 366, 368, 354, 341, 259, 314, 263, 269, 281, 283,
 271, 273, 324, 328, 337, 345, 367, 369, 355, 729, 8218, 8222, 3759, 8224, 8225, 8240,
 8249, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 8482, 8250, 780, 774, 776, 808, 956, 807,
-779, 8962, 9617, 9618, 9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564,
-9563, 9488, 9492, 9524, 9516, 9500, 9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552,
-9580, 9575, 9576, 9572, 9573, 9561, 9560, 9554, 9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612,
-9616, 9600, 945, 946, 404, 960, 931, 963, 964, 934, 920, 937, 948, 8734, 966, 8712,
-8745, 8781, 8805, 8804, 8992, 8993, 8776, 8729, 8730, 8319, 9632, 61442, 770, 61440, 8801, 256,
-257, 274, 275, 278, 279, 8800, 501, 302, 303, 298, 299, 310, 8706, 8721, 315, 316,
-325, 326, 916, 332, 8900, 333, 342, 343, 362, 363, 370, 371, 311, 290, 
+779, 8364, 402, 8230, 710, 338, 732, 339, 376, 8962, 9617, 9618, 9619, 9474, 9508, 9569,
+9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488, 9492, 9524, 9516, 9500, 9472, 9532,
+9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575, 9576, 9572, 9573, 9561, 9560, 9554,
+9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600, 945, 946, 404, 960, 931, 963,
+964, 934, 920, 937, 948, 8734, 966, 8712, 8745, 8781, 8805, 8804, 8992, 8993, 8776, 8729,
+8730, 8319, 9632, 61442, 770, 61440, 8801, 256, 257, 274, 275, 278, 279, 8800, 501, 302,
+303, 298, 299, 310, 8706, 8721, 315, 316, 325, 326, 916, 332, 8900, 333, 342, 343,
+362, 363, 370, 371, 311, 290, 286, 330, 306, 304, 287, 331, 307, 61663, 
 };
 
 static unsigned short int uni_to_x_0[256] = {
@@ -214,22 +255,22 @@ static unsigned short int uni_to_x_0[256] = {
 };
 
 static unsigned short int uni_to_x_1[256] = {
-415, 416, 282, 298, 257, 268, 284, 300, 256, 256, 256, 256, 285, 301, 288, 304,
-289, 305, 417, 418, 256, 256, 419, 420, 286, 302, 287, 303, 256, 256, 256, 256,
-256, 256, 445, 256, 256, 256, 256, 256, 256, 256, 425, 426, 256, 256, 423, 424,
-256, 256, 256, 256, 256, 256, 427, 444, 256, 283, 299, 430, 431, 260, 271, 256,
-256, 259, 270, 290, 306, 432, 433, 291, 307, 256, 256, 256, 435, 437, 256, 256,
-292, 308, 256, 256, 281, 297, 438, 439, 293, 309, 261, 272, 256, 256, 263, 275,
-262, 274, 296, 312, 264, 276, 256, 256, 256, 256, 440, 441, 256, 256, 294, 310,
-295, 311, 442, 443, 256, 256, 256, 256, 256, 265, 277, 267, 280, 266, 279, 256,
+423, 424, 282, 298, 257, 268, 284, 300, 256, 256, 256, 256, 285, 301, 288, 304,
+289, 305, 425, 426, 256, 256, 427, 428, 286, 302, 287, 303, 256, 256, 454, 458,
+256, 256, 453, 256, 256, 256, 256, 256, 256, 256, 433, 434, 256, 256, 431, 432,
+457, 256, 456, 460, 256, 256, 435, 452, 256, 283, 299, 438, 439, 260, 271, 256,
+256, 259, 270, 290, 306, 440, 441, 291, 307, 256, 455, 459, 443, 445, 256, 256,
+292, 308, 341, 343, 281, 297, 446, 447, 293, 309, 261, 272, 256, 256, 263, 275,
+262, 274, 296, 312, 264, 276, 256, 256, 256, 256, 448, 449, 256, 256, 294, 310,
+295, 311, 450, 451, 256, 256, 256, 256, 344, 265, 277, 267, 280, 266, 279, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 388, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 338, 256, 396, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 422, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 430, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 };
 
 static unsigned short int uni_to_x_2[256] = {
@@ -245,14 +286,14 @@ static unsigned short int uni_to_x_2[256] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 273, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 258, 313, 256, 269, 256, 278, 256, 256,
+256, 256, 256, 256, 256, 256, 340, 273, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 258, 313, 256, 269, 342, 278, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 };
 
 static unsigned short int uni_to_x_3[256] = {
-256, 256, 412, 256, 256, 256, 331, 256, 332, 256, 256, 336, 330, 256, 256, 256,
+256, 256, 420, 256, 256, 256, 331, 256, 332, 256, 256, 336, 330, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 335, 333, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -261,10 +302,10 @@ static unsigned short int uni_to_x_3[256] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 434, 256, 256, 256, 394, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 390, 256, 256, 393, 256, 256, 395, 256, 256, 256, 256, 256, 256,
-256, 386, 387, 256, 396, 256, 256, 256, 256, 256, 256, 256, 334, 256, 256, 256,
-389, 256, 256, 391, 392, 256, 398, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 442, 256, 256, 256, 402, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 398, 256, 256, 401, 256, 256, 403, 256, 256, 256, 256, 256, 256,
+256, 394, 395, 256, 404, 256, 256, 256, 256, 256, 256, 256, 334, 256, 256, 256,
+397, 256, 256, 399, 400, 256, 406, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -292,15 +333,15 @@ static unsigned short int uni_to_x_14[256] = {
 static unsigned short int uni_to_x_32[256] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 326, 327, 256, 256, 256, 321, 322, 314, 256, 323, 324, 315, 256,
-317, 318, 325, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+317, 318, 325, 256, 256, 256, 339, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 319, 256, 256, 256, 256, 256, 256, 256, 256, 320, 329, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 409,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 417,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 337, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -328,28 +369,28 @@ static unsigned short int uni_to_x_33[256] = {
 };
 
 static unsigned short int uni_to_x_34[256] = {
-256, 256, 428, 256, 256, 256, 256, 256, 399, 256, 256, 256, 256, 256, 256, 256,
-256, 429, 256, 256, 256, 256, 256, 256, 256, 407, 408, 256, 256, 256, 397, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 400, 256, 256, 256, 256, 256, 256,
+256, 256, 436, 256, 256, 256, 256, 256, 407, 256, 256, 256, 256, 256, 256, 256,
+256, 437, 256, 256, 256, 256, 256, 256, 256, 415, 416, 256, 256, 256, 405, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 408, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 406, 256, 256, 256, 256, 401, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 414, 256, 256, 256, 256, 409, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-421, 414, 256, 256, 403, 402, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+429, 422, 256, 256, 411, 410, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 436, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 444, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 };
 
 static unsigned short int uni_to_x_35[256] = {
-256, 256, 337, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 345, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-404, 405, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+412, 413, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -366,17 +407,17 @@ static unsigned short int uni_to_x_35[256] = {
 };
 
 static unsigned short int uni_to_x_37[256] = {
-358, 256, 341, 256, 256, 256, 256, 256, 256, 256, 256, 256, 380, 256, 256, 256,
-353, 256, 256, 256, 354, 256, 256, 256, 379, 256, 256, 256, 357, 256, 256, 256,
-256, 256, 256, 256, 342, 256, 256, 256, 256, 256, 256, 256, 356, 256, 256, 256,
-256, 256, 256, 256, 355, 256, 256, 256, 256, 256, 256, 256, 359, 256, 256, 256,
+366, 256, 349, 256, 256, 256, 256, 256, 256, 256, 256, 256, 388, 256, 256, 256,
+361, 256, 256, 256, 362, 256, 256, 256, 387, 256, 256, 256, 365, 256, 256, 256,
+256, 256, 256, 256, 350, 256, 256, 256, 256, 256, 256, 256, 364, 256, 256, 256,
+256, 256, 256, 256, 363, 256, 256, 256, 256, 256, 256, 256, 367, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-367, 348, 375, 376, 363, 346, 345, 349, 374, 373, 362, 352, 351, 350, 360, 361,
-366, 343, 344, 347, 371, 372, 365, 369, 370, 364, 378, 377, 368, 256, 256, 256,
+375, 356, 383, 384, 371, 354, 353, 357, 382, 381, 370, 360, 359, 358, 368, 369,
+374, 351, 352, 355, 379, 380, 373, 377, 378, 372, 386, 385, 376, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-385, 256, 256, 256, 382, 256, 256, 256, 381, 256, 256, 256, 383, 256, 256, 256,
-384, 338, 339, 340, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-410, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+393, 256, 256, 256, 390, 256, 256, 256, 389, 256, 256, 256, 391, 256, 256, 256,
+392, 346, 347, 348, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+418, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -385,8 +426,7 @@ static unsigned short int uni_to_x_37[256] = {
 };
 
 static unsigned short int uni_to_x_240[256] = {
-413, 256, 411, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+421, 256, 419, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
@@ -399,6 +439,7 @@ static unsigned short int uni_to_x_240[256] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 461,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 };
@@ -489,7 +530,7 @@ uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
 uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
 };
 
-static unsigned short int x_to_output[8][446] = {
+static unsigned short int x_to_output[10][462] = {
 
 /* set/ascii */
 {
@@ -514,13 +555,14 @@ static unsigned short int x_to_output[8][446] = {
 68, 256, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
 100, 256, 110, 110, 111, 114, 117, 117, 116, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 278, 256, 256, 256, 256, 89, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108,
-78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/latin1 */
@@ -546,13 +588,14 @@ static unsigned short int x_to_output[8][446] = {
 68, 256, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
 100, 256, 110, 110, 111, 114, 117, 117, 116, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 278, 256, 256, 256, 256, 89, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108,
-78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/latin2 */
@@ -578,13 +621,14 @@ static unsigned short int x_to_output[8][446] = {
 207, 208, 209, 210, 213, 216, 217, 219, 222, 224, 227, 229, 230, 232, 234, 236,
 239, 240, 241, 242, 245, 248, 249, 251, 254, 255, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 278, 256, 256, 256, 256, 89, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108,
-78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/win-1250 */
@@ -601,22 +645,56 @@ static unsigned short int x_to_output[8][446] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 160, 256, 256, 256, 164, 256, 166, 167, 168, 169, 97, 171, 172, 173, 174, 256,
 176, 177, 50, 51, 180, 181, 256, 183, 184, 49, 111, 187, 257, 261, 265, 256,
-65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 278,
+65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 288,
 208, 78, 79, 211, 212, 79, 214, 215, 256, 85, 218, 85, 220, 221, 256, 223,
-97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 281,
-240, 110, 111, 243, 244, 111, 246, 247, 256, 117, 250, 117, 252, 253, 256, 284,
+97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 291,
+240, 110, 111, 243, 244, 111, 246, 247, 256, 117, 250, 117, 252, 253, 256, 294,
 256, 165, 162, 163, 188, 140, 138, 170, 141, 143, 142, 175, 185, 178, 179, 190,
 156, 256, 154, 186, 157, 159, 189, 158, 191, 192, 195, 197, 198, 200, 202, 204,
 207, 256, 209, 210, 213, 216, 217, 219, 222, 224, 227, 229, 230, 232, 234, 236,
 239, 256, 241, 242, 245, 248, 249, 251, 254, 255, 130, 132, 133, 134, 135, 137,
 139, 145, 146, 147, 148, 149, 150, 151, 153, 155, 161, 162, 168, 178, 181, 184,
-189, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+189, 256, 256, 278, 256, 256, 256, 256, 297, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 300,
+303, 73, 105, 306, 256, 256, 309, 312, 315, 318, 256, 79, 256, 111, 321, 324,
+85, 117, 327, 330, 333, 336, 339, 256, 282, 73, 342, 256, 285, 256, 
+},
+
+/* set/win-1252 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 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,
+256, 129, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 141, 256, 143,
+144, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 157, 256, 256,
+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, 65, 256, 256, 76, 83, 138, 83, 84, 90, 142, 90, 97, 256, 256, 108,
+115, 256, 154, 115, 116, 122, 256, 158, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 256, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 256, 110, 110, 111, 114, 117, 117, 116, 256, 130, 132, 256, 134, 135, 137,
+139, 145, 146, 147, 148, 149, 150, 151, 153, 155, 256, 256, 256, 256, 256, 256,
+256, 128, 131, 133, 136, 140, 152, 156, 159, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 287, 290, 73, 105, 293, 256, 256, 296, 299,
-302, 305, 256, 79, 256, 111, 308, 311, 85, 117, 314, 317, 320, 323, 
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/kamen-ctrl */
@@ -642,13 +720,14 @@ static unsigned short int x_to_output[8][446] = {
 133, 256, 78, 165, 79, 158, 166, 85, 84, 170, 97, 141, 99, 135, 101, 136,
 131, 256, 110, 164, 111, 169, 150, 117, 116, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 230, 256,
-256, 127, 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, 231, 232, 233, 234, 235, 236, 237, 238,
-239, 240, 242, 243, 244, 245, 247, 249, 251, 252, 254, 256, 256, 256, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108,
-78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 
+256, 256, 256, 278, 256, 256, 256, 256, 89, 127, 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,
+231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 242, 243, 244, 245, 247, 249,
+251, 252, 254, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/koi8 */
@@ -665,22 +744,23 @@ static unsigned short int x_to_output[8][446] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 97, 256, 256, 256, 256, 256,
 254, 256, 50, 51, 224, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
-65, 225, 326, 65, 241, 65, 269, 67, 69, 247, 329, 69, 73, 233, 332, 73,
-256, 78, 79, 239, 240, 79, 237, 256, 256, 85, 245, 335, 232, 249, 256, 256,
-216, 193, 338, 97, 209, 97, 272, 99, 101, 215, 341, 101, 105, 201, 344, 105,
-256, 110, 111, 207, 208, 111, 205, 256, 256, 117, 213, 347, 200, 217, 256, 121,
+65, 225, 345, 65, 241, 65, 269, 67, 69, 247, 348, 69, 73, 233, 351, 73,
+256, 78, 79, 239, 240, 79, 237, 256, 256, 85, 245, 354, 232, 249, 256, 256,
+216, 193, 357, 97, 209, 97, 272, 99, 101, 215, 360, 101, 105, 201, 363, 105,
+256, 110, 111, 207, 208, 111, 205, 256, 256, 117, 213, 366, 200, 217, 256, 121,
 256, 65, 256, 256, 236, 83, 243, 83, 244, 90, 250, 90, 97, 256, 256, 204,
 115, 256, 211, 115, 212, 122, 256, 218, 122, 230, 248, 235, 67, 227, 69, 229,
 228, 256, 78, 238, 79, 242, 234, 85, 84, 198, 97, 203, 99, 195, 101, 197,
 196, 256, 110, 206, 111, 210, 202, 117, 116, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 220, 256, 256, 256, 256, 256,
+256, 256, 256, 278, 256, 256, 256, 256, 89, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 199, 222, 231, 256, 65,
-97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108,
-78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 
+256, 110, 256, 199, 222, 231, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 71, 256, 282, 73, 103, 256, 285, 256, 
 },
 
 /* set/pc-latin-2 */
@@ -697,22 +777,23 @@ static unsigned short int x_to_output[8][446] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 255, 256, 256, 256, 207, 256, 256, 245, 249, 256, 97, 175, 170, 256, 256, 256,
 256, 256, 50, 51, 239, 256, 256, 256, 247, 49, 111, 174, 257, 261, 265, 256,
-65, 181, 182, 65, 142, 65, 269, 128, 69, 144, 69, 211, 73, 214, 215, 350,
+65, 181, 182, 65, 142, 65, 269, 128, 69, 144, 69, 211, 73, 214, 215, 369,
 209, 78, 79, 224, 226, 79, 153, 158, 256, 85, 233, 85, 154, 237, 256, 225,
-97, 160, 131, 97, 132, 97, 272, 135, 101, 130, 101, 137, 105, 161, 140, 353,
-208, 110, 111, 162, 147, 111, 148, 246, 256, 117, 163, 117, 129, 236, 256, 356,
+97, 160, 131, 97, 132, 97, 272, 135, 101, 130, 101, 137, 105, 161, 140, 372,
+208, 110, 111, 162, 147, 111, 148, 246, 256, 117, 163, 117, 129, 236, 256, 375,
 256, 164, 244, 157, 149, 151, 230, 184, 155, 141, 166, 189, 165, 242, 136, 150,
 152, 256, 231, 173, 156, 171, 241, 167, 190, 232, 198, 145, 143, 172, 168, 183,
 210, 256, 227, 213, 138, 252, 222, 235, 221, 234, 199, 146, 134, 159, 169, 216,
 212, 256, 228, 229, 139, 253, 133, 251, 238, 250, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 243, 244, 249, 242, 256, 247,
-241, 127, 176, 177, 178, 179, 180, 256, 256, 256, 256, 185, 186, 187, 188, 256,
-256, 191, 192, 193, 194, 195, 196, 197, 256, 256, 200, 201, 202, 203, 204, 205,
-206, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 217, 218, 219, 220, 256,
-256, 223, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 254, 256, 256, 256, 240, 65,
-97, 69, 101, 69, 101, 61, 103, 359, 362, 73, 105, 365, 256, 256, 368, 371,
-374, 377, 256, 79, 256, 111, 380, 383, 85, 117, 386, 389, 392, 395, 
+241, 256, 256, 278, 256, 256, 256, 256, 378, 127, 176, 177, 178, 179, 180, 256,
+256, 256, 256, 185, 186, 187, 188, 256, 256, 191, 192, 193, 194, 195, 196, 197,
+256, 256, 200, 201, 202, 203, 204, 205, 206, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 217, 218, 219, 220, 256, 256, 223, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 254, 256, 256, 256, 240, 65, 97, 69, 101, 69, 101, 61, 103, 381,
+384, 73, 105, 387, 256, 256, 390, 393, 396, 399, 256, 79, 256, 111, 402, 405,
+85, 117, 408, 411, 414, 417, 420, 256, 282, 73, 423, 256, 285, 256, 
 },
 
 /* set/macce */
@@ -729,22 +810,56 @@ static unsigned short int x_to_output[8][446] = {
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 202, 256, 256, 163, 256, 256, 256, 164, 172, 169, 97, 199, 194, 256, 168, 256,
 161, 256, 50, 51, 256, 256, 166, 256, 256, 49, 111, 200, 257, 261, 265, 256,
-65, 231, 65, 65, 128, 65, 269, 67, 69, 131, 69, 398, 73, 234, 73, 401,
+65, 231, 65, 65, 128, 65, 269, 67, 69, 131, 69, 426, 73, 234, 73, 429,
 256, 78, 79, 238, 239, 205, 133, 256, 256, 85, 242, 85, 134, 248, 256, 167,
-97, 135, 97, 97, 138, 97, 272, 99, 101, 142, 101, 404, 105, 146, 105, 407,
-256, 110, 111, 151, 153, 155, 154, 214, 256, 117, 156, 117, 159, 249, 256, 410,
+97, 135, 97, 97, 138, 97, 272, 99, 101, 142, 101, 432, 105, 146, 105, 435,
+256, 110, 111, 151, 153, 155, 154, 214, 256, 117, 156, 117, 159, 249, 256, 438,
 256, 132, 256, 252, 187, 229, 225, 83, 232, 143, 235, 251, 136, 256, 184, 188,
 230, 256, 228, 115, 233, 144, 256, 236, 253, 217, 65, 189, 140, 137, 162, 157,
 145, 256, 193, 197, 204, 219, 241, 244, 84, 218, 97, 190, 141, 139, 171, 158,
 147, 256, 196, 203, 206, 222, 243, 245, 116, 256, 226, 227, 201, 160, 256, 256,
 220, 212, 213, 210, 211, 165, 209, 208, 170, 221, 255, 256, 172, 256, 256, 256,
+256, 256, 256, 278, 256, 256, 256, 256, 441, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 179, 178, 256, 256, 256, 256,
+195, 110, 256, 256, 256, 256, 256, 129, 130, 148, 149, 150, 152, 173, 174, 175,
+176, 177, 180, 181, 182, 183, 185, 186, 191, 192, 198, 207, 215, 216, 223, 224,
+237, 240, 246, 247, 250, 254, 71, 256, 282, 73, 103, 256, 285, 256, 
+},
+
+/* set/cork */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 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,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 189, 256, 191, 256, 256, 256, 159, 256, 256, 97, 256, 256, 256, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 190,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 256, 216, 217, 218, 219, 220, 221, 222, 255,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 256, 248, 249, 250, 251, 252, 253, 254, 184,
+256, 129, 256, 138, 137, 145, 146, 147, 148, 153, 154, 155, 161, 256, 170, 169,
+177, 256, 178, 179, 180, 185, 256, 186, 187, 143, 128, 136, 130, 131, 134, 133,
+132, 256, 139, 140, 142, 144, 151, 150, 149, 175, 160, 168, 162, 163, 166, 165,
+164, 256, 171, 172, 174, 176, 183, 182, 181, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 278, 256, 215, 256, 247, 152, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-256, 256, 179, 178, 256, 256, 256, 256, 195, 110, 256, 256, 256, 256, 256, 129,
-130, 148, 149, 150, 152, 173, 174, 175, 176, 177, 180, 181, 182, 183, 185, 186,
-191, 192, 198, 207, 215, 216, 223, 224, 237, 240, 246, 247, 250, 254, 
+256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73,
+105, 73, 105, 75, 256, 256, 76, 108, 78, 110, 256, 79, 256, 111, 82, 114,
+85, 117, 85, 117, 107, 71, 135, 141, 156, 157, 167, 173, 188, 223, 
 },
 };
 
@@ -756,9 +871,13 @@ static unsigned char string_table[] = {
 2, 65, 69,
 2, 97, 101,
 2, 84, 77,
+3, 46, 46, 46,
+2, 73, 74,
+2, 105, 106,
 2, 73, 168,
 2, 105, 168,
 2, 121, 168,
+2, 89, 168,
 2, 73, 178,
 2, 105, 178,
 2, 75, 184,
@@ -772,6 +891,8 @@ static unsigned char string_table[] = {
 2, 117, 178,
 2, 107, 184,
 2, 71, 184,
+2, 71, 162,
+2, 103, 162,
 2, 65, 222,
 2, 69, 222,
 2, 73, 222,
@@ -783,6 +904,7 @@ static unsigned char string_table[] = {
 2, 73, 249,
 2, 105, 249,
 2, 121, 249,
+2, 89, 249,
 2, 73, 242,
 2, 105, 242,
 2, 75, 247,
@@ -796,9 +918,12 @@ static unsigned char string_table[] = {
 2, 117, 242,
 2, 107, 247,
 2, 71, 247,
+2, 71, 244,
+2, 103, 244,
 2, 69, 172,
 2, 73, 172,
 2, 101, 172,
 2, 105, 172,
 2, 121, 172,
+2, 89, 172,
 };