null+****@clear*****
null+****@clear*****
2010年 8月 17日 (火) 21:22:22 JST
Daijiro MORI 2010-08-17 12:22:22 +0000 (Tue, 17 Aug 2010)
New Revision: 165a383d37c4671f2e058696f7354203c54b747f
Log:
support "ltu", "ltsu" in set_cursor_rk().
Modified files:
lib/pat.c
Modified: lib/pat.c (+98 -93)
===================================================================
--- lib/pat.c 2010-08-17 08:51:27 +0000 (d36e01a)
+++ lib/pat.c 2010-08-17 12:22:22 +0000 (e22e766)
@@ -2377,7 +2377,7 @@ typedef struct {
uint8_t attr;
} rk_tree_node;
-static uint16_t rk_str_idx[] = {
+uint16_t rk_str_idx[] = {
0x0003, 0x0006, 0x0009, 0x000c, 0x0012, 0x0015, 0x0018, 0x001e, 0x0024, 0x002a,
0x0030, 0x0036, 0x003c, 0x0042, 0x0048, 0x004e, 0x0054, 0x005a, 0x0060, 0x0066,
0x006c, 0x0072, 0x0078, 0x007e, 0x0084, 0x008a, 0x0090, 0x0096, 0x009c, 0x00a2,
@@ -2397,7 +2397,7 @@ static uint16_t rk_str_idx[] = {
0x02e8, 0x02eb, 0x02ee, 0x02f1, 0x02f4, 0x02f7, 0x02fa, 0x02fd, 0x0300, 0x0303,
0x0309, 0x030c, 0x0312, 0x0318, 0x031e, 0x0324, 0x0327, 0x032a, 0x032d
};
-static char rk_str[] = {
+char rk_str[] = {
0xe3, 0x82, 0xa1, 0xe3, 0x82, 0xa2, 0xe3, 0x82, 0xa3, 0xe3, 0x82, 0xa4, 0xe3,
0x82, 0xa4, 0xe3, 0x82, 0xa7, 0xe3, 0x82, 0xa5, 0xe3, 0x82, 0xa6, 0xe3, 0x82,
0xa6, 0xe3, 0x82, 0xa2, 0xe3, 0x82, 0xa6, 0xe3, 0x82, 0xa3, 0xe3, 0x82, 0xa6,
@@ -2462,24 +2462,25 @@ static char rk_str[] = {
0x83, 0xb4, 0xe3, 0x82, 0xa7, 0xe3, 0x83, 0xb4, 0xe3, 0x82, 0xa9, 0xe3, 0x83,
0xb5, 0xe3, 0x83, 0xb6, 0xe3, 0x83, 0xbc
};
-static uint16_t rk_tree_idx[] = {
+uint16_t rk_tree_idx[] = {
0x001b, 0x0022, 0x0025, 0x0028, 0x002d, 0x0030, 0x0039, 0x003b, 0x003c, 0x003f,
0x0046, 0x0047, 0x004f, 0x0050, 0x0053, 0x005a, 0x005d, 0x0064, 0x0067, 0x006f,
- 0x0070, 0x0073, 0x007a, 0x007f, 0x0086, 0x0089, 0x00a6, 0x00ac, 0x00b3, 0x00b6,
- 0x00bd, 0x00c0, 0x00c8, 0x00cd, 0x00d1, 0x00db, 0x00dd, 0x00e2, 0x00e3, 0x00e7,
- 0x00ed, 0x00f3, 0x00f5, 0x00ff, 0x0101, 0x0103, 0x0104, 0x0105, 0x0108, 0x010d,
- 0x0114, 0x0118, 0x011a, 0x0159, 0x0175, 0x0178, 0x018e, 0x01a2
+ 0x0070, 0x0073, 0x007d, 0x007f, 0x0081, 0x0082, 0x0083, 0x0088, 0x008f, 0x0092,
+ 0x00af, 0x00b5, 0x00bc, 0x00bf, 0x00c6, 0x00c9, 0x00d1, 0x00d6, 0x00da, 0x00e4,
+ 0x00e6, 0x00eb, 0x00ec, 0x00f0, 0x00f6, 0x00fc, 0x00fe, 0x0108, 0x010a, 0x010c,
+ 0x010d, 0x010e, 0x0113, 0x0118, 0x011f, 0x0123, 0x0125, 0x0164, 0x0180, 0x0183,
+ 0x0199, 0x01ad
};
-static rk_tree_node rk_tree[] = {
+rk_tree_node rk_tree[] = {
{0x2d, 0x00, 0xb2, 0x01}, {0x61, 0x00, 0x01, 0x01}, {0x62, 0x01, 0xff, 0x01},
{0x63, 0x03, 0xff, 0x01}, {0x64, 0x06, 0xff, 0x01}, {0x65, 0x00, 0x24, 0x01},
{0x66, 0x0a, 0xff, 0x01}, {0x67, 0x0c, 0xff, 0x01}, {0x68, 0x0f, 0xff, 0x01},
{0x69, 0x00, 0x03, 0x01}, {0x6a, 0x11, 0xff, 0x01}, {0x6b, 0x13, 0xff, 0x01},
- {0x6c, 0x16, 0xff, 0x01}, {0x6d, 0x18, 0xff, 0x01}, {0x6e, 0x1a, 0xff, 0x01},
- {0x6f, 0x00, 0x26, 0x01}, {0x70, 0x1c, 0xff, 0x01}, {0x72, 0x1e, 0xff, 0x01},
- {0x73, 0x20, 0xff, 0x01}, {0x74, 0x23, 0xff, 0x01}, {0x75, 0x00, 0x06, 0x01},
- {0x76, 0x28, 0xff, 0x01}, {0x77, 0x29, 0xff, 0x01}, {0x78, 0x2b, 0xff, 0x01},
- {0x79, 0x31, 0xff, 0x01}, {0x7a, 0x32, 0xff, 0x01}, {0xe3, 0x34, 0xff, 0x01},
+ {0x6c, 0x16, 0xff, 0x01}, {0x6d, 0x1c, 0xff, 0x01}, {0x6e, 0x1e, 0xff, 0x01},
+ {0x6f, 0x00, 0x26, 0x01}, {0x70, 0x20, 0xff, 0x01}, {0x72, 0x22, 0xff, 0x01},
+ {0x73, 0x24, 0xff, 0x01}, {0x74, 0x27, 0xff, 0x01}, {0x75, 0x00, 0x06, 0x01},
+ {0x76, 0x2c, 0xff, 0x01}, {0x77, 0x2d, 0xff, 0x01}, {0x78, 0x2f, 0xff, 0x01},
+ {0x79, 0x35, 0xff, 0x01}, {0x7a, 0x36, 0xff, 0x01}, {0xe3, 0x38, 0xff, 0x01},
{0x61, 0x00, 0x72, 0x01}, {0x62, 0x01, 0x56, 0x01}, {0x65, 0x00, 0x89, 0x01},
{0x69, 0x00, 0x78, 0x01}, {0x6f, 0x00, 0x8c, 0x01}, {0x75, 0x00, 0x86, 0x01},
{0x79, 0x02, 0xff, 0x00}, {0x61, 0x00, 0x79, 0x01}, {0x6f, 0x00, 0x7b, 0x01},
@@ -2510,107 +2511,110 @@ static rk_tree_node rk_tree[] = {
{0x75, 0x00, 0x31, 0x01}, {0x77, 0x14, 0xff, 0x00}, {0x79, 0x15, 0xff, 0x00},
{0x61, 0x00, 0x32, 0x01}, {0x61, 0x00, 0x2a, 0x01}, {0x6f, 0x00, 0x2c, 0x01},
{0x75, 0x00, 0x2b, 0x01}, {0x61, 0x00, 0x00, 0x01}, {0x65, 0x00, 0x23, 0x01},
- {0x69, 0x00, 0x02, 0x01}, {0x6c, 0x16, 0x56, 0x01}, {0x6f, 0x00, 0x25, 0x01},
- {0x75, 0x00, 0x05, 0x01}, {0x79, 0x17, 0xff, 0x01}, {0x61, 0x00, 0x96, 0x01},
+ {0x69, 0x00, 0x02, 0x01}, {0x6b, 0x17, 0xff, 0x01}, {0x6c, 0x16, 0x56, 0x01},
+ {0x6f, 0x00, 0x25, 0x01}, {0x74, 0x18, 0xff, 0x01}, {0x75, 0x00, 0x05, 0x01},
+ {0x77, 0x1a, 0xff, 0x01}, {0x79, 0x1b, 0xff, 0x01}, {0x61, 0x00, 0xb0, 0x01},
+ {0x65, 0x00, 0xb1, 0x01}, {0x73, 0x19, 0xff, 0x00}, {0x75, 0x00, 0x56, 0x01},
+ {0x75, 0x00, 0x56, 0x01}, {0x61, 0x00, 0xa4, 0x01}, {0x61, 0x00, 0x96, 0x01},
{0x65, 0x00, 0x23, 0x01}, {0x69, 0x00, 0x02, 0x01}, {0x6f, 0x00, 0x9a, 0x01},
{0x75, 0x00, 0x98, 0x01}, {0x61, 0x00, 0x8e, 0x01}, {0x65, 0x00, 0x94, 0x01},
- {0x69, 0x00, 0x8f, 0x01}, {0x6d, 0x18, 0x56, 0x01}, {0x6f, 0x00, 0x95, 0x01},
- {0x75, 0x00, 0x93, 0x01}, {0x79, 0x19, 0xff, 0x00}, {0x61, 0x00, 0x90, 0x01},
+ {0x69, 0x00, 0x8f, 0x01}, {0x6d, 0x1c, 0x56, 0x01}, {0x6f, 0x00, 0x95, 0x01},
+ {0x75, 0x00, 0x93, 0x01}, {0x79, 0x1d, 0xff, 0x00}, {0x61, 0x00, 0x90, 0x01},
{0x6f, 0x00, 0x92, 0x01}, {0x75, 0x00, 0x91, 0x01}, {0x00, 0x00, 0xa9, 0x01},
{0x27, 0x00, 0xa9, 0x00}, {0x2d, 0x00, 0xaa, 0x00}, {0x61, 0x00, 0x67, 0x01},
{0x62, 0x01, 0xa9, 0x00}, {0x63, 0x03, 0xa9, 0x00}, {0x64, 0x06, 0xa9, 0x00},
{0x65, 0x00, 0x6f, 0x01}, {0x66, 0x0a, 0xa9, 0x00}, {0x67, 0x0c, 0xa9, 0x00},
{0x68, 0x0f, 0xa9, 0x00}, {0x69, 0x00, 0x68, 0x01}, {0x6a, 0x11, 0xa9, 0x00},
- {0x6b, 0x13, 0xa9, 0x00}, {0x6c, 0x16, 0xa9, 0x00}, {0x6d, 0x18, 0xa9, 0x00},
- {0x6e, 0x00, 0xa9, 0x00}, {0x6f, 0x00, 0x70, 0x01}, {0x70, 0x1c, 0xa9, 0x00},
- {0x72, 0x1e, 0xa9, 0x00}, {0x73, 0x20, 0xa9, 0x00}, {0x74, 0x23, 0xa9, 0x00},
- {0x75, 0x00, 0x6e, 0x01}, {0x76, 0x28, 0xa9, 0x00}, {0x77, 0x29, 0xa9, 0x00},
- {0x78, 0x2b, 0xa9, 0x00}, {0x79, 0x1b, 0xff, 0x00}, {0x7a, 0x32, 0xa9, 0x00},
- {0xe3, 0x34, 0xa9, 0x00}, {0x00, 0x00, 0xa9, 0x01}, {0x61, 0x00, 0x6b, 0x01},
+ {0x6b, 0x13, 0xa9, 0x00}, {0x6c, 0x16, 0xa9, 0x00}, {0x6d, 0x1c, 0xa9, 0x00},
+ {0x6e, 0x00, 0xa9, 0x00}, {0x6f, 0x00, 0x70, 0x01}, {0x70, 0x20, 0xa9, 0x00},
+ {0x72, 0x22, 0xa9, 0x00}, {0x73, 0x24, 0xa9, 0x00}, {0x74, 0x27, 0xa9, 0x00},
+ {0x75, 0x00, 0x6e, 0x01}, {0x76, 0x2c, 0xa9, 0x00}, {0x77, 0x2d, 0xa9, 0x00},
+ {0x78, 0x2f, 0xa9, 0x00}, {0x79, 0x1f, 0xff, 0x00}, {0x7a, 0x36, 0xa9, 0x00},
+ {0xe3, 0x38, 0xa9, 0x00}, {0x00, 0x00, 0xa9, 0x01}, {0x61, 0x00, 0x6b, 0x01},
{0x65, 0x00, 0x6a, 0x01}, {0x69, 0x00, 0x69, 0x01}, {0x6f, 0x00, 0x6d, 0x01},
{0x75, 0x00, 0x6c, 0x01}, {0x61, 0x00, 0x73, 0x01}, {0x65, 0x00, 0x8a, 0x01},
- {0x69, 0x00, 0x7c, 0x01}, {0x6f, 0x00, 0x8d, 0x01}, {0x70, 0x1c, 0x56, 0x01},
- {0x75, 0x00, 0x87, 0x01}, {0x79, 0x1d, 0xff, 0x00}, {0x61, 0x00, 0x7d, 0x01},
+ {0x69, 0x00, 0x7c, 0x01}, {0x6f, 0x00, 0x8d, 0x01}, {0x70, 0x20, 0x56, 0x01},
+ {0x75, 0x00, 0x87, 0x01}, {0x79, 0x21, 0xff, 0x00}, {0x61, 0x00, 0x7d, 0x01},
{0x6f, 0x00, 0x7f, 0x01}, {0x75, 0x00, 0x7e, 0x01}, {0x61, 0x00, 0x9c, 0x01},
{0x65, 0x00, 0xa2, 0x01}, {0x69, 0x00, 0x9d, 0x01}, {0x6f, 0x00, 0xa3, 0x01},
- {0x72, 0x1e, 0x56, 0x01}, {0x75, 0x00, 0xa1, 0x01}, {0x79, 0x1f, 0xff, 0x00},
+ {0x72, 0x22, 0x56, 0x01}, {0x75, 0x00, 0xa1, 0x01}, {0x79, 0x23, 0xff, 0x00},
{0x61, 0x00, 0x9e, 0x01}, {0x6f, 0x00, 0xa0, 0x01}, {0x75, 0x00, 0x9f, 0x01},
- {0x61, 0x00, 0x39, 0x01}, {0x65, 0x00, 0x47, 0x01}, {0x68, 0x21, 0xff, 0x00},
- {0x69, 0x00, 0x3b, 0x01}, {0x6f, 0x00, 0x49, 0x01}, {0x73, 0x20, 0x56, 0x01},
- {0x75, 0x00, 0x45, 0x01}, {0x79, 0x22, 0xff, 0x00}, {0x61, 0x00, 0x3d, 0x00},
+ {0x61, 0x00, 0x39, 0x01}, {0x65, 0x00, 0x47, 0x01}, {0x68, 0x25, 0xff, 0x00},
+ {0x69, 0x00, 0x3b, 0x01}, {0x6f, 0x00, 0x49, 0x01}, {0x73, 0x24, 0x56, 0x01},
+ {0x75, 0x00, 0x45, 0x01}, {0x79, 0x26, 0xff, 0x00}, {0x61, 0x00, 0x3d, 0x00},
{0x65, 0x00, 0x3c, 0x00}, {0x69, 0x00, 0x3b, 0x01}, {0x6f, 0x00, 0x3f, 0x00},
{0x75, 0x00, 0x3e, 0x00}, {0x61, 0x00, 0x3d, 0x01}, {0x65, 0x00, 0x3c, 0x01},
{0x6f, 0x00, 0x3f, 0x01}, {0x75, 0x00, 0x3e, 0x01}, {0x61, 0x00, 0x4b, 0x01},
- {0x65, 0x00, 0x5d, 0x01}, {0x68, 0x24, 0xff, 0x00}, {0x69, 0x00, 0x4d, 0x01},
- {0x6f, 0x00, 0x63, 0x01}, {0x73, 0x25, 0xff, 0x00}, {0x74, 0x23, 0x56, 0x01},
- {0x75, 0x00, 0x57, 0x01}, {0x77, 0x26, 0xff, 0x00}, {0x79, 0x27, 0xff, 0x00},
+ {0x65, 0x00, 0x5d, 0x01}, {0x68, 0x28, 0xff, 0x00}, {0x69, 0x00, 0x4d, 0x01},
+ {0x6f, 0x00, 0x63, 0x01}, {0x73, 0x29, 0xff, 0x00}, {0x74, 0x27, 0x56, 0x01},
+ {0x75, 0x00, 0x57, 0x01}, {0x77, 0x2a, 0xff, 0x00}, {0x79, 0x2b, 0xff, 0x00},
{0x69, 0x00, 0x5e, 0x01}, {0x75, 0x00, 0x5f, 0x01}, {0x61, 0x00, 0x58, 0x00},
{0x65, 0x00, 0x5a, 0x00}, {0x69, 0x00, 0x59, 0x00}, {0x6f, 0x00, 0x5b, 0x00},
{0x75, 0x00, 0x57, 0x01}, {0x75, 0x00, 0x64, 0x01}, {0x61, 0x00, 0x4f, 0x01},
{0x65, 0x00, 0x4e, 0x01}, {0x6f, 0x00, 0x51, 0x01}, {0x75, 0x00, 0x50, 0x01},
{0x61, 0x00, 0xac, 0x00}, {0x65, 0x00, 0xae, 0x00}, {0x69, 0x00, 0xad, 0x00},
- {0x6f, 0x00, 0xaf, 0x00}, {0x75, 0x00, 0xab, 0x01}, {0x76, 0x28, 0x56, 0x01},
+ {0x6f, 0x00, 0xaf, 0x00}, {0x75, 0x00, 0xab, 0x01}, {0x76, 0x2c, 0x56, 0x01},
{0x61, 0x00, 0xa5, 0x01}, {0x65, 0x00, 0x0b, 0x01}, {0x69, 0x00, 0x08, 0x01},
- {0x6f, 0x00, 0xa8, 0x01}, {0x77, 0x29, 0x56, 0x01}, {0x79, 0x2a, 0xff, 0x01},
+ {0x6f, 0x00, 0xa8, 0x01}, {0x77, 0x2d, 0x56, 0x01}, {0x79, 0x2e, 0xff, 0x01},
{0x65, 0x00, 0xa7, 0x01}, {0x69, 0x00, 0xa6, 0x01}, {0x61, 0x00, 0x00, 0x01},
- {0x65, 0x00, 0x23, 0x01}, {0x69, 0x00, 0x02, 0x01}, {0x6b, 0x2c, 0xff, 0x01},
- {0x6f, 0x00, 0x25, 0x01}, {0x74, 0x2d, 0xff, 0x01}, {0x75, 0x00, 0x05, 0x01},
- {0x77, 0x2f, 0xff, 0x01}, {0x78, 0x2b, 0x56, 0x01}, {0x79, 0x30, 0xff, 0x01},
- {0x61, 0x00, 0xb0, 0x01}, {0x65, 0x00, 0xb1, 0x01}, {0x73, 0x2e, 0xff, 0x00},
+ {0x65, 0x00, 0x23, 0x01}, {0x69, 0x00, 0x02, 0x01}, {0x6b, 0x30, 0xff, 0x01},
+ {0x6f, 0x00, 0x25, 0x01}, {0x74, 0x31, 0xff, 0x01}, {0x75, 0x00, 0x05, 0x01},
+ {0x77, 0x33, 0xff, 0x01}, {0x78, 0x2f, 0x56, 0x01}, {0x79, 0x34, 0xff, 0x01},
+ {0x61, 0x00, 0xb0, 0x01}, {0x65, 0x00, 0xb1, 0x01}, {0x73, 0x32, 0xff, 0x00},
{0x75, 0x00, 0x56, 0x01}, {0x75, 0x00, 0x56, 0x01}, {0x61, 0x00, 0xa4, 0x01},
- {0x61, 0x00, 0x96, 0x01}, {0x6f, 0x00, 0x9a, 0x01}, {0x75, 0x00, 0x98, 0x01},
- {0x61, 0x00, 0x97, 0x01}, {0x65, 0x00, 0x04, 0x01}, {0x6f, 0x00, 0x9b, 0x01},
- {0x75, 0x00, 0x99, 0x01}, {0x79, 0x31, 0x56, 0x01}, {0x61, 0x00, 0x3a, 0x01},
- {0x65, 0x00, 0x48, 0x01}, {0x69, 0x00, 0x40, 0x01}, {0x6f, 0x00, 0x4a, 0x01},
- {0x75, 0x00, 0x46, 0x01}, {0x79, 0x33, 0xff, 0x00}, {0x7a, 0x32, 0x56, 0x01},
- {0x61, 0x00, 0x42, 0x01}, {0x65, 0x00, 0x41, 0x01}, {0x6f, 0x00, 0x44, 0x01},
- {0x75, 0x00, 0x43, 0x01}, {0x81, 0x35, 0xff, 0x01}, {0x82, 0x39, 0xff, 0x01},
- {0x81, 0x00, 0x00, 0x01}, {0x82, 0x00, 0x01, 0x01}, {0x83, 0x00, 0x02, 0x01},
- {0x84, 0x00, 0x03, 0x01}, {0x85, 0x00, 0x05, 0x01}, {0x86, 0x36, 0xff, 0x01},
- {0x87, 0x00, 0x23, 0x01}, {0x88, 0x00, 0x24, 0x01}, {0x89, 0x00, 0x25, 0x01},
- {0x8a, 0x00, 0x26, 0x01}, {0x8b, 0x00, 0x27, 0x01}, {0x8c, 0x00, 0x28, 0x01},
- {0x8d, 0x00, 0x29, 0x01}, {0x8e, 0x00, 0x2d, 0x01}, {0x8f, 0x00, 0x31, 0x01},
- {0x90, 0x00, 0x33, 0x01}, {0x91, 0x00, 0x35, 0x01}, {0x92, 0x00, 0x36, 0x01},
- {0x93, 0x00, 0x37, 0x01}, {0x94, 0x00, 0x38, 0x01}, {0x95, 0x00, 0x39, 0x01},
- {0x96, 0x00, 0x3a, 0x01}, {0x97, 0x00, 0x3b, 0x01}, {0x98, 0x00, 0x40, 0x01},
- {0x99, 0x00, 0x45, 0x01}, {0x9a, 0x00, 0x46, 0x01}, {0x9b, 0x00, 0x47, 0x01},
- {0x9c, 0x00, 0x48, 0x01}, {0x9d, 0x00, 0x49, 0x01}, {0x9e, 0x00, 0x4a, 0x01},
- {0x9f, 0x00, 0x4b, 0x01}, {0xa0, 0x00, 0x4c, 0x01}, {0xa1, 0x00, 0x4d, 0x01},
- {0xa2, 0x00, 0x52, 0x01}, {0xa3, 0x00, 0x56, 0x01}, {0xa4, 0x00, 0x57, 0x01},
- {0xa5, 0x00, 0x5c, 0x01}, {0xa6, 0x00, 0x5d, 0x01}, {0xa7, 0x00, 0x60, 0x01},
- {0xa8, 0x00, 0x63, 0x01}, {0xa9, 0x00, 0x65, 0x01}, {0xaa, 0x00, 0x67, 0x01},
- {0xab, 0x00, 0x68, 0x01}, {0xac, 0x00, 0x6e, 0x01}, {0xad, 0x00, 0x6f, 0x01},
- {0xae, 0x00, 0x70, 0x01}, {0xaf, 0x00, 0x71, 0x01}, {0xb0, 0x00, 0x72, 0x01},
- {0xb1, 0x00, 0x73, 0x01}, {0xb2, 0x00, 0x74, 0x01}, {0xb3, 0x00, 0x78, 0x01},
- {0xb4, 0x00, 0x7c, 0x01}, {0xb5, 0x00, 0x80, 0x01}, {0xb6, 0x00, 0x86, 0x01},
- {0xb7, 0x00, 0x87, 0x01}, {0xb8, 0x00, 0x88, 0x01}, {0xb9, 0x00, 0x89, 0x01},
- {0xba, 0x00, 0x8a, 0x01}, {0xbb, 0x00, 0x8b, 0x01}, {0xbc, 0x00, 0x8c, 0x01},
- {0xbd, 0x00, 0x8d, 0x01}, {0xbe, 0x00, 0x8e, 0x01}, {0xbf, 0x00, 0x8f, 0x01},
- {0x00, 0x00, 0x06, 0x01}, {0x2d, 0x00, 0x22, 0x00}, {0x61, 0x00, 0x07, 0x00},
- {0x62, 0x01, 0x06, 0x00}, {0x63, 0x03, 0x06, 0x00}, {0x64, 0x06, 0x06, 0x00},
- {0x65, 0x00, 0x0c, 0x00}, {0x66, 0x0a, 0x06, 0x00}, {0x67, 0x0c, 0x06, 0x00},
- {0x68, 0x0f, 0x06, 0x00}, {0x69, 0x00, 0x09, 0x00}, {0x6a, 0x11, 0x06, 0x00},
- {0x6b, 0x13, 0x06, 0x00}, {0x6c, 0x16, 0x06, 0x00}, {0x6d, 0x18, 0x06, 0x00},
- {0x6e, 0x1a, 0x06, 0x00}, {0x6f, 0x00, 0x0d, 0x00}, {0x70, 0x1c, 0x06, 0x00},
- {0x72, 0x1e, 0x06, 0x00}, {0x73, 0x20, 0x06, 0x00}, {0x74, 0x23, 0x06, 0x00},
- {0x75, 0x00, 0x0a, 0x00}, {0x76, 0x28, 0x06, 0x00}, {0x77, 0x29, 0x06, 0x00},
- {0x78, 0x2b, 0x06, 0x00}, {0x79, 0x31, 0x06, 0x00}, {0x7a, 0x32, 0x06, 0x00},
- {0xe3, 0x37, 0xff, 0x01}, {0x00, 0x00, 0x06, 0x01}, {0x81, 0x35, 0x06, 0x00},
- {0x82, 0x38, 0xff, 0x01}, {0x00, 0x00, 0x06, 0x01}, {0x80, 0x00, 0x0e, 0x00},
- {0x81, 0x00, 0x0f, 0x00}, {0x82, 0x00, 0x10, 0x00}, {0x83, 0x00, 0x11, 0x00},
- {0x84, 0x00, 0x12, 0x00}, {0x85, 0x00, 0x13, 0x00}, {0x86, 0x00, 0x14, 0x00},
- {0x87, 0x00, 0x15, 0x00}, {0x88, 0x00, 0x16, 0x00}, {0x89, 0x00, 0x17, 0x00},
- {0x8a, 0x00, 0x18, 0x00}, {0x8b, 0x00, 0x19, 0x00}, {0x8c, 0x00, 0x1a, 0x00},
- {0x8d, 0x00, 0x1b, 0x00}, {0x8e, 0x00, 0x1c, 0x00}, {0x8f, 0x00, 0x1d, 0x00},
- {0x90, 0x00, 0x1e, 0x00}, {0x91, 0x00, 0x1f, 0x00}, {0x92, 0x00, 0x20, 0x00},
- {0x93, 0x00, 0x21, 0x00}, {0x9b, 0x00, 0xab, 0x01}, {0x80, 0x00, 0x93, 0x01},
- {0x81, 0x00, 0x94, 0x01}, {0x82, 0x00, 0x95, 0x01}, {0x83, 0x00, 0x96, 0x01},
- {0x84, 0x00, 0x97, 0x01}, {0x85, 0x00, 0x98, 0x01}, {0x86, 0x00, 0x99, 0x01},
- {0x87, 0x00, 0x9a, 0x01}, {0x88, 0x00, 0x9b, 0x01}, {0x89, 0x00, 0x9c, 0x01},
- {0x8a, 0x00, 0x9d, 0x01}, {0x8b, 0x00, 0xa1, 0x01}, {0x8c, 0x00, 0xa2, 0x01},
- {0x8d, 0x00, 0xa3, 0x01}, {0x8e, 0x00, 0xa4, 0x01}, {0x8f, 0x00, 0xa5, 0x01},
- {0x90, 0x00, 0xa6, 0x01}, {0x91, 0x00, 0xa7, 0x01}, {0x92, 0x00, 0xa8, 0x01},
- {0x93, 0x00, 0xa9, 0x01}
+ {0x61, 0x00, 0x96, 0x01}, {0x65, 0x00, 0x23, 0x01}, {0x69, 0x00, 0x02, 0x01},
+ {0x6f, 0x00, 0x9a, 0x01}, {0x75, 0x00, 0x98, 0x01}, {0x61, 0x00, 0x97, 0x01},
+ {0x65, 0x00, 0x04, 0x01}, {0x6f, 0x00, 0x9b, 0x01}, {0x75, 0x00, 0x99, 0x01},
+ {0x79, 0x35, 0x56, 0x01}, {0x61, 0x00, 0x3a, 0x01}, {0x65, 0x00, 0x48, 0x01},
+ {0x69, 0x00, 0x40, 0x01}, {0x6f, 0x00, 0x4a, 0x01}, {0x75, 0x00, 0x46, 0x01},
+ {0x79, 0x37, 0xff, 0x00}, {0x7a, 0x36, 0x56, 0x01}, {0x61, 0x00, 0x42, 0x01},
+ {0x65, 0x00, 0x41, 0x01}, {0x6f, 0x00, 0x44, 0x01}, {0x75, 0x00, 0x43, 0x01},
+ {0x81, 0x39, 0xff, 0x01}, {0x82, 0x3d, 0xff, 0x01}, {0x81, 0x00, 0x00, 0x01},
+ {0x82, 0x00, 0x01, 0x01}, {0x83, 0x00, 0x02, 0x01}, {0x84, 0x00, 0x03, 0x01},
+ {0x85, 0x00, 0x05, 0x01}, {0x86, 0x3a, 0xff, 0x01}, {0x87, 0x00, 0x23, 0x01},
+ {0x88, 0x00, 0x24, 0x01}, {0x89, 0x00, 0x25, 0x01}, {0x8a, 0x00, 0x26, 0x01},
+ {0x8b, 0x00, 0x27, 0x01}, {0x8c, 0x00, 0x28, 0x01}, {0x8d, 0x00, 0x29, 0x01},
+ {0x8e, 0x00, 0x2d, 0x01}, {0x8f, 0x00, 0x31, 0x01}, {0x90, 0x00, 0x33, 0x01},
+ {0x91, 0x00, 0x35, 0x01}, {0x92, 0x00, 0x36, 0x01}, {0x93, 0x00, 0x37, 0x01},
+ {0x94, 0x00, 0x38, 0x01}, {0x95, 0x00, 0x39, 0x01}, {0x96, 0x00, 0x3a, 0x01},
+ {0x97, 0x00, 0x3b, 0x01}, {0x98, 0x00, 0x40, 0x01}, {0x99, 0x00, 0x45, 0x01},
+ {0x9a, 0x00, 0x46, 0x01}, {0x9b, 0x00, 0x47, 0x01}, {0x9c, 0x00, 0x48, 0x01},
+ {0x9d, 0x00, 0x49, 0x01}, {0x9e, 0x00, 0x4a, 0x01}, {0x9f, 0x00, 0x4b, 0x01},
+ {0xa0, 0x00, 0x4c, 0x01}, {0xa1, 0x00, 0x4d, 0x01}, {0xa2, 0x00, 0x52, 0x01},
+ {0xa3, 0x00, 0x56, 0x01}, {0xa4, 0x00, 0x57, 0x01}, {0xa5, 0x00, 0x5c, 0x01},
+ {0xa6, 0x00, 0x5d, 0x01}, {0xa7, 0x00, 0x60, 0x01}, {0xa8, 0x00, 0x63, 0x01},
+ {0xa9, 0x00, 0x65, 0x01}, {0xaa, 0x00, 0x67, 0x01}, {0xab, 0x00, 0x68, 0x01},
+ {0xac, 0x00, 0x6e, 0x01}, {0xad, 0x00, 0x6f, 0x01}, {0xae, 0x00, 0x70, 0x01},
+ {0xaf, 0x00, 0x71, 0x01}, {0xb0, 0x00, 0x72, 0x01}, {0xb1, 0x00, 0x73, 0x01},
+ {0xb2, 0x00, 0x74, 0x01}, {0xb3, 0x00, 0x78, 0x01}, {0xb4, 0x00, 0x7c, 0x01},
+ {0xb5, 0x00, 0x80, 0x01}, {0xb6, 0x00, 0x86, 0x01}, {0xb7, 0x00, 0x87, 0x01},
+ {0xb8, 0x00, 0x88, 0x01}, {0xb9, 0x00, 0x89, 0x01}, {0xba, 0x00, 0x8a, 0x01},
+ {0xbb, 0x00, 0x8b, 0x01}, {0xbc, 0x00, 0x8c, 0x01}, {0xbd, 0x00, 0x8d, 0x01},
+ {0xbe, 0x00, 0x8e, 0x01}, {0xbf, 0x00, 0x8f, 0x01}, {0x00, 0x00, 0x06, 0x00},
+ {0x2d, 0x00, 0x22, 0x00}, {0x61, 0x00, 0x07, 0x00}, {0x62, 0x01, 0x06, 0x00},
+ {0x63, 0x03, 0x06, 0x00}, {0x64, 0x06, 0x06, 0x00}, {0x65, 0x00, 0x0c, 0x00},
+ {0x66, 0x0a, 0x06, 0x00}, {0x67, 0x0c, 0x06, 0x00}, {0x68, 0x0f, 0x06, 0x00},
+ {0x69, 0x00, 0x09, 0x00}, {0x6a, 0x11, 0x06, 0x00}, {0x6b, 0x13, 0x06, 0x00},
+ {0x6c, 0x16, 0x06, 0x00}, {0x6d, 0x1c, 0x06, 0x00}, {0x6e, 0x1e, 0x06, 0x00},
+ {0x6f, 0x00, 0x0d, 0x00}, {0x70, 0x20, 0x06, 0x00}, {0x72, 0x22, 0x06, 0x00},
+ {0x73, 0x24, 0x06, 0x00}, {0x74, 0x27, 0x06, 0x00}, {0x75, 0x00, 0x0a, 0x00},
+ {0x76, 0x2c, 0x06, 0x00}, {0x77, 0x2d, 0x06, 0x00}, {0x78, 0x2f, 0x06, 0x00},
+ {0x79, 0x35, 0x06, 0x00}, {0x7a, 0x36, 0x06, 0x00}, {0xe3, 0x3b, 0xff, 0x01},
+ {0x00, 0x00, 0x06, 0x00}, {0x81, 0x39, 0x06, 0x00}, {0x82, 0x3c, 0xff, 0x01},
+ {0x00, 0x00, 0x06, 0x01}, {0x80, 0x00, 0x0e, 0x00}, {0x81, 0x00, 0x0f, 0x00},
+ {0x82, 0x00, 0x10, 0x00}, {0x83, 0x00, 0x11, 0x00}, {0x84, 0x00, 0x12, 0x00},
+ {0x85, 0x00, 0x13, 0x00}, {0x86, 0x00, 0x14, 0x00}, {0x87, 0x00, 0x15, 0x00},
+ {0x88, 0x00, 0x16, 0x00}, {0x89, 0x00, 0x17, 0x00}, {0x8a, 0x00, 0x18, 0x00},
+ {0x8b, 0x00, 0x19, 0x00}, {0x8c, 0x00, 0x1a, 0x00}, {0x8d, 0x00, 0x1b, 0x00},
+ {0x8e, 0x00, 0x1c, 0x00}, {0x8f, 0x00, 0x1d, 0x00}, {0x90, 0x00, 0x1e, 0x00},
+ {0x91, 0x00, 0x1f, 0x00}, {0x92, 0x00, 0x20, 0x00}, {0x93, 0x00, 0x21, 0x00},
+ {0x9b, 0x00, 0xab, 0x01}, {0x80, 0x00, 0x93, 0x01}, {0x81, 0x00, 0x94, 0x01},
+ {0x82, 0x00, 0x95, 0x01}, {0x83, 0x00, 0x96, 0x01}, {0x84, 0x00, 0x97, 0x01},
+ {0x85, 0x00, 0x98, 0x01}, {0x86, 0x00, 0x99, 0x01}, {0x87, 0x00, 0x9a, 0x01},
+ {0x88, 0x00, 0x9b, 0x01}, {0x89, 0x00, 0x9c, 0x01}, {0x8a, 0x00, 0x9d, 0x01},
+ {0x8b, 0x00, 0xa1, 0x01}, {0x8c, 0x00, 0xa2, 0x01}, {0x8d, 0x00, 0xa3, 0x01},
+ {0x8e, 0x00, 0xa4, 0x01}, {0x8f, 0x00, 0xa5, 0x01}, {0x90, 0x00, 0xa6, 0x01},
+ {0x91, 0x00, 0xa7, 0x01}, {0x92, 0x00, 0xa8, 0x01}, {0x93, 0x00, 0xa9, 0x01}
};
static rk_tree_node *
@@ -2674,13 +2678,14 @@ rk_conv(const char *str, uint32_t str_len, char *buf, uint32_t buf_size, uint8_t
state = 0;
}
}
+#ifdef FLUSH_UNRESOLVED_INPUT
if ((rn = rk_lookup(state, 0))) {
if ((l = rk_emit(rn, &e))) { RK_OUTPUT(e, l); }
+ state = rn->next;
} else {
-#ifdef FLUSH_UNRESOLVED_INPUT
if (ic_ < ic) { RK_OUTPUT(ic_, ic - ic_); }
-#endif /* FLUSH_UNRESOLVED_INPUT */
}
+#endif /* FLUSH_UNRESOLVED_INPUT */
*statep = state;
return oc - buf;
}